merge: upstream stable

 * Added tag mutt-1-7-rel for changeset a4e83f60e42f
 * mutt-1.7.0 signed
 * Increase date buffer size for $folder_format.  (closes #3863)
 * Disable ~X when message scoring.  (closes #3861)
 * Fix pgpring reporting of DSA and Elgamal key lengths.  (closes #3867)
 * Autoconf: always check for getaddrinfo().
 * Stub out getdnsdomainname() unless HAVE_GETADDRINFO.
 * Add missing sidebar contrib sample files to dist tarball.

diff --cc browser.c
Simple merge

diff --cc configure.ac
Simple merge

diff --cc contrib/Makefile.am
index e3484c75ab30df8d5aeb73dd00d3e6c236d3369c,3ca99a023e7e82fb6f94692abe75566222cf3ece..65862e674e27225a37b1f92455d3b4fed0ff1692
--- 1/contrib/Makefile.am
--- 2/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@@ -3,10 -3,9 +3,10 @@@
  subdir = contrib
  
  SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
-       sample.muttrc  sample.mailcap sample.muttrc-tlr \
-       colors.default colors.linux smime.rc \
+       sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
+       sample.vimrc-sidebar colors.default colors.linux smime.rc \
 -      ca-bundle.crt smime_keys_test.pl mutt_xtitle
 +      ca-bundle.crt smime_keys_test.pl mutt_xtitle \
 +      sample.colors.attach_headers
  
  EXTRA_DIST = language.txt language50.txt  \
        patch.slang-1.2.2.keypad.1      \

diff --cc doc/manual.xml.head
Simple merge

diff --cc pattern.c
Simple merge