merge: upstream fixes
authorRichard Russon <rich@flatcap.org>
Wed, 20 Jun 2018 15:29:38 +0000 (16:29 +0100)
committerRichard Russon <rich@flatcap.org>
Wed, 20 Jun 2018 15:29:38 +0000 (16:29 +0100)
 * Add $pgp_check_gpg_decrypt_status_fd.
 * Add GnuPG status fd checks for inline pgp.
 * Allow larger passphrase timeout values
 * mutt_str_atol: better error handling


Trivial merge