Merge remote-tracking branch 'origin/release'

diff --combined test/test-lib.sh
index 6bc0b7239f60e3880fae70c25f08c738ea7382b8,2ba224c372f6125cd2b0fe661259a63e8b3f403c..f1275b85eca9ec428d5748577f2a5255445d952b
--- 1/test/test-lib.sh
--- 2/test/test-lib.sh
+++ b/test/test-lib.sh
@@@ -145,7 -145,7 +145,7 @@@ add_gpgsm_home () 
      mkdir -p -m 0700 "$GNUPGHOME"
      gpgsm --batch --no-tty --no-common-certs-import --pinentry-mode=loopback --passphrase-fd 3 \
          --disable-dirmngr --import  >"$GNUPGHOME"/import.log 2>&1 3<<<'' <$NOTMUCH_SRCDIR/test/smime/0xE0972A47.p12
-     fpr=$(gpgsm --batch --list-key test_suite@notmuchmail.org | sed -n 's/.*fingerprint: //p')
+     fpr=$(gpgsm --batch --with-colons --list-key test_suite@notmuchmail.org | awk -F: '/^fpr/ {print $10}')
      echo "$fpr S relax" >> "$GNUPGHOME/trustlist.txt"
      gpgsm --quiet --batch --no-tty --no-common-certs-import --disable-dirmngr --import < $NOTMUCH_SRCDIR/test/smime/ca.crt
      echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$GNUPGHOME/trustlist.txt"
@@@ -529,7 -529,7 +529,7 @@@ notmuch_debug_sanitize () 
  }
  
  notmuch_exception_sanitize () {
 -    perl -pe 's/(A Xapian exception occurred at .*[.]cc?):([0-9]*)/\1:XXX/'
 +    perl -pe 's,(A Xapian exception occurred at) .*?([^/]*[.]cc?):([0-9]*),\1 \2:XXX,'
  }
  
  notmuch_search_sanitize () {