Mercurial > hg-stable

changeset 27701:4571c0b38337

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 11 Jan 2016 14:27:12 -0600
parents 374fad80ce69 (current diff) 6c7d26cef0cd (diff)
children 39122c2442cd
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/sslutil.py	Fri Jan 08 12:07:15 2016 -0600
+++ b/mercurial/sslutil.py	Mon Jan 11 14:27:12 2016 -0600
@@ -35,7 +35,7 @@
         # maintainers for us, but that breaks too many things to
         # do it in a hurry.
         sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-        sslcontext.options &= ssl.OP_NO_SSLv2 & ssl.OP_NO_SSLv3
+        sslcontext.options |= ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3
         if certfile is not None:
             def password():
                 f = keyfile or certfile