merge 3.4 (#25319)

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

diff --cc Lib/threading.py
Simple merge

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index 2c1a7c2136cbd7267c3e198a6b370d4150ac9647,70f3a5155a70ea66e3b3bf4d89b4b6f9f5e8582c..66bf5b9e17cf2b4d6804a47e74ef481e307bbce3
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -138,18 -171,6 +138,21 @@@ 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 #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.