Merge with 3.4

Misc/NEWS

@@ -325,6 +325,8 @@ IDLE
 Build
 -----
 
+- The Windows build now includes OpenSSL 1.0.1g
+
 - Issue #19962: The Windows build process now creates "python.bat" in the
   root of the source tree, which passes all arguments through to the most
   recently built interpreter.

PC/VS9.0/pyproject.vsprops

@@ -62,7 +62,7 @@
 	/>
 	<UserMacro
 		Name="opensslDir"
-		Value="$(externalsDir)\openssl-1.0.1e"
+		Value="$(externalsDir)\openssl-1.0.1g"
 	/>
 	<UserMacro
 		Name="tcltkDir"

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.1e</opensslDir>
+    <opensslDir>$(externalsDir)\openssl-1.0.1g</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>

PCbuild/readme.txt

@@ -168,7 +168,7 @@ _lzma
     Homepage:
         http://tukaani.org/xz/
 _ssl
-    Python wrapper for version 1.0.1e of the OpenSSL secure sockets
+    Python wrapper for version 1.0.1g of the OpenSSL secure sockets
     library, which is built by ssl.vcxproj
     Homepage:
         http://www.openssl.org/

Tools/buildbot/external-common.bat

@@ -14,7 +14,7 @@ cd ..
 @rem if exist tk8.4.16 rd /s/q tk8.4.16
 @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
 @rem if exist db-4.4.20 rd /s/q db-4.4.20
-@rem if exist openssl-1.0.1e rd /s/q openssl-1.0.1e
+@rem if exist openssl-1.0.1e rd /s/q openssl-1.0.1g
 @rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12
 
 @rem bzip
@@ -24,9 +24,9 @@ if not exist bzip2-1.0.6 (
 )
 
 @rem OpenSSL
-if not exist openssl-1.0.1e (
-    rd /s/q openssl-1.0.1d
-    svn export http://svn.python.org/projects/external/openssl-1.0.1e
+if not exist openssl-1.0.1g (
+    rd /s/q openssl-1.0.1e
+    svn export http://svn.python.org/projects/external/openssl-1.0.1g
 )
 
 @rem tcl/tk/tix