Issue #23345: merge from 3.4

diff --cc Lib/test/test_ssl.py
Simple merge

diff --cc Misc/NEWS
index 4fcee12d008d27b334bb784e74748d3f89611b13,663cc53a266f819cb2db573914b15526cc8eab30..e23ad9076f26ef2e385dbdd7c09db4c605f608e3
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1723,10 -1226,6 +1723,13 @@@ Test
  - Issue #21093: Prevent failures of ctypes test_macholib on OS X if a
    copy of libz exists in $HOME/lib or /usr/local/lib.
  
 +- Issue #22770: Prevent some Tk segfaults on OS X when running gui tests.
 +
 +- Issue #23211: Workaround test_logging failure on some OS X 10.6 systems.
 +
++- Issue #23345: Prevent test_ssl failures with large OpenSSL patch level
++  values (like 0.9.8zc).
++
  Tools/Demos
  -----------