From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 4 Sep 2015 05:36:05 +0000 (+0300)
Subject: Merge heads
X-Git-Tag: v3.6.0a1~1677
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1a4c57663baa16be8bb682c1b890a84087cd21f;p=python

Merge heads
---

e1a4c57663baa16be8bb682c1b890a84087cd21f
diff --cc Misc/NEWS
index 2c0d92b2b9,377ed52523..0e9474297f
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -157,15 -154,9 +166,18 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #24913: Fix overrun error in deque.index().
+   Found by John Leitch and Bryce Darling.
+ 
 +- Issue #24913: Fix overrun error in deque.index().
 +  Found by John Leitch and Bryce Darling.
 +
 +- Issue #24989: Fixed buffer overread in BytesIO.readline() if a position is
 +  set beyond size.  Based on patch by John Leitch.
 +
 +- Issue #24913: Fix overrun error in deque.index().
 +  Found by John Leitch and Bryce Darling.
 +
  
  What's New in Python 3.5.0 release candidate 2?
  ===============================================