[Python-checkins] cpython (merge 3.4 -> default): Issue #23212: merge from 3.4

[ned.deily]

https://hg.python.org/cpython/rev/aeba7274d68a
changeset:   94525:aeba7274d68a
parent:      94521:494376ec13d9
parent:      94524:1ddf68f118c7
user:        Ned Deily <nad at acm.org>
date:        Fri Feb 06 14:16:29 2015 +1100
summary:
  Issue #23212: merge from 3.4

files:
  Mac/BuildScript/build-installer.py |  6 +++---
  Misc/NEWS                          |  2 +-
  2 files changed, 4 insertions(+), 4 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
@@ -237,9 +237,9 @@
 
         result.extend([
           dict(
-              name="OpenSSL 1.0.1k",
-              url="https://www.openssl.org/source/openssl-1.0.1k.tar.gz",
-              checksum='d4f002bd22a56881340105028842ae1f',
+              name="OpenSSL 1.0.1l",
+              url="https://www.openssl.org/source/openssl-1.0.1l.tar.gz",
+              checksum='cdb22925fc9bc97ccbf1e007661f2aa6',
               patches=[
                   "openssl_sdk_makedepend.patch",
                    ],
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1555,7 +1555,7 @@
 
 - Issue #21236: Build _msi.pyd with cabinet.lib instead of fci.lib
 
-- Issue #17128: Use private version of OpenSSL for 2.7.9 OS X 10.5+ installer.
+- Issue #17128: Use private version of OpenSSL for OS X 10.5+ installer.
 
 C API
 -----

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