merge with 3.3

.hgtags

@@ -113,3 +113,4 @@ c191d21cefafb3832c45570e84854e309aa62eaa v3.3.0rc3
 bd8afb90ebf28ba4edc901d4a235f75e7bbc79fd v3.3.0
 92c2cfb924055ce68c4f78f836dcfe688437ceb8 v3.3.1rc1
 d9893d13c6289aa03d33559ec67f97dcbf5c9e3c v3.3.1
+d047928ae3f6314a13b6137051315453d0ae89b6 v3.3.2

PC/VS9.0/pyproject.vsprops

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

PCbuild/pyproject.props

@@ -20,7 +20,7 @@
     <sqlite3Dir>$(externalsDir)\sqlite-3.7.12</sqlite3Dir>
     <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
     <lzmaDir>$(externalsDir)\xz-5.0.3</lzmaDir>
-    <opensslDir>$(externalsDir)\openssl-1.0.1d</opensslDir>
+    <opensslDir>$(externalsDir)\openssl-1.0.1e</opensslDir>
     <tcltkDir>$(externalsDir)\tcltk</tcltkDir>
     <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
     <tcltkLib>$(tcltkDir)\lib\tcl85.lib;$(tcltkDir)\lib\tk85.lib</tcltkLib>

PCbuild/readme.txt

@@ -142,7 +142,7 @@ _ssl
 
     Get the source code through
 
-    svn export http://svn.python.org/projects/external/openssl-1.0.1d
+    svn export http://svn.python.org/projects/external/openssl-1.0.1e
 
     ** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
     obtaining external sources then you don't need to manually get the source

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.1d rd /s/q openssl-1.0.1d
+@rem if exist openssl-1.0.1e rd /s/q openssl-1.0.1e
 @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.1d (
-    rd /s/q openssl-1.0.1c
-    svn export http://svn.python.org/projects/external/openssl-1.0.1d
+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
 )
 
 @rem tcl/tk