merge from 3.4

Increase http.client.HTTPConnection test coverage.

Added a new tunnel test to verify setting of _tunnel_host, _tunnel_port,
_tunnel_headers attributes on HTTPConnection object.

diff --cc Lib/test/test_httplib.py
Simple merge