Merge 3.6.0 release engineering head

diff --cc .hgtags
index f49b4832ce5a6a5790938a4507bdc39a1a8de996,7b8ad930b3c83cbfe2bbe390222ae8f549bc8664..8df6239b787b0bcd571dd2c297ecd1b3b1b08abe
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -175,4 -175,4 +175,5 @@@ b9fadc7d1c3f9c3c77f32f35afbe1a1cc38070e
  8345e066c0ed713c3e510cbc8fafc1c38d6d306b v3.6.0b3
  18496abdb3d5c2730a659b747a89261b2219fecf v3.6.0b4
  29a273eee9a523ee178f6a66c4ac9d317c8fc84f v3.6.0rc1
 +800a67f7806de45a7abd5273359e704bf147c079 v3.6.0rc2
+ 41df79263a11f2429d1dd0cfe12553de3dcb5508 v3.6.0

diff --cc Doc/whatsnew/3.6.rst
Simple merge

diff --cc Misc/HISTORY
Simple merge

diff --cc Misc/NEWS
index b9644df97216fb93af3e95b2e47119a3945cfa62,848add08de5e965c8f29845cb1c9f0d5347d2249..6947359cd03b0f3ae2d25ff20106a8cf52be28cd
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,104 -2,16 +2,112 @@@
  Python News
  +++++++++++
  
- What's New in Python 3.6.1 release candidate 1
- ==============================================
++What's New in Python 3.6.1 release candidate 1?
++===============================================
 +
 +*Release date: XXXX-XX-XX*
 +
 +Core and Builtins
 +-----------------
 +
 +- 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%.
 +
 +Library
 +-------
 +
 +- Issue 28923: Remove editor artifacts from Tix.py.
 +
 +- Issue #28871: Fixed a crash when deallocate deep ElementTree.
 +
 +- Issue #19542: Fix bugs in WeakValueDictionary.setdefault() and
 +  WeakValueDictionary.pop() when a GC collection happens in another
 +  thread.
 +
 +- Issue #20191: Fixed a crash in resource.prlimit() when pass a sequence that
 +  doesn't own its elements as limits.
 +
 +- Issue #28779: multiprocessing.set_forkserver_preload() would crash the
 +  forkserver process if a preloaded module instantiated some
 +  multiprocessing objects such as locks.
 +
 +- Issue #28847: dbm.dumb now supports reading read-only files and no longer
 +  writes the index file when it is not changed.
 +
 +- Issue #26937: The chown() method of the tarfile.TarFile class does not fail
 +  now when the grp module cannot be imported, as for example on Android
 +  platforms.
 +
 +Windows
 +-------
 +
 +- Issue #25778: winreg does not truncate string correctly (Patch by Eryk Sun)
 +
 +- Issue #28896: Deprecate WindowsRegistryFinder and disable it by default.
 +
 +Tests
 +-----
 +
 +- Issue #28950: Disallow -j0 to be combined with -T/-l in regrtest
 +  command line arguments.
 +
 +- Issue #28683: Fix the tests that bind() a unix socket and raise
 +  PermissionError on Android for a non-root user.
 +
 +- Issue #26939: Add the support.setswitchinterval() function to fix
 +  test_functools hanging on the Android armv7 qemu emulator.
 +
 +Build
 +-----
 +
 +- Issue #28762: lockf() is available on Android API level 24, but the F_LOCK
 +  macro is not defined in android-ndk-r13.
 +
 +- Issue #28538: Fix the compilation error that occurs because if_nameindex() is
 +  available on Android API level 24, but the if_nameindex structure is not
 +  defined.
 +
 +- Issue #20211: Do not add the directory for installing C header files and the
 +  directory for installing object code libraries to the cross compilation
 +  search paths. Original patch by Thomas Petazzoni.
 +
 +- Issue #28849: Do not define sys.implementation._multiarch on Android.
 +
 +
- What's New in Python 3.6.0 release candidate 2
- ==============================================
+ What's New in Python 3.6.0?
+ ===========================
+ 
+ *Release date: 2016-12-23*
+ 
+ - No changes since release candidate 2
+ 
+ 
+ What's New in Python 3.6.0 release candidate 2?
+ ===============================================
  
  *Release date: 2016-12-16*
  

diff --cc README
index f833c143ccea22682d790979bfaf7886d3a292d2,d52d86cd8771eb66963e8fdfa13d834cb10f590d..922f2835ce3fa597d37fe19b9505b7cf345bd288
--- 1/README
--- 2/README
+++ b/README
@@@ -1,5 -1,5 +1,5 @@@
- This is Python version 3.6.0 release candidate 1
 -This is Python version 3.6.0
 -============================
++This is Python version 3.6.1 release candidate 1
 +================================================
  
  Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
  2012, 2013, 2014, 2015, 2016 Python Software Foundation.  All rights reserved.