[pypy-commit] pypy py3.6: hg merge default

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.6
Changeset: r97202:5b574c103316
Date: 2019-08-17 10:21 +0200
http://bitbucket.org/pypy/pypy/changeset/5b574c103316/

Log:	hg merge default

diff --git a/lib_pypy/_cffi_ssl/_stdssl/__init__.py b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
--- a/lib_pypy/_cffi_ssl/_stdssl/__init__.py
+++ b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
@@ -121,7 +121,9 @@
 # init open ssl
 lib.SSL_load_error_strings()
 lib.SSL_library_init()
-lib.Cryptography_setup_ssl_threads()
+if (lib.Cryptography_HAS_LOCKING_CALLBACKS and
+        lib.CRYPTO_get_locking_callback() == ffi.NULL):
+    lib.Cryptography_setup_ssl_threads()
 lib.OpenSSL_add_all_algorithms()
 
 def check_signals():