Merge from 3.5.0 branch.

diff --cc Misc/NEWS
index 64c9af75bcba73916ffb03ebdf3cdb6628f39ddb,e30e36e8da0ae8eda419dfef1ae8d2af8fd1fe05..8a09be790a9c2ab989c7799fcddf409907003a44
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -95,9 -20,13 +98,15 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #24917: time_strftime() buffer over-read.
 +- Issue #23144: Make sure that HTMLParser.feed() returns all the data, even
 +  when convert_charrefs is True.
  
+ - Issue #24748: To resolve a compatibility problem found with py2exe and
+   pywin32, imp.load_dynamic() once again ignores previously loaded modules
+   to support Python modules replacing themselves with extension modules.
+   Patch by Petr Viktorin.
+ 
  - Issue #24635: Fixed a bug in typing.py where isinstance([], typing.Iterable)
    would return True once, then False on subsequent calls.