Nerge 3.3 into default.

Issue #18942: sys._debugmallocstats() output was damaged on Windows.

_PyDebugAllocatorStats() called PyOS_snprintf() with a %zd format
code, but MS doesn't support that code.  Interpolated
PY_FORMAT_SIZE_T in place of the "z".

diff --cc Misc/NEWS
index 88a9d62ad7e122857989cea9772c2c404038c0f4,8052c6b6b72e609e23b4d07e0a834cbd5ee55d94..b5e4bcf748ccedbdddf37805bb38c4db31728b32
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,46 -12,58 +10,48 @@@ Projected Release date: 2013-09-0
  Core and Builtins
  -----------------
  
 -- Issue #18667: Add missing "HAVE_FCHOWNAT" symbol to posix._have_functions.
 -
 -- Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc()
 -  fails.
 -
 -- Issue #16741: Fix an error reporting in int().
 -
 -- Issue #17899: Fix rare file descriptor leak in os.listdir().
 -
 -- Issue #18552: Check return value of PyArena_AddPyObject() in
 -  obj2ast_object().
 -
 -- Issue #18560: Fix potential NULL pointer dereference in sum().
+ - Issue #18942: sys._debugmallocstats() output was damaged on Windows.
+ 
 +- Issue #18571: Implementation of the PEP 446: file descriptors and file
 +  handles are now created non-inheritable; add functions
 +  os.get/set_inheritable(), os.get/set_handle_inheritable() and
 +  socket.socket.get/set_inheritable().
  
 -- Issue #15905: Fix theoretical buffer overflow in handling of sys.argv[0],
 -  prefix and exec_prefix if the operation system does not obey MAXPATHLEN.
 +- Issue #11619: The parser and the import machinery do not encode Unicode
 +  filenames anymore on Windows.
  
 -- Issue #18344: Fix potential ref-leaks in _bufferedreader_read_all().
 +- Issue #18808: Non-daemon threads are now automatically joined when
 +  a sub-interpreter is shutdown (it would previously dump a fatal error).
  
 -- Issue #17872: Fix a segfault in marshal.load() when input stream returns
 -  more bytes than requested.
 +- Remove supporting for compiling on systems without getcwd().
  
 -- Issue #18426: Fix NULL pointer dereference in C extension import when
 -  PyModule_GetDef() returns an error.
 +- Issue #18774: Remove last bits of GNU PTH thread code and thread_pth.h.
  
 -- Issue #18328: Reorder ops in PyThreadState_Delete*() functions. Now the
 -  tstate is first removed from TLS and then deallocated.
 +- Issue #18771: Add optimization to set object lookups to reduce the cost
 +  of hash collisions.  The core idea is to inspect a second key/hash pair
 +  for each cache line retrieved.
  
 -- Issue #18184: PyUnicode_FromFormat() and PyUnicode_FromFormatV() now raise
 -  OverflowError when an argument of %c format is out of range.
 +- Issue #16105: When a signal handler fails to write to the file descriptor
 +  registered with ``signal.set_wakeup_fd()``, report an exception instead
 +  of ignoring the error.
  
 -- Issue #18137: Detect integer overflow on precision in float.__format__()
 -  and complex.__format__().
 +- Issue #18722: Remove uses of the "register" keyword in C code.
  
 -- Issue #18183: Fix various unicode operations on strings with large unicode
 -  codepoints.
 +- Issue #18667: Add missing "HAVE_FCHOWNAT" symbol to posix._have_functions.
  
 -- Issue #18180: Fix ref leak in _PyImport_GetDynLoadWindows().
 +- Issue #16499: Add command line option for isolated mode.
  
 -- Issue #18038: SyntaxError raised during compilation sources with illegal
 -  encoding now always contains an encoding name.
 +- Issue #15301: Parsing fd, uid, and gid parameters for builtins
 +  in Modules/posixmodule.c is now far more robust.
  
 -- Issue #17644: Fix a crash in str.format when curly braces are used in square
 -  brackets.
 +- Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc()
 +  fail.
  
 -- Issue #17983: Raise a SyntaxError for a ``global __class__`` statement in a
 -  class body.
 +- Issue #17934: Add a clear() method to frame objects, to help clean up
 +  expensive details (local variables) and break reference cycles.
  
 -- Issue #17927: Frame objects kept arguments alive if they had been copied into
 -  a cell, even if the cell was cleared.
 +- Issue #18780: %-formatting codes %d, %i, and %u now treat int-subclasses
 +  as int (displays value of int-subclass instead of str(int-subclass) ).
  
  Library
  -------

diff --cc Objects/obmalloc.c
Simple merge