Issue #14184: merge

diff --cc Misc/NEWS
index 85b7c9f23741124cb9d6a63c00946cf56dfe5013,295a425b030c3545b6604679a37a94eaae9469c0..4457c6cddc4ef95a1c4325a5799bb212f389b734
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -24,46 -22,37 +24,49 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #14184: Increase the default stack size for secondary threads on
+   Mac OS X to avoid interpreter crashes when using threads on 10.7.
+ 
 +- Issue #14180: time.ctime(), gmtime(), time.localtime(),
 +  datetime.date.fromtimestamp(), datetime.datetime.fromtimestamp() and
 +  datetime.datetime.utcfromtimestamp() now raises an OverflowError, instead of
 +  a ValueError, if the timestamp does not fit in time_t.
 +
 +- Issue #14180: datetime.datetime.fromtimestamp() and
 +  datetime.datetime.utcfromtimestamp() now round microseconds towards zero
 +  instead of rounding to nearest with ties going away from zero.
 +
  - Issue #10543: Fix unittest test discovery with Jython bytecode files.
  
 -- Issue #14252: Fix subprocess.Popen.terminate() to not raise an error under
 -  Windows when the child process has already exited.
 +- Issue #1178863: Separate initialisation from setting when initializing
 +  Tkinter.Variables; harmonize exceptions to ValueError; only delete variables
 +  that have not been deleted; assert that variable names are strings.
  
 -- Issue #14195: An issue that caused weakref.WeakSet instances to incorrectly
 -  return True for a WeakSet instance 'a' in both 'a < a' and 'a > a' has been
 -  fixed.
 +- Issue #14104: Implement time.monotonic() on Mac OS X, patch written by
 +  Nicholas Riley.
  
 -- Issue #14177: marshal.loads() now raises TypeError when given an unicode
 -  string.  Patch by Guilherme Gonçalves.
 +- Issue #13394: the aifc module now uses warnings.warn() to signal warnings.
  
 -- Issue #14159: Fix the len() of weak containers (WeakSet, WeakKeyDictionary,
 -  WeakValueDictionary) to return a better approximation when some objects
 -  are dead or dying.  Moreover, the implementation is now O(1) rather than
 -  O(n).
 +- Issue #14252: Fix subprocess.Popen.terminate() to not raise an error under
 +  Windows when the child process has already exited.
  
 -- Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode.
 -  Patch by Mikhail Novikov.
 +- Issue #14223: curses.addch() is no more limited to the range 0-255 when the
 +  Python curses is not linked to libncursesw. It was a regression introduced
 +  in Python 3.3a1.
  
 -- Issue #13447: Add a test file to host regression tests for bugs in the
 -  scripts found in the Tools directory.
 +- Issue #14168: Check for presence of Element._attrs in minidom before
 +  accessing it.
  
 -- Issue #6884: Fix long-standing bugs with MANIFEST.in parsing in distutils
 -  on Windows.
 +- Issue #12328: Fix multiprocessing's use of overlapped I/O on Windows.
 +  Also, add a multiprocessing.connection.wait(rlist, timeout=None) function
 +  for polling multiple objects at once.  Patch by sbt.
  
 -- Issue #8033: sqlite3: Fix 64-bit integer handling in user functions
 -  on 32-bit architectures. Initial patch by Philippe Devalkeneer.
 +- Issue #14007: Accept incomplete TreeBuilder objects (missing start, end,
 +  data or close method) for the Python implementation as well.
 +  Drop the no-op TreeBuilder().xml() method from the C implementation.
 +
 +- Issue #14210: pdb now has tab-completion not only for command names, but
 +  also for their arguments, wherever possible.
  
  Extension Modules
  -----------------

diff --cc Python/thread_pthread.h
Simple merge