summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-02-02 02:01:43 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-02-02 02:01:43 (GMT)
commit4db56d5002e536bf37ed2a3fa32d899d873bde77 (patch)
treef3b66c6563d8bb1075c63314de6889bfc0196d5a /Misc
parentad9f99e41fb7d7e51c8424bb3adba6ad555d0451 (diff)
parent819c4e9bc41abceca28c4f8488244d03c679b8c4 (diff)
downloadcpython-4db56d5002e536bf37ed2a3fa32d899d873bde77.zip
cpython-4db56d5002e536bf37ed2a3fa32d899d873bde77.tar.gz
cpython-4db56d5002e536bf37ed2a3fa32d899d873bde77.tar.bz2
merge 3.4 (#23366)
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 40c0f01..27c0f02 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -229,6 +229,8 @@ Library
- Issue #23326: Removed __ne__ implementations. Since fixing default __ne__
implementation in issue #21408 they are redundant.
+- Issue #23366: Fixed possible integer overflow in itertools.combinations.
+
- Issue #23369: Fixed possible integer overflow in
_json.encode_basestring_ascii.