Issues #27850 and #27766: Remove 3DES from ssl default cipher list and add ChaCha20...

diff --cc Doc/library/ssl.rst
index 892c0ea124e552a97d2f0964766c6fe0334a891f,01d86c8bebf7b5739e1dc386e4c2b2ac10961228..3706a6e8966975b9d8f310d3a0113ecadc46929a
--- 1/Doc/library/ssl.rst
--- 2/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@@ -285,6 -279,12 +285,12 @@@ purposes
  
       RC4 was dropped from the default cipher string.
  
 -   .. versionchanged:: 3.5.3
++   .. versionchanged:: 3.6
+ 
+      ChaCha20/Poly1305 was added to the default cipher string.
+ 
+      3DES was dropped from the default cipher string.
+ 
  
  Random generation
  ^^^^^^^^^^^^^^^^^

diff --cc Lib/ssl.py
Simple merge

diff --cc Misc/NEWS
index 15aedb644f0d485f6aa795d1206e6e120ec16a0e,a443f938be49e3d5dc872bda1e847b9c4d50c9c0..1416c74dec50f1de563a6c4f0058cbb4c6e81276
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -85,31 -39,35 +85,37 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #27850: Remove 3DES from ssl module's default cipher list to counter
+   measure sweet32 attack (CVE-2016-2183).
+ 
+ - Issue #27766: Add ChaCha20 Poly1305 to ssl module's default ciper list.
+   (Required OpenSSL 1.1.0 or LibreSSL).
+ 
 +- Issue #25387: Check return value of winsound.MessageBeep.
 +
 +- Issue #27866: Add SSLContext.get_ciphers() method to get a list of all
 +  enabled ciphers.
 +
 +- Issue #27744: Add AF_ALG (Linux Kernel crypto) to socket module.
 +
  - Issue #26470: Port ssl and hashlib module to OpenSSL 1.1.0.
  
 +- Issue #11620: Fix support for SND_MEMORY in winsound.PlaySound.  Based on a
 +  patch by Tim Lesher.
 +
 +- Issue #11734: Add support for IEEE 754 half-precision floats to the
 +  struct module. Based on a patch by Eli Stevens.
 +
 +- Issue #27919: Deprecated ``extra_path`` distribution option in distutils
 +  packaging.
 +
 +- Issue #23229: Add new ``cmath`` constants: ``cmath.inf`` and ``cmath.nan`` to
 +  match ``math.inf`` and ``math.nan``, and also ``cmath.infj`` and
 +  ``cmath.nanj`` to match the format used by complex repr.
 +
 +- Issue #27842: The csv.DictReader now returns rows of type OrderedDict.
 +  (Contributed by Steve Holden.)
 +
  - Remove support for passing a file descriptor to os.access. It never worked but
    previously didn't raise.