Issue #21671: Merge with 3.4 · pythoncapi/cpython@3266a8f · GitHub
Skip to content

Commit 3266a8f

Browse files
committed
Issue python#21671: Merge with 3.4
2 parents cc568b1 + 7d55da4 commit 3266a8f

4 files changed

Lines changed: 12 additions & 8 deletions

File tree

Misc/NEWS

Lines changed: 6 additions & 2 deletions

PCbuild/pyproject.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir>
2121
<bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
2222
<lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir>
23-
<opensslDir>$(externalsDir)\openssl-1.0.1g</opensslDir>
23+
<opensslDir>$(externalsDir)\openssl-1.0.1h</opensslDir>
2424
<tclDir>$(externalsDir)\tcl-8.6.1.0</tclDir>
2525
<tkDir>$(externalsDir)\tk-8.6.1.0</tkDir>
2626
<tixDir>$(externalsDir)\tix-8.4.3.4</tixDir>

PCbuild/readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ _lzma
168168
Homepage:
169169
http://tukaani.org/xz/
170170
_ssl
171-
Python wrapper for version 1.0.1g of the OpenSSL secure sockets
171+
Python wrapper for version 1.0.1h of the OpenSSL secure sockets
172172
library, which is built by ssl.vcxproj
173173
Homepage:
174174
http://www.openssl.org/

Tools/buildbot/external-common.bat

Lines changed: 4 additions & 4 deletions

0 commit comments

Comments
 (0)