Merge with 3.4

diff --cc Misc/NEWS
index 480f46a9fffd38f56f48c8de2dba468a589dd3e3,5d52ce7c9b54aad958245e749a11149cbd83f5da..081ea6df64a1a691ccf773bdaa2b783caf20a1df
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -325,10 -218,8 +325,12 @@@ IDL
  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.
 +
  - Issue #21285: Refactor and fix curses configure check to always search
    in a ncursesw directory.
  

diff --cc PC/VS9.0/pyproject.vsprops
Simple merge

diff --cc PCbuild/pyproject.props
index f37e69d2d23b7259aab84a12c32a7bac81ea7abc,2219c95077e91fecc2f07f5407a97891b75ce7f8..d9811cc6d9ad68be7f52e43b10358c6d5970c994
--- 1/PCbuild/pyproject.props
--- 2/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@@ -20,11 -20,13 +20,11 @@@
      <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>
      <tcltkDir>$(externalsDir)\tcltk</tcltkDir>
 -    <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
 -    <tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib>
 -    <tcltkLibDebug>$(tcltkDir)\lib\tcl86tg.lib;$(tcltkDir)\lib\tk86tg.lib</tcltkLibDebug>
 -    <tcltk64Lib>$(tcltk64Dir)\lib\tcl86t.lib;$(tcltk64Dir)\lib\tk86t.lib</tcltk64Lib>
 -    <tcltk64LibDebug>$(tcltk64Dir)\lib\tcl86tg.lib;$(tcltk64Dir)\lib\tk86tg.lib</tcltk64LibDebug>
    </PropertyGroup>
    <ItemDefinitionGroup>
      <ClCompile>

diff --cc PCbuild/readme.txt
Simple merge

diff --cc Tools/buildbot/external-common.bat
index 672357cb32217b4b8c2259cfa62f9b23ba230e21,53e3dafe6432d18e1db40dda1014c02d729a30e2..48004a720ebaac93b765c2d5e3747013ffa8ee1a
--- 1/Tools/buildbot/external-common.bat
--- 2/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@@ -14,8 -14,8 +14,8 @@@ 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 if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12
  
  @rem bzip
  if not exist bzip2-1.0.6 (
@@@ -24,14 -24,14 +24,14 @@@
  )
  
  @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
 +@rem tcl/tk/tix
  if not exist tcl-8.6.1.0 (
 -   rd /s/q tcltk tcltk64 tcl-8.5.11.0 tk-8.5.11.0
 +   rd /s/q tcltk tcltk64 tcl-8.5.11.0 tk-8.5.11.0 tix-8.4.3.3
     svn export http://svn.python.org/projects/external/tcl-8.6.1.0
  )
  if not exist tk-8.6.1.0 svn export http://svn.python.org/projects/external/tk-8.6.1.0