From: Ned Deily <nad@acm.org>
Date: Thu, 5 Feb 2015 06:24:00 +0000 (+1100)
Subject: Issue #23345: merge from 3.4
X-Git-Tag: v3.5.0a1~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7aa4428835d82d05e1812d15d7b6fd65c4fafc77;p=thirdparty%2FPython%2Fcpython.git

Issue #23345: merge from 3.4
---

7aa4428835d82d05e1812d15d7b6fd65c4fafc77
diff --cc Misc/NEWS
index 4fcee12d008d,663cc53a266f..e23ad9076f26
--- a/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
  -----------