Merge branch 'release'

diff --cc NEWS
index 13eff6e0327128f4b616f1ddda5117233ec0e429,e1fa2d73ae027c8e2dfa666b3dcbde5be789ca5a..c0ae6afe9c7b4307a15350673c0714db0f53879c
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,14 -1,9 +1,17 @@@
- Notmuch 0.32.1 (UNRELEASED)
 +Notmuch 0.33 (UNRELEASED)
 +=========================
 +
 +Vim
 +---
 +
 +Respect excluded tags when showing a thread.
 +
+ Notmuch 0.32.1 (2021-05-15)
  ===========================
  
+ General
+ -------
+ 
  Restore handling of relative values for `database.path` that was
  broken by 0.32. Extend this handling to `database.mail_root`,
  `database.backup_dir`, and `database.hook_dir`.

diff --cc lib/open.cc
Simple merge

diff --cc test/T310-emacs.sh
Simple merge