From: Ned Deily <nad@python.org>
Date: Tue, 8 Mar 2016 06:11:14 +0000 (-0500)
Subject: Issue #26465: merge from 3.5
X-Git-Tag: v3.6.0a1~515
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a5e1afb922fb8438f19345ae858515b20d6fd43;p=thirdparty%2FPython%2Fcpython.git

Issue #26465: merge from 3.5
---

3a5e1afb922fb8438f19345ae858515b20d6fd43
diff --cc Misc/NEWS
index f470f660440d,3043456cdae4..734c967aca37
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -799,15 -305,10 +799,17 @@@ Buil
  
  - Issue #25696: Fix installation of Python on UNIX with make -j9.
  
 +- Issue #24986: It is now possible to build Python on Windows without errors
 +  when external libraries are not available.
 +
 +- Issue #24421: Compile Modules/_math.c once, before building extensions.
 +  Previously it could fail to compile properly if the math and cmath builds
 +  were concurrent.
 +
- - Issue #26268: Update OS X 10.5 installer and Windows builds to use
-   OpenSSL 1.0.2f.
+ - Issue #26465: Update OS X 10.5+ 32-bit-only installer to build
+   and link with OpenSSL 1.0.2g.
+ 
+ - Issue #26268: Update Windows builds to use OpenSSL 1.0.2f.
  
  - Issue #25136: Support Apple Xcode 7's new textual SDK stub libraries.