Merge changes from 3.4 to bring in fixes for Issue #20995

diff --cc Misc/NEWS
index 3c7ac56bd2d6cbba689cd217867c330eb252186e,b5b719d14e03c0bfdec73dc3740ccc6ce1e8f5a7..b914fb372d0d68ff3fa8a161a083448b9fcea262
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -23,23 -21,10 +23,29 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #20995: Enhance default ciphers used by the ssl module to enable
+   better security an prioritize perfect forward secrecy.
+ 
 +- Issue #20627: xmlrpc.client.ServerProxy is now a context manager.
 +
 +- Issue #19165: The formatter module now raises DeprecationWarning instead of
 +  PendingDeprecationWarning.
 +
 +- Issue #13936: Remove the ability of datetime.time instances to be considered
 +  false in boolean contexts.
 +
 +- Issue 18931: selectors module now supports /dev/poll on Solaris.
 +  Patch by Giampaolo Rodola'.
 +
 +- Issue #19977: When the ``LC_TYPE`` locale is the POSIX locale (``C`` locale),
 +  :py:data:`sys.stdin` and :py:data:`sys.stdout` are now using the
 +  ``surrogateescape`` error handler, instead of the ``strict`` error handler.
 +
 +- Issue #20574: Implement incremental decoder for cp65001 code (Windows code
 +  page 65001, Microsoft UTF-8).
++=======
+ - Issue #20884: Don't assume that __file__ is defined on importlib.__init__.
++>>>>>>> other
  
  - Issue #20879: Delay the initialization of encoding and decoding tables for
    base32, ascii85 and base85 codecs in the base64 module, and delay the