merge 3.4 (#25471)

diff --cc Lib/socket.py
Simple merge

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

diff --cc Misc/NEWS
index 6a24291935547a3ae1d35fb6a15b92712093f0b2,7d673b2cc29df66c43c79a5b41960c3dc0953238..7e7534da5076b342a43c02c3f963c04d518dc805
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -177,21 -188,6 +177,24 @@@ 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 #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.