Issue #28248: Merge with 3.6

diff --cc Misc/NEWS
index f81b084450213a017d5ef4f6e2cb6323785a0092,1b45dbfe00418fbad19acd861da1c0e7c869d584..76b2889343c68080cb551824ee7466e08c04879b
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -262,16 -270,6 +262,18 @@@ Window
  Build
  -----
  
++- Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
++
 +- Issue #21124: Fix building the _struct module on Cygwin by passing ``NULL``
 +  instead of ``&PyType_Type`` to PyVarObject_HEAD_INIT.  Patch by Masayuki
 +  Yamamoto.
 +
 +- Issue #13756: Fix building extensions modules on Cygwin.  Patch by Roumen
 +  Petrov, based on original patch by Jason Tishler.
 +
 +- Issue #21085: Add configure check for siginfo_t.si_band, which Cygwin does
 +  not provide.  Patch by Masayuki Yamamoto with review and rebase by Erik Bray.
 +
  - Issue #28258: Fixed build with Estonian locale (python-config and distclean
    targets in Makefile).  Patch by Arfrever Frehtes Taifersar Arahesis.
  

diff --cc PCbuild/readme.txt
Simple merge