#12888: merge with 3.2.

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index 2389bf54b4867cf12b317122c26ed87cb7ee1cc8,ff1a0add421870bd3d04e9a75a17c1464db78868..b15876b1cfae72ef314a7b70a659d487606b3f9f
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -271,71 -129,6 +271,74 @@@ Core and Builtin
  Library
  -------
  
++- Issue #12888: Fix a bug in HTMLParser.unescape that prevented it to escape
++  more than 128 entities.  Patch by Peter Otten.
++
 +- Issue #12878: Expose a __dict__ attribute on io.IOBase and its subclasses.
 +
 +- Issue #12636: IDLE reads the coding cookie when executing a Python script.
 +
 +- Issue #12494: On error, call(), check_call(), check_output() and
 +  getstatusoutput() functions of the subprocess module now kill the process,
 +  read its status (to avoid zombis) and close pipes.
 +
 +- Issue #12720: Expose low-level Linux extended file attribute functions in os.
 +
 +- Issue #10946: The distutils commands bdist_dumb, bdist_wininst and bdist_msi
 +  now respect a --skip-build option given to bdist.  The packaging commands
 +  were fixed too.
 +
 +- Issue #12847: Fix a crash with negative PUT and LONG_BINPUT arguments in
 +  the C pickle implementation.
 +
 +- Issue #11564: Avoid crashes when trying to pickle huge objects or containers
 +  (more than 2**31 items).  Instead, in most cases, an OverflowError is raised.
 +
 +- Issue #12287: Fix a stack corruption in ossaudiodev module when the FD is
 +  greater than FD_SETSIZE.
 +
 +- Issue #12839: Fix crash in zlib module due to version mismatch.
 +  Fix by Richard M. Tew.
 +
 +- Issue #9923: The mailcap module now correctly uses the platform path
 +  separator for the MAILCAP environment variable on non-POSIX platforms.
 +
 +- Issue #12835: Follow up to #6560 that unconditionally prevents use of the
 +  unencrypted sendmsg/recvmsg APIs on SSL wrapped sockets. Patch by David
 +  Watson.
 +
 +- Issue #12803: SSLContext.load_cert_chain() now accepts a password argument
 +  to be used if the private key is encrypted.  Patch by Adam Simpkins.
 +
 +- Issue #11657: Fix sending file descriptors over 255 over a multiprocessing
 +  Pipe.
 +
 +- Issue #12811: tabnanny.check() now promptly closes checked files. Patch by
 +  Anthony Briggs.
 +
 +- Issue #6560: The sendmsg/recvmsg API is now exposed by the socket module
 +  when provided by the underlying platform, supporting processing of
 +  ancillary data in pure Python code. Patch by David Watson and Heiko Wundram.
 +
 +- Issue #12326: On Linux, sys.platform doesn't contain the major version
 +  anymore. It is now always 'linux', instead of 'linux2' or 'linux3' depending
 +  on the Linux version used to build Python.
 +
 +- Issue #12213: Fix a buffering bug with interleaved reads and writes that
 +  could appear on BufferedRandom streams.
 +
 +- Issue #12778: Reduce memory consumption when JSON-encoding a large
 +  container of many small objects.
 +
 +- Issue #12650: Fix a race condition where a subprocess.Popen could leak
 +  resources (FD/zombie) when killed at the wrong time.
 +
 +- Issue #12744: Fix inefficient representation of integers between 2**31 and
 +  2**63 on systems with a 64-bit C "long".
 +
 +- Issue #12646: Add an 'eof' attribute to zlib.Decompress, to make it easier to
 +  detect truncated input streams.
 +
  - Issue #11513: Fix exception handling ``tarfile.TarFile.gzopen()`` when
    the file cannot be opened.