diff options
author | Zachary Ware <zachary.ware@gmail.com> | 2014-06-06 06:27:34 (GMT) |
---|---|---|
committer | Zachary Ware <zachary.ware@gmail.com> | 2014-06-06 06:27:34 (GMT) |
commit | 3266a8fa5910e941e3f640cb9e2804294d42ceca (patch) | |
tree | d4281907ebfb98a8f710e1e5d20fba1454c0f0f7 /PCbuild | |
parent | cc568b12225f944330c09484bac482aa2cc67a5f (diff) | |
parent | 7d55da42a4e7f1145f14312b703298aff25c0e06 (diff) | |
download | cpython-3266a8fa5910e941e3f640cb9e2804294d42ceca.zip cpython-3266a8fa5910e941e3f640cb9e2804294d42ceca.tar.gz cpython-3266a8fa5910e941e3f640cb9e2804294d42ceca.tar.bz2 |
Issue #21671: Merge with 3.4
Diffstat (limited to 'PCbuild')
-rw-r--r-- | PCbuild/pyproject.props | 2 | ||||
-rw-r--r-- | PCbuild/readme.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index d9811cc..20b63fc 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -20,7 +20,7 @@ <sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir> <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir> <lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir> - <opensslDir>$(externalsDir)\openssl-1.0.1g</opensslDir> + <opensslDir>$(externalsDir)\openssl-1.0.1h</opensslDir> <tclDir>$(externalsDir)\tcl-8.6.1.0</tclDir> <tkDir>$(externalsDir)\tk-8.6.1.0</tkDir> <tixDir>$(externalsDir)\tix-8.4.3.4</tixDir> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 5d6c0eb..5a16377 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -168,7 +168,7 @@ _lzma Homepage: http://tukaani.org/xz/ _ssl - Python wrapper for version 1.0.1g of the OpenSSL secure sockets + Python wrapper for version 1.0.1h of the OpenSSL secure sockets library, which is built by ssl.vcxproj Homepage: http://www.openssl.org/ |