summaryrefslogtreecommitdiffstats
path: root/Misc/NEWS
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2016-02-22 10:16:33 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2016-02-22 10:16:33 (GMT)
commit72f2ef41376610cd2cb545672b23c48d72ec63c7 (patch)
tree11d6f80a055b74b0bfc6ef9d79382206b5df95c3 /Misc/NEWS
parentfe93283fe1142f6ef007dc6e5aecdaae2d1f89d1 (diff)
parent6fe57ad229d46516c1ead1d37c015824b2428746 (diff)
downloadcpython-72f2ef41376610cd2cb545672b23c48d72ec63c7.zip
cpython-72f2ef41376610cd2cb545672b23c48d72ec63c7.tar.gz
cpython-72f2ef41376610cd2cb545672b23c48d72ec63c7.tar.bz2
Issue #26268: Merge with 3.5
Diffstat (limited to 'Misc/NEWS')
-rw-r--r--Misc/NEWS8
1 files changed, 7 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index d0f9531..4b10cbb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -751,11 +751,17 @@ Build
Previously it could fail to compile properly if the math and cmath builds
were concurrent.
-- Issue #26268: Update OS X 10.5 installer to use OpenSSL 1.0.2f.
+- Issue #26268: Update OS X 10.5 installer and Windows builds to use
+ OpenSSL 1.0.2f.
+
Windows
-------
+- Issue #26268: Update the prepare_ssl.py script to handle OpenSSL releases
+ that don't include the contents of the include directory (that is, 1.0.2e
+ and later).
+
- Issue #26071: bdist_wininst created binaries fail to start and find
32bit Python