From: Ned Deily <nad@acm.org>
Date: Sun, 6 Dec 2015 04:57:55 +0000 (-0500)
Subject: Issue #25798: merge from 3.5
X-Git-Tag: v3.6.0a1~946
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7da28d29d6bd4d4e098956fc6940779aae015274;p=python

Issue #25798: merge from 3.5
---

7da28d29d6bd4d4e098956fc6940779aae015274
diff --cc Misc/NEWS
index 48f6e3bebb,7733d23965..026a19af75
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -483,22 -80,8 +483,24 @@@ Test
  Build
  -----
  
 +- Issue #24986: It is now possible to build Python on Windows without errors
 +  when external libraries are not available.
 +
+ - Issue #25798: Update OS X 10.5 installer to use OpenSSL 1.0.2e.
+ 
 +Windows
 +-------
 +
 +- Issue #25022: Removed very outdated PC/example_nt/ directory.
 +
 +Tools/Demos
 +-----------
 +
 +- Issue #25440: Fix output of python-config --extension-suffix.
 +
 +- Issue #25154: The pyvenv script has been deprecated in favour of
 +  `python3 -m venv`.
 +
  
  What's New in Python 3.5.1 final?
  =================================