# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1379533936 18000
# Node ID d4ed26beae0e41c86c413c69c1e6f13c32eb3d33
# Parent  da3808bcfbfa9467b2dee82ba51f398f1c371fac# Parent  f2871c30e6a7ded2382bc4b48c02c10a04d712f8
merge with stable

diff -r da3808bcfbfa -r d4ed26beae0e mercurial/httpclient/socketutil.py
--- a/mercurial/httpclient/socketutil.py	Fri Sep 06 13:30:57 2013 +0400
+++ b/mercurial/httpclient/socketutil.py	Wed Sep 18 14:52:16 2013 -0500
@@ -106,7 +106,7 @@
                     else:
                         raise x
 
-    _PROTOCOL_SSLv3 = 1
+    _PROTOCOL_SSLv23 = 2
 
     CERT_NONE = 0
     CERT_OPTIONAL = 1
@@ -118,7 +118,7 @@
     # pylint: disable=W0613,R0913
     def wrap_socket(sock, keyfile=None, certfile=None,
                 server_side=False, cert_reqs=CERT_NONE,
-                ssl_version=_PROTOCOL_SSLv3, ca_certs=None,
+                ssl_version=_PROTOCOL_SSLv23, ca_certs=None,
                 do_handshake_on_connect=True,
                 suppress_ragged_eofs=True):
         """Backport of ssl.wrap_socket from Python 2.6."""
diff -r da3808bcfbfa -r d4ed26beae0e mercurial/sslutil.py
--- a/mercurial/sslutil.py	Fri Sep 06 13:30:57 2013 +0400
+++ b/mercurial/sslutil.py	Wed Sep 18 14:52:16 2013 -0500
@@ -17,8 +17,7 @@
     def ssl_wrap_socket(sock, keyfile, certfile,
                 cert_reqs=ssl.CERT_NONE, ca_certs=None):
         sslsocket = ssl.wrap_socket(sock, keyfile, certfile,
-                cert_reqs=cert_reqs, ca_certs=ca_certs,
-                ssl_version=ssl.PROTOCOL_SSLv3)
+                cert_reqs=cert_reqs, ca_certs=ca_certs)
         # check if wrap_socket failed silently because socket had been closed
         # - see http://bugs.python.org/issue13721
         if not sslsocket.cipher():