merge 3.4 (#23111)

diff --cc Lib/ftplib.py
Simple merge

diff --cc Misc/NEWS
index a5e13957955952d56dc4dd1367af1d8fe787cacd,42cbc39d6e38d0f5d61344ae6498b8ea4b1ee4cd..dfcf72a25c9459d1ed0f3684a236a6dfb397a16a
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -207,9 -53,6 +207,12 @@@ Librar
  - Issue #23093: In the io, module allow more operations to work on detached
    streams.
  
++- Issue #23111: In the ftplib, make ssl.PROTOCOL_SSLv23 the default protocol
++  version.
++
 +- Issue #22585: On OpenBSD 5.6 and newer, os.urandom() now calls getentropy(),
 +  instead of reading /dev/urandom, to get pseudo-random bytes.
 +
  - Issue #19104: pprint now produces evaluable output for wrapped strings.
  
  - Issue #23071: Added missing names to codecs.__all__.  Patch by Martin Panter.