# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1452544032 21600
# Node ID 4571c0b383378f5eec5189e3a39c672a169ce566
# Parent  374fad80ce6975447d7abf55c5127e776f1ad4b6# Parent  6c7d26cef0cda4752c02b7478f1270a84393510b
merge with stable

diff -r 374fad80ce69 -r 4571c0b38337 mercurial/sslutil.py
--- 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