summaryrefslogtreecommitdiffstats
path: root/Misc/NEWS
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-06-11 20:33:17 (GMT)
committerBenjamin Peterson <benjamin@python.org>2016-06-11 20:33:17 (GMT)
commitb5ad54990fc74fe043c91d2a005c7c32c931bc5d (patch)
tree1acfe2e4ea825172c06709c961c474cb6921d17e /Misc/NEWS
parentb0557e729e07e63f36d91d1d631424616373a384 (diff)
parent196d7db3956f4c0b03e87b570771b3460a61bab5 (diff)
downloadcpython-b5ad54990fc74fe043c91d2a005c7c32c931bc5d.zip
cpython-b5ad54990fc74fe043c91d2a005c7c32c931bc5d.tar.gz
cpython-b5ad54990fc74fe043c91d2a005c7c32c931bc5d.tar.bz2
merge 3.4 (#26556)
Diffstat (limited to 'Misc/NEWS')
-rw-r--r--Misc/NEWS2
1 files changed, 2 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 418fd5c..d52827d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -139,6 +139,8 @@ Core and Builtins
Library
-------
+- Issue #26556: Update expat to 2.1.1, fixes CVE-2015-1283.
+
- Fix TLS stripping vulnerability in smptlib, CVE-2016-0772. Reported by Team
Oststrom