Merge: Issue #11927: SMTP_SSL now uses port 465 by default as documented.

diff --cc Lib/smtplib.py
index 14e62504d3204c2f6828a23d8670a194073f8b07,2c2141b167c631fabc9cb31725b9f20b54c837a9..dbccf48982105c1e36a6648a28c7ecf931f86a71
--- 1/Lib/smtplib.py
--- 2/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@@ -810,11 -758,9 +813,10 @@@ if _have_ssl
              self.keyfile = keyfile
              self.certfile = certfile
              SMTP.__init__(self, host, port, local_hostname, timeout)
-             self.default_port = SMTP_SSL_PORT
  
          def _get_socket(self, host, port, timeout):
 -            if self.debuglevel > 0: print('connect:', (host, port), file=stderr)
 +            if self.debuglevel > 0:
 +                print('connect:', (host, port), file=stderr)
              new_socket = socket.create_connection((host, port), timeout)
              new_socket = ssl.wrap_socket(new_socket, self.keyfile, self.certfile)
              self.file = SSLFakeFile(new_socket)

diff --cc Lib/test/test_smtpnet.py
Simple merge

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
Simple merge