Merge branch 'release'

diff --cc man/man1/notmuch-config.1
Simple merge

diff --cc man/man1/notmuch-count.1
Simple merge

diff --cc man/man1/notmuch-search.1
Simple merge

diff --cc man/man1/notmuch-show.1
Simple merge

diff --cc test/crypto
Simple merge