Issue #24808: Merge 3.4 into 3.5; adjust new tp_as_async field

diff --cc Doc/c-api/typeobj.rst
Simple merge

diff --cc Doc/extending/newtypes.rst
Simple merge

diff --cc Doc/includes/typestruct.h
index 5c9f8f5d9f7e9fa80745a2d9993f5a96f45104b6,726500980e465da7eaa6f2f2326fe4132dcaea95..50c46217bc41c78d990014a2430e1eb0c4621839
--- 1/Doc/includes/typestruct.h
--- 2/Doc/includes/typestruct.h
+++ b/Doc/includes/typestruct.h
@@@ -9,7 -9,7 +9,7 @@@ typedef struct _typeobject 
      printfunc tp_print;
      getattrfunc tp_getattr;
      setattrfunc tp_setattr;
-     PyAsyncMethods *tp_as_async;
 -    void *tp_reserved; /* formerly known as tp_compare */
++    PyAsyncMethods *tp_as_async; /* formerly known as tp_compare or tp_reserved */
      reprfunc tp_repr;
  
      /* Method suites for standard classes */

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index 7dd4aa4fd7592a451f4a15660457afaf4c02113e,f30b75bde3433d8de05e01e68637014110a18b68..0d7ae1d44caba1414ef6b4af7cb21a305b2196d9
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,47 -2,75 +2,50 @@@
  Python News
  +++++++++++
  
 -What's New in Python 3.4.4rc1?
 -==============================
  
 -Release date: tba
 +What's New in Python 3.5.1
 +==========================
  
 -Core and Builtins
 ------------------
 -
 -- Issue #21167: NAN operations are now handled correctly when python is
 -  compiled with ICC even if -fp-model strict is not specified.
 -
 -- Issue #4395: Better testing and documentation of binary operators.
 -  Patch by Martin Panter.
 -
 -- Issue #24467: Fixed possible buffer over-read in bytearray. The bytearray
 -  object now always allocates place for trailing null byte and it's buffer now
 -  is always null-terminated.
 -
 -- Issue #24115: Update uses of PyObject_IsTrue(), PyObject_Not(),
 -  PyObject_IsInstance(), PyObject_RichCompareBool() and _PyDict_Contains()
 -  to check for and handle errors correctly.
  
 -- Issue #24257: Fixed system error in the comparison of faked
 -  types.SimpleNamespace.
 +Release date: TBA
  
 -- Issue #22939: Fixed integer overflow in iterator object.  Patch by
 -  Clement Rouault.
  
 -- Issue #23985: Fix a possible buffer overrun when deleting a slice from
 -  the front of a bytearray and then appending some other bytes data.
 +Core and Builtins
 +-----------------
  
 -- Issue #24102: Fixed exception type checking in standard error handlers.
  
 -- Issue #23757: PySequence_Tuple() incorrectly called the concrete list API
 -  when the data was a list subclass.
 +Library
 +-------
  
 -- Issue #24407: Fix crash when dict is mutated while being updated.
 +- Issue #20362: Honour TestCase.longMessage correctly in assertRegex.
 +  Patch from Ilia Kurenkov.
  
 -- Issue #24096: Make warnings.warn_explicit more robust against mutation of the
 -  warnings.filters list.
 +- Issue #24847: Removes vcruntime140.dll dependency from Tcl/Tk.
  
 -- Issue #23996: Avoid a crash when a delegated generator raises an
 -  unnormalized StopIteration exception.  Patch by Stefan Behnel.
 +- Issue #23572: Fixed functools.singledispatch on classes with falsy
 +  metaclasses.  Patch by Ethan Furman.
  
 -- Issue #24022: Fix tokenizer crash when processing undecodable source code.
  
 -- Issue #23309: Avoid a deadlock at shutdown if a daemon thread is aborted
 -  while it is holding a lock to a buffered I/O object, and the main thread
 -  tries to use the same I/O object (typically stdout or stderr).  A fatal
 -  error is emitted instead.
 +Documentation
 +-------------
  
 -- Issue #22977: Fixed formatting Windows error messages on Wine.
 -  Patch by Martin Panter.
++- Issue #24808: Update the types of some PyTypeObject fields.  Patch by
++  Joseph Weston.
+ 
 -- Issue #23803: Fixed str.partition() and str.rpartition() when a separator
 -  is wider then partitioned string.
 +- Issue #22812: Fix unittest discovery examples.
 +  Patch from Pam McA'Nulty.
  
 -- Issue #23192: Fixed generator lambdas.  Patch by Bruno Cauet.
  
 -- Issue #23629: Fix the default __sizeof__ implementation for variable-sized
 -  objects.
 +What's New in Python 3.5.0 release candidate 2?
 +===============================================
  
 -- Issue #24044: Fix possible null pointer dereference in list.sort in out of
 -  memory conditions.
 +Release date: 2015-08-23
  
 -- Issue #21354: PyCFunction_New function is exposed by python DLL again.
 +Core and Builtins
 +-----------------
  
 -- Issue #23812: Fix asyncio.Queue.get() to avoid loosing items on cancellation.
 -  Patch by Gustavo J. A. M. Carneiro.
 +- Issue #21167: NAN operations are now handled correctly when python is
 +  compiled with ICC even if -fp-model strict is not specified.
  
  Library
  -------