From: Ned Deily <nad@python.org>
Date: Mon, 15 Feb 2016 05:47:03 +0000 (+1100)
Subject: Issue #26268: merge from 3.5
X-Git-Tag: v3.6.0a1~606
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44f9bc959f79fa2f6b4896edc429e4e81c26c303;p=python

Issue #26268: merge from 3.5
---

44f9bc959f79fa2f6b4896edc429e4e81c26c303
diff --cc Misc/NEWS
index b7ac0ceba0,b33558a394..c4e50ca257
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -723,14 -243,7 +723,14 @@@ 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 #25798: Update OS X 10.5 installer to use OpenSSL 1.0.2e.
+ - Issue #26268: Update OS X 10.5 installer to use OpenSSL 1.0.2f.
  
  Windows
  -------