Merge

diff --cc Misc/NEWS
index 7dbaaff5f6af7d58b80c0571f20d8b63f7a21bee,4be3a6b6f8f077fa4a72215b9db54fd0339afc4c..95c814748b87eb6f1e9630ab92675c7742a93b28
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -97,9 -97,9 +97,12 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #7502: Fix equality comparison for DocTestCase instances.  Patch by
 +  Cédric Krier.
 +
+ - Issue #11870: threading: Properly reinitialize threads internal locks and
+   condition variables to avoid deadlocks in child processes.
+ 
  - Issue #8035: urllib: Fix a bug where the client could remain stuck after a
    redirection or an error.