Issue #28248: Merge with 3.5

diff --cc Misc/NEWS
index 70dac5ae02ae16a875f61ab0f2b9f574d0d27f37,44e63d42f2d270a817f3980445fe38727353d1b5..1b45dbfe00418fbad19acd861da1c0e7c869d584
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,22 -2,10 +2,27 @@@
  Python News
  +++++++++++
  
 -What's New in Python 3.5.3 release candidate 1?
 -===============================================
 +What's New in Python 3.6.0 beta 3
 +=================================
 +
 +*Release date: XXXX-XX-XX*
 +
 +Core and Builtins
 +-----------------
 +
 +Library
 +-------
 +
++Build
++-----
++
++- Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
++
 +
 +What's New in Python 3.6.0 beta 2
 +=================================
  
 -Release date: TBA
 +*Release date: 2016-10-10*
  
  Core and Builtins
  -----------------

diff --cc PCbuild/get_externals.bat
index 91a2a6dca69e30fa9d2a9d74eeb5cca0302a052e,1c3cdee2c4bd84cc224e4be8d86f924989d8cadb..de85402b81399fef698fbccc279bd7f1c5801f36
--- 1/PCbuild/get_externals.bat
--- 2/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@@ -54,12 -54,12 +54,12 @@@ echo.Fetching external libraries..
  set libraries=\r
  set libraries=%libraries%                                    bzip2-1.0.6\r
  if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     nasm-2.11.06\r
- if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2h\r
+ if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2j\r
 -set libraries=%libraries%                                    sqlite-3.8.11.0\r
 -if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2\r
 -if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2\r
 +set libraries=%libraries%                                    sqlite-3.14.1.0\r
 +if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0\r
 +if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0\r
  if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.6\r
 -set libraries=%libraries%                                    xz-5.0.5\r
 +set libraries=%libraries%                                    xz-5.2.2\r
  \r
  for %%e in (%libraries%) do (\r
      if exist %%e (\r

diff --cc PCbuild/python.props
index 2b9b903cc5d1e46287c6acce74f9a197dda1d590,1553731d1fece3331e04c7ac2a58e46fae72beae..fd7c4add8ae1c11dd6837db915a7c33187c9afd4
--- 1/PCbuild/python.props
--- 2/PCbuild/python.props
+++ b/PCbuild/python.props
@@@ -42,10 -43,10 +42,10 @@@
      
      <!-- Directories of external projects. tcltk is handled in tcltk.props -->
      <ExternalsDir>$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`))</ExternalsDir>
 -    <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
 +    <sqlite3Dir>$(ExternalsDir)sqlite-3.14.1.0\</sqlite3Dir>
      <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
 -    <lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir>
 +    <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
-     <opensslDir>$(ExternalsDir)openssl-1.0.2h\</opensslDir>
+     <opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir>
      <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
      <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
      <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>

diff --cc PCbuild/readme.txt
Simple merge