merge 3.5

diff --cc Misc/NEWS
index faec6f980bde64d1615e45d46e79ea2e3acc10c8,c095634890c68ac394c99ff95228d01da7acc89a..b48cedeeee30b3b249ae84e8c674a04aede2ef61
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -13,40 -13,11 +13,45 @@@ Core and Builtin
  - Issue #29337: Fixed possible BytesWarning when compare the code objects.
    Warnings could be emitted at compile time.
  
 +- Issue #29327: Fixed a crash when pass the iterable keyword argument to
 +  sorted().
 +
 +- Issue #29034: Fix memory leak and use-after-free in os module (path_converter).
 +
 +- Issue #29159: Fix regression in bytes(x) when x.__index__() raises Exception.
 +
 +- Issue #28932: Do not include <sys/random.h> if it does not exist.
 +
 +- Issue #25677: Correct the positioning of the syntax error caret for
 +  indented blocks.  Based on patch by Michael Layzell.
 +
 +- Issue #29000: Fixed bytes formatting of octals with zero padding in alternate
 +  form.
 +
 +- Issue #26919: On Android, operating system data is now always encoded/decoded
 +  to/from UTF-8, instead of the locale encoding to avoid inconsistencies with
 +  os.fsencode() and os.fsdecode() which are already using UTF-8.
 +
 +- Issue #28991:  functools.lru_cache() was susceptible to an obscure reentrancy
 +  bug triggerable by a monkey-patched len() function.
 +
 +- Issue #28739: f-string expressions are no longer accepted as docstrings and
 +  by ast.literal_eval() even if they do not include expressions.
 +
 +- Issue #28512: Fixed setting the offset attribute of SyntaxError by
 +  PyErr_SyntaxLocationEx() and PyErr_SyntaxLocationObject().
 +
 +- Issue #28918: Fix the cross compilation of xxlimited when Python has been
 +  built with Py_DEBUG defined.
 +
 +- Issue #28731: Optimize _PyDict_NewPresized() to create correct size dict.
 +  Improve speed of dict literal with constant keys up to 30%.
 +
+ Extension Modules
+ -----------------
+ 
+ - Issue #29169: Update zlib to 1.2.10.
+ 
  Library
  -------