merge 3.3 (#23367)

diff --cc Misc/NEWS
index 5a9b8360d2c847e815e65eb1135189a15ec7e590,ae04f59ac24b617ea2f0fd80e889cb4b2c4ec7e1..f71bd506c07bfa549524b191fe8bbb244a971b85
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -13,59 -13,30 +13,61 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #23367: Fix possible overflows in the unicodedata module.
 +- Issue #20204: Added the __module__ attribute to _tkinter classes.
  
 -- Issue #23361: Fix possible overflow in Windows subprocess creation code.
 +- Issue #23521: Corrected pure python implementation of timedelta division.
  
 -- Issue #23363: Fix possible overflow in itertools.permutations.
 + * Eliminated OverflowError from timedelta * float for some floats;
 + * Corrected rounding in timedlta true division.
  
 -- Issue #23364: Fix possible overflow in itertools.product.
 +- Issue #21619: Popen objects no longer leave a zombie after exit in the with
 +  statement if the pipe was broken.  Patch by Martin Panter.
  
 -- Issue #23369: Fixed possible integer overflow in
 -  _json.encode_basestring_ascii.
 +- Issue #6639: Module-level turtle functions no longer raise TclError after
 +  closing the window.
  
 -- Issue #23366: Fixed possible integer overflow in itertools.combinations.
 +- Issues #814253, #9179: Warnings now are raised when group references and
 +  conditional group references are used in lookbehind assertions in regular
 +  expressions.
 +
 +- Issue #23215: Multibyte codecs with custom error handlers that ignores errors
 +  consumed too much memory and raised SystemError or MemoryError.
 +  Original patch by Aleksi Torhamo.
 +
 +- Issue #5700: io.FileIO() called flush() after closing the file.
 +  flush() was not called in close() if closefd=False.
 +
 +- Issue #23374: Fixed pydoc failure with non-ASCII files when stdout encoding
 +  differs from file system encoding (e.g. on Mac OS).
 +
 +- Issue #23481: Remove RC4 from the SSL module's default cipher list.
 +
 +- Issue #21548: Fix pydoc.synopsis() and pydoc.apropos() on modules with empty
 +  docstrings.
 +
 +- Issue #22885: Fixed arbitrary code execution vulnerability in the dbm.dumb
 +  module.  Original patch by Claudiu Popa.
 +
 +- Issue #23146: Fix mishandling of absolute Windows paths with forward
 +  slashes in pathlib.
  
 -- Issue #23365: Fixed possible integer overflow in
 -  itertools.combinations_with_replacement.
 +- Issue #23421: Fixed compression in tarfile CLI.  Patch by wdv4758h.
 +
++- Issue #23367: Fix possible overflows in the unicodedata module.
++
 +- Issue #23361: Fix possible overflow in Windows subprocess creation code.
 +
 +Build
 +-----
 +
 +- Issue #23445: pydebug builds now use "gcc -Og" where possible, to make
 +  the resulting executable faster.
  
  
 -What's New in Python 3.3.6?
 +What's New in Python 3.4.3?
  ===========================
  
 -*Release date: 11-Oct-2014*
 +Release date: 2015-02-23
  
  Core and Builtins
  -----------------

diff --cc Modules/unicodedata.c
Simple merge