Minor tuning.
Backport of connect timeout from dproxy branch.