--- a/mercurial/httppeer.py	Wed Jun 29 19:43:27 2016 -0700
+++ b/mercurial/httppeer.py	Tue Jun 28 16:01:53 2016 +0530
@@ -9,7 +9,6 @@
 from __future__ import absolute_import
 
 import errno
-import httplib
 import os
 import socket
 import tempfile
@@ -27,6 +26,7 @@
     wireproto,
 )
 
+httplib = util.httplib
 urlerr = util.urlerr
 urlreq = util.urlreq