merge 3.5 (#25569)

diff --cc Misc/NEWS
index 07cf60f884ab380e39f85db68da4d625bd36bca7,cf81afe566750181a2425ba6cf9c70862f71dcd0..85dd15864acce6e28cafe8accfc46592564d4a89
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -217,24 -205,6 +217,26 @@@ 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 #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