merge 3.4 (#25578)

diff --cc Misc/NEWS
index 102f64d97382a6066b138ba45751ca205c06de1b,881f0351e83025dc9e028e3404d3368884afe06a..f0ade032aceb50cbfc1057239208ec75faeead64
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -233,29 -223,6 +233,31 @@@ Librar
  - Issue #16180: Exit pdb if file has syntax error, instead of trapping user
    in an infinite loop.  Patch by Xavier de Gaye.
  
 +- Issue #24891: Fix a race condition at Python startup if the file descriptor
 +  of stdin (0), stdout (1) or stderr (2) is closed while Python is creating
 +  sys.stdin, sys.stdout and sys.stderr objects. These attributes are now set
 +  to None if the creation of the object failed, instead of raising an OSError
 +  exception. Initial patch written by Marco Paolini.
 +
 +- Issue #24992: Fix error handling and a race condition (related to garbage
 +  collection) in collections.OrderedDict constructor.
 +
 +- Issue #24881: Fixed setting binary mode in Python implementation of FileIO
 +  on Windows and Cygwin.  Patch from Akira Li.
 +
++- Issue #25578: Fix (another) memory leak in SSLSocket.getpeercer().
++
 +- Issue #25530: Disable the vulnerable SSLv3 protocol by default when creating
 +  ssl.SSLContext.
 +
 +- Issue #25569: Fix memory leak in SSLSocket.getpeercert().
 +
 +- Issue #25471: Sockets returned from accept() shouldn't appear to be
 +  nonblocking.
 +
 +- Issue #25319: When threading.Event is reinitialized, the underlying condition
 +  should use a regular lock rather than a recursive lock.
 +
  - Issue #21112: Fix regression in unittest.expectedFailure on subclasses.
    Patch from Berker Peksag.
  

diff --cc Modules/_ssl.c
Simple merge