]> granicus.if.org Git - python/commitdiff
#19227: merge with 3.3
authorGeorg Brandl <georg@python.org>
Sun, 27 Oct 2013 06:57:42 +0000 (07:57 +0100)
committerGeorg Brandl <georg@python.org>
Sun, 27 Oct 2013 06:57:42 +0000 (07:57 +0100)
1  2 
Misc/NEWS
Modules/_ssl.c

diff --cc Misc/NEWS
index 3ba4e5c9ee82c82f2314eb5c95fc7a6bae9a28f6,fe562528932e7b9aa5c5691c7d2b186f597a4dea..9ebe6bc6eb9594f790a27201100a05857c1be8c9
+++ 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.
  
diff --cc Modules/_ssl.c
Simple merge