summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-02-02 02:11:39 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-02-02 02:11:39 (GMT)
commitf635dc32b1dc3d322acd281921afdb8c13261838 (patch)
tree60356caab13853d253743dd8a705504fe0d21e49 /Misc
parent819c4e9bc41abceca28c4f8488244d03c679b8c4 (diff)
parent6f082297b260d3eb4975d6d4305eba6fd26f9ae9 (diff)
downloadcpython-f635dc32b1dc3d322acd281921afdb8c13261838.zip
cpython-f635dc32b1dc3d322acd281921afdb8c13261838.tar.gz
cpython-f635dc32b1dc3d322acd281921afdb8c13261838.tar.bz2
merge 3.3 (#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 bf05c2b..0972950 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -52,6 +52,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.