Minor tuning.
Backport of connect timeout from dproxy branch.
Split 'common/' into commit '492554aa8881ea7d51ecff0530e96922fdd4cc4b'

git-subtree-dir: common
git-subtree-mainline: 6771a079b19bca655f87dfcb155b4c6e1400fe3e
git-subtree-split: 492554aa8881ea7d51ecff0530e96922fdd4cc4b