Issue #23996: Avoid a crash when a delegated generator raises an unnormalized StopIte...

diff --cc Misc/NEWS
index 1d54c5f221f39d2169a70a2aac57695a0af98ce8,e84e142857d37243423a2caa85cb22cd5a942700..e44958bcaa3b31953579c361e125d72f6df5adf6
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,66 -10,10 +10,69 @@@ Release date: 2015-04-2
  Core and Builtins
  -----------------
  
+ - Issue #23996: Avoid a crash when a delegated generator raises an
+   unnormalized StopIteration exception.  Patch by Stefan Behnel.
+ 
  - Issue #24022: Fix tokenizer crash when processing undecodable source code.
 +- Issue #9951: Added a hex() method to bytes, bytearray, and memoryview.
 +
 +Library
 +-------
 +
 +- Issue #9246: On POSIX, os.getcwd() now supports paths longer than 1025 bytes.
 +  Patch written by William Orr.
 +
 +- Issue #17445: add difflib.diff_bytes() to support comparison of
 +  byte strings (fixes a regression from Python 2).
 +
 +- Issue #23917: Fall back to sequential compilation when ProcessPoolExecutor
 +  doesn't exist.  Patch by Claudiu Popa.
 +
 +- Issue #23008: Fixed resolving attributes with boolean value is False in pydoc.
 +
 +- Fix asyncio issue 235: LifoQueue and PriorityQueue's put didn't
 +  increment unfinished tasks (this bug was introduced when
 +  JoinableQueue was merged with Queue).
 +
 +- Issue #23908: os functions now reject paths with embedded null character
 +  on Windows instead of silently truncate them.
 +
 +- Issue #23728: binascii.crc_hqx() could return an integer outside of the range
 +  0-0xffff for empty data.
 +
 +- Issue #23887: urllib.error.HTTPError now has a proper repr() representation.
 +  Patch by Berker Peksag.
 +
 +Documentation
 +-------------
 +
 +- Issue #24029: Document the name binding behavior for submodule imports.
 +
 +Tools/Demos
 +-----------
 +
 +- Issue #24031: make patchcheck now supports git checkouts, too.
 +
 +What's New in Python 3.5.0 alpha 4?
 +===================================
 +
 +Release date: 2015-04-19
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #22980: Under Linux, GNU/KFreeBSD and the Hurd, C extensions now include
 +  the architecture triplet in the extension name, to make it easy to test builds
 +  for different ABIs in the same working tree.  Under OS X, the extension name
 +  now includes PEP 3149-style information.
 +
 +- Issue #22631: Added Linux-specific socket constant CAN_RAW_FD_FRAMES.
 +  Patch courtesy of Joe Jevnik.
 +
 +- Issue #23731: Implement PEP 488: removal of .pyo files.
 +
 +- Issue #23726: Don't enable GC for user subclasses of non-GC types that
 +  don't add any new fields.  Patch by Eugene Toder.
  
  - 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

diff --cc Objects/genobject.c
Simple merge