Issue #26930: merge from 3.5

This commit is contained in:
Ned Deily 2016-06-04 17:24:01 -07:00
commit f39571ed64
2 changed files with 9 additions and 3 deletions

View File

@ -242,9 +242,9 @@ def library_recipes():
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",
],

View File

@ -122,6 +122,12 @@ Windows
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?
===================================