Merge branch 'common-6x' into legacy_63

Conflicts:
	NEWS
	fetchmail-SA-2011-01.txt

diff --cc NEWS
index bd4c450dfa2880a318faf69f9cf7b509a445b606,eacede8a2f32f84418075d3c7a05ad72c246df76..53db19a0ad06b0dbac35af1e0273238a66425740
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -56,12 -56,13 +56,13 @@@ removed from a 6.4.0 or newer release.
  
  --------------------------------------------------------------------------------
  
 -fetchmail-6.3.20 (not yet released):
 +fetchmail-6.3.20 (not yet released, 26005 LoC):
  
  # SECURITY BUG FIXES
- * STARTTLS: Fetchmail runs the IMAP STARTTLS or POP3 STLS negotiation with the
+ * CVE-2011-1947:
 -  Fetchmail runs the IMAP STARTTLS or POP3 STLS negotiation with the set timeout
 -  (default five minutes) now. This was reported missing, from fetchmail freezes
 -  beyond a week, by Thomas Jarosch.
++  STARTTLS: Fetchmail runs the IMAP STARTTLS or POP3 STLS negotiation with the
 +  set timeout (default five minutes) now. This was reported missing, with
 +  observed fetchmail freezes beyond a week, by Thomas Jarosch.
       SSL-wrapped connections were unaffected by this timeout, so users of older
    versions can force ssl-wrapped connections -- if supported by the server --
    with the --ssl command line or ssl rcfile option.