#13960: merge with 3.2.

diff --cc Misc/NEWS
index a14fe6a989c7caa09e3adf5615293a8eba6b87a7,d1f9ab00222065b789c5650f33a4c3a78b7dad3c..e2fa04ff951aa0f2325bd0a6cf06c45fadea9ce7
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -466,28 -113,9 +466,31 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #13960: HTMLParser is now able to handle broken comments when
+   strict=False.
+ 
 +- Issue #13921: Undocument and clean up sqlite3.OptimizedUnicode,
 +  which is obsolete in Python 3.x. It's now aliased to str for
 +  backwards compatibility.
 +
 +- When '' is a path (e.g. in sys.path), make sure __file__ uses the current
 +  working directory instead of '' in importlib.
 +
 +- Issue #13609: Add two functions to query the terminal size:
 +  os.get_terminal_size (low level) and shutil.get_terminal_size (high level).
 +  Patch by Zbigniew Jędrzejewski-Szmek.
 +
 +- Issue #13845: On Windows, time.time() now uses GetSystemTimeAsFileTime()
 +  instead of ftime() to have a resolution of 100 ns instead of 1 ms (the clock
 +  accuracy is between 0.5 ms and 15 ms).
 +
 +- Issue #13846: Add time.monotonic(), monotonic clock.
 +
 +- Issue #8184: multiprocessing: On Windows, don't set SO_REUSEADDR on
 +  Connection sockets, and set FILE_FLAG_FIRST_PIPE_INSTANCE on named pipes, to
 +  make sure two listeners can't bind to the same socket/pipe (or any existing
 +  socket/pipe).
 +
  - Issue #9021: Add an introduction to the copy module documentation.
  
  - Issue #6005: Examples in the socket library documentation use sendall, where
@@@ -498,18 -126,11 +501,18 @@@
  
  - Issue #10881: Fix test_site failure with OS X framework builds.
  
- - Issue #964437 Make IDLE help window non-modal.
+ - Issue #964437: Make IDLE help window non-modal.
    Patch by Guilherme Polo and Roger Serwy.
  
 +- Issue #13734: Add os.fwalk(), a directory walking function yielding file
 +  descriptors.
 +
  - Issue #2945: Make the distutils upload command aware of bdist_rpm products.
  
 +- Issue #13712: pysetup create should not convert package_data to extra_files.
 +
 +- Issue #11805: package_data in setup.cfg should allow more than one value.
 +
  - Issue #13933: IDLE auto-complete did not work with some imported
    module, like hashlib.  (Patch by Roger Serwy)