diff -r 3e438497edca -r e6de6ef3e426 mercurial/url.py --- a/mercurial/url.py Wed May 25 16:09:07 2016 -0700 +++ b/mercurial/url.py Wed May 25 19:43:22 2016 -0700 @@ -354,8 +354,8 @@ _generic_proxytunnel(self) host = self.realhostport.rsplit(':', 1)[0] self.sock = sslutil.wrapsocket( - self.sock, self.key_file, self.cert_file, serverhostname=host, - **sslutil.sslkwargs(self.ui, host)) + self.sock, self.key_file, self.cert_file, ui=self.ui, + serverhostname=host, **sslutil.sslkwargs(self.ui, host)) sslutil.validatesocket(self.sock) class httpshandler(keepalive.KeepAliveHandler, urlreq.httpshandler):