summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2014-06-06 06:27:34 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2014-06-06 06:27:34 (GMT)
commit3266a8fa5910e941e3f640cb9e2804294d42ceca (patch)
treed4281907ebfb98a8f710e1e5d20fba1454c0f0f7 /Misc
parentcc568b12225f944330c09484bac482aa2cc67a5f (diff)
parent7d55da42a4e7f1145f14312b703298aff25c0e06 (diff)
downloadcpython-3266a8fa5910e941e3f640cb9e2804294d42ceca.zip
cpython-3266a8fa5910e941e3f640cb9e2804294d42ceca.tar.gz
cpython-3266a8fa5910e941e3f640cb9e2804294d42ceca.tar.bz2
Issue #21671: Merge with 3.4
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS8
1 files changed, 6 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 8e5fb3a..caf6c18 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -484,8 +484,6 @@ Build
- Issue #21037: Add a build option to enable AddressSanitizer support.
-- The Windows build now includes OpenSSL 1.0.1g
-
- Issue #19962: The Windows build process now creates "python.bat" in the
root of the source tree, which passes all arguments through to the most
recently built interpreter.
@@ -607,6 +605,12 @@ Tools/Demos
- Issue #20535: PYTHONWARNING no longer affects the run_tests.py script.
Patch by Arfrever Frehtes Taifersar Arahesis.
+Windows
+-------
+
+- Issue #21671, CVE-2014-0224: The bundled version of OpenSSL has been
+ updated to 1.0.1h.
+
What's New in Python 3.4.0?
===========================