From: Georg Brandl <georg@python.org>
Date: Sun, 27 Oct 2013 06:57:42 +0000 (+0100)
Subject: #19227: merge with 3.3
X-Git-Tag: v3.4.0b1~513
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb404f528a1c0122f72ad4ab12cd5c26e5d13835;p=thirdparty%2FPython%2Fcpython.git

#19227: merge with 3.3
---

fb404f528a1c0122f72ad4ab12cd5c26e5d13835
diff --cc Misc/NEWS
index 3ba4e5c9ee82,fe562528932e..9ebe6bc6eb95
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -21,8 -81,9 +21,11 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #19329: Optimized compiling charsets in regular expressions.
 +
+ - Issue #19227: Try to fix deadlocks caused by re-seeding then OpenSSL
+   pseudo-random number generator on fork().
+ 
  - Issue #16037: HTTPMessage.readheaders() raises an HTTPException when more than
    100 headers are read.  Adapted from patch by Jyrki Pulliainen.