diff -r 2e636ac3fdbb -r feee453cfaa9 Lib/http/client.py
--- a/Lib/http/client.py	Thu Dec 11 23:30:31 2014 +0100
+++ b/Lib/http/client.py	Thu Dec 11 21:14:46 2014 -0800
@@ -835,8 +835,7 @@
         if self.sock:
             raise RuntimeError("Can't set up tunnel for established connection")
 
-        self._tunnel_host = host
-        self._tunnel_port = port
+        self._tunnel_host, self._tunnel_port = self._get_hostport(host, port)
         if headers:
             self._tunnel_headers = headers
         else:
@@ -866,9 +865,8 @@
         self.debuglevel = level
 
     def _tunnel(self):
-        (host, port) = self._get_hostport(self._tunnel_host,
-                                          self._tunnel_port)
-        connect_str = "CONNECT %s:%d HTTP/1.0\r\n" % (host, port)
+        connect_str = "CONNECT %s:%d HTTP/1.0\r\n" % (self._tunnel_host,
+            self._tunnel_port)
         connect_bytes = connect_str.encode("ascii")
         self.send(connect_bytes)
         for header, value in self._tunnel_headers.items():
diff -r 2e636ac3fdbb -r feee453cfaa9 Lib/test/test_httplib.py
--- a/Lib/test/test_httplib.py	Thu Dec 11 23:30:31 2014 +0100
+++ b/Lib/test/test_httplib.py	Thu Dec 11 21:14:46 2014 -0800
@@ -4,6 +4,7 @@
 import os
 import array
 import socket
+import types
 
 import unittest
 TestCase = unittest.TestCase
@@ -1299,11 +1300,13 @@
 
         self.assertEqual(conn.sock.host, 'proxy.com')
         self.assertEqual(conn.sock.port, 80)
-        self.assertTrue(b'CONNECT destination.com' in conn.sock.data)
-        self.assertTrue(b'Host: destination.com' in conn.sock.data)
+        self.assertIn(b'CONNECT destination.com', conn.sock.data)
+        # issue22095
+        self.assertNotIn(b'Host: destination.com:None', conn.sock.data) 
+        self.assertIn(b'Host: destination.com', conn.sock.data)
 
         # This test should be removed when CONNECT gets the HTTP/1.1 blessing
-        self.assertTrue(b'Host: proxy.com' not in conn.sock.data)
+        self.assertNotIn(b'Host: proxy.com', conn.sock.data)
 
         conn.close()
         conn.request('PUT', '/', '')