summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-02-02 02:11:54 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-02-02 02:11:54 (GMT)
commit38d9772622fa13f7dc1033cd29bad1b15a31c8b4 (patch)
treecae2697191bffe2ea4791a98e35f4732a75bacdf /Misc
parent4db56d5002e536bf37ed2a3fa32d899d873bde77 (diff)
parentf635dc32b1dc3d322acd281921afdb8c13261838 (diff)
downloadcpython-38d9772622fa13f7dc1033cd29bad1b15a31c8b4.zip
cpython-38d9772622fa13f7dc1033cd29bad1b15a31c8b4.tar.gz
cpython-38d9772622fa13f7dc1033cd29bad1b15a31c8b4.tar.bz2
merge 3.4 (#23365)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS2
1 files changed, 2 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 27c0f02..26db720 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -231,6 +231,8 @@ Library
- Issue #23366: Fixed possible integer overflow in itertools.combinations.
+- Issue #23366: Fixed possible integer overflow in itertools.combinations.
+
- Issue #23369: Fixed possible integer overflow in
_json.encode_basestring_ascii.