Issue 16998: Clarify that += on a shared value is not atomic.
Merge.
Fix handling of SystemExit and exit code.  Patch by Brodie Rao.
Merge.
Issue #19599: Increase sleep period.
Merge.
Issue #19448: Add private API to SSL module to lookup ASN.1 objects by OID, NID, short name and long name.
Fix indentation in doc example.
Merge indentation fix in doc example from 3.3.
Issue #19603: Use specific asserts in test_decr.
Issue #19603: Use specific asserts in test_decr.
Fix compilation error under gcc of the ctypes module bundled libffi for arm.
A variable was declared below the top of a block and one function was using
a K&R C style function declaration!
Fix compilation error under gcc of the ctypes module bundled libffi for arm.
A variable was declared below the top of a block and one function was using
a K&R C style function declaration!
Fix test.support.bind_port() to not cause an error when Python was compiled
on a system with SO_REUSEPORT defined in the headers but run on a system
with an OS kernel that does not support that reasonably new socket option.
Fix test.support.bind_port() to not cause an error when Python was compiled
on a system with SO_REUSEPORT defined in the headers but run on a system
with an OS kernel that does not support that reasonably new socket option.
Issue #19634: time.strftime("%y") now raises a ValueError on AIX when given a
year before 1900.
test_selectors: test_timeout fails sometimes on busy (slow) buildbots, relax
the unit test on max time (but be more strict on mon time). Example of failure:

http://buildbot.python.org/all/builders/x86%20OpenIndiana%203.x/builds/6978/steps/test/logs/stdio

======================================================================
FAIL: test_timeout (test.test_selectors.PollSelectorTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/export/home/buildbot/32bits/3.x.cea-indiana-x86/build/Lib/test/test_selectors.py", line 316, in test_timeout
    self.assertTrue(0.5 < t1 - t0 < 1.5, t1 - t0)
AssertionError: False is not true : 1.5033390671014786
Issue #17618: Add Base85 and Ascii85 encoding/decoding to the base64 module.
Fix compiler warnings on Windows 64-bit in grammar.c

INT_MAX states and labels should be enough for everyone
Fix a compiler warning on Windows 64-bit in parsetok.c

Python parser doesn't support lines longer than INT_MAX bytes yet