merge 3.2

diff --cc Misc/NEWS
index c5d7e65bcb130ad87854cb64610df056dff406f9,0eb8153a2b04c82606bc3bbd78895e79a2356fa9..fd04cd11198b5dbd84a0ba125afea8f0dea8d03b
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -24,36 -19,10 +24,40 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #24521: Fix possible integer overflows in the pickle module.
 +
  - Issue #22931: Allow '[' and ']' in cookie values.
  
 +- Issue #24094: Fix possible crash in json.encode with poorly behaved dict
 +  subclasses.
 +
 +- Issue #23367: Fix possible overflows in the unicodedata module.
 +
 +- Issue #23361: Fix possible overflow in Windows subprocess creation code.
 +
 +- Issue #23363: Fix possible overflow in itertools.permutations.
 +
 +- Issue #23364: Fix possible overflow in itertools.product.
 +
 +- Issue #23369: Fixed possible integer overflow in
 +  _json.encode_basestring_ascii.
 +
 +- Issue #23366: Fixed possible integer overflow in itertools.combinations.
 +
 +- Issue #23365: Fixed possible integer overflow in
 +  itertools.combinations_with_replacement.
 +
++- Issue #21529 (CVE-2014-4616): Fix arbitrary memory access in
++  JSONDecoder.raw_decode with a negative second parameter. Bug reported by Guido
++  Vranken.
++
 +C API
 +-----
 +
 +- Issue #23998: PyImport_ReInitLock() now checks for lock allocation error
 +
  
 -What's New in Python 3.2.6?
 +What's New in Python 3.3.6?
  ===========================
  
  *Release date: 11-Oct-2014*
@@@ -97,10 -86,22 +101,7 @@@ Librar
  - Issue #21766: Prevent a security hole in CGIHTTPServer by URL unquoting paths
    before checking for a CGI script at that path.
  
- - Fix arbitrary memory access in JSONDecoder.raw_decode with a negative second
-   parameter. Bug reported by Guido Vranken.
- 
 -- Issue #21529 (CVE-2014-4616): Fix arbitrary memory access in
 -  JSONDecoder.raw_decode with a negative second parameter. Bug reported by Guido
 -  Vranken.
 +- Issue #20633: Replace relative import by absolute import.
  
  - Issue #21082: In os.makedirs, do not set the process-wide umask. Note this
    changes behavior of makedirs when exist_ok=True.