summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-07-05 03:52:33 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-07-05 03:52:33 (GMT)
commit1da0612e70f64af89340630436483366a0e86ea4 (patch)
tree2a89038b20d4445ab54c857077fa0b39581dc818 /Misc
parent2a48a6eb335e496220aa75f6daae5b56e231b8e4 (diff)
parentf1ce6deb4111267ab8de5cd6430c1bcebe1084bc (diff)
downloadcpython-1da0612e70f64af89340630436483366a0e86ea4.zip
cpython-1da0612e70f64af89340630436483366a0e86ea4.tar.gz
cpython-1da0612e70f64af89340630436483366a0e86ea4.tar.bz2
merge heads
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS4
1 files changed, 2 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 9e78e77..d209195 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -342,8 +342,8 @@ Build
- Issue #23445: pydebug builds now use "gcc -Og" where possible, to make
the resulting executable faster.
-- Issue #23686: Update OS X 10.5 installer and Windows builds to use
- OpenSSL 1.0.2a.
+- Issue #24432: Update Windows builds and OS X 10.5 installer to use OpenSSL
+ 1.0.2c.
C API
-----