Https proxy

Previously the timeout was set on the the connection too late in the process.
This change passes through the timeout value to _new_conn so it's set for proxy
connection attempts.

Not too happy with the interface change though and open to suggestions.
Yeah I guess it doesn't make too much of a difference because the timeout gets set later in _make_request for HTTP, but prolly good