Merge commit '136c3438bbdb56a5d2f1f0f486f180641dc6dda0'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 21 Apr 2016 15:01:26 +0000 (16:01 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 21 Apr 2016 15:01:30 +0000 (16:01 +0100)
This commit is a no-op.

* commit '136c3438bbdb56a5d2f1f0f486f180641dc6dda0':
  tcp: Use rw_timeout for setting the connect/listen timeouts

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Trivial merge