[Python-checkins] cpython (merge 3.5 -> default): Issue #26930: merge from 3.5

[ned.deily]

https://hg.python.org/cpython/rev/edf5ae3162ef
changeset:   101735:edf5ae3162ef
parent:      101732:0a8509023c09
parent:      101734:5462d455215a
user:        Ned Deily <nad at python.org>
date:        Sat Jun 04 17:24:01 2016 -0700
summary:
  Issue #26930: merge from 3.5

files:
  Mac/BuildScript/build-installer.py |  6 +++---
  Misc/NEWS                          |  6 ++++++
  2 files changed, 9 insertions(+), 3 deletions(-)


diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -242,9 +242,9 @@
 
         result.extend([
           dict(
-              name="OpenSSL 1.0.2g",
-              url="https://www.openssl.org/source/openssl-1.0.2g.tar.gz",
-              checksum='f3c710c045cdee5fd114feb69feba7aa',
+              name="OpenSSL 1.0.2h",
+              url="https://www.openssl.org/source/openssl-1.0.2h.tar.gz",
+              checksum='9392e65072ce4b614c1392eefc1f23d0',
               patches=[
                   "openssl_sdk_makedepend.patch",
                    ],
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -122,6 +122,12 @@
   The Windows launcher ``py.exe`` no longer prefers an installed
   Python 2 version over Python 3 by default when used interactively.
 
+Build
+-----
+
+- Issue #26930: Update OS X 10.5+ 32-bit-only installer to build
+  and link with OpenSSL 1.0.2h.
+
 
 What's New in Python 3.6.0 alpha 1?
 ===================================

-- 
Repository URL: https://hg.python.org/cpython