summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-06-11 20:18:56 (GMT)
committerBenjamin Peterson <benjamin@python.org>2016-06-11 20:18:56 (GMT)
commitb0557e729e07e63f36d91d1d631424616373a384 (patch)
tree37e065de80b5d6f5165e52c0b67ca4f6ed975cde /Misc
parentaf51140fa0f475ed8050a938df6ce0db3c7d607a (diff)
parent46b32f307c48bcb999b22eebf65ffe8ed5cca544 (diff)
downloadcpython-b0557e729e07e63f36d91d1d631424616373a384.zip
cpython-b0557e729e07e63f36d91d1d631424616373a384.tar.gz
cpython-b0557e729e07e63f36d91d1d631424616373a384.tar.bz2
merge 3.4
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index cc5ba7d..418fd5c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -139,6 +139,9 @@ Core and Builtins
Library
-------
+- Fix TLS stripping vulnerability in smptlib, CVE-2016-0772. Reported by Team
+ Oststrom
+
- Issue #21386: Implement missing IPv4Address.is_global property. It was
documented since 07a5610bae9d. Initial patch by Roger Luethi.