Merge branch 'rm/gpg-program-doc-fix' into maint

diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index f1277bef4fa65e72607ea1f2dac326048559e6aa..8d28652b729b46cb08de8ddd4347dddda9e246a7 100755 (executable)
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -63,8 +63,7 @@ then
                cut -d" " -f4 |
                tr -d '\n' >"${GNUPGHOME}/trustlist.txt" &&
 
-               echo " S relax" >> ${GNUPGHOME}/trustlist.txt &&
-               (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
+               echo " S relax" >>"${GNUPGHOME}/trustlist.txt" &&
                echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
                        -u committer@example.com -o /dev/null --sign - 2>&1 &&
                test_set_prereq GPGSM