From: Zachary Ware <zachary.ware@gmail.com>
Date: Mon, 22 Feb 2016 10:16:33 +0000 (-0600)
Subject: Issue #26268: Merge with 3.5
X-Git-Tag: v3.6.0a1~583
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72f2ef41376610cd2cb545672b23c48d72ec63c7;p=python

Issue #26268: Merge with 3.5
---

72f2ef41376610cd2cb545672b23c48d72ec63c7
diff --cc Misc/NEWS
index d0f9531c52,6155eddb33..4b10cbb338
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -744,15 -258,9 +744,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 to use OpenSSL 1.0.2f.
+ - Issue #26268: Update OS X 10.5 installer and Windows builds to use
+   OpenSSL 1.0.2f.
+ 
 +
  Windows
  -------