Merge branch 'nd/doc-git-index-version' into maint

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index b384d7993545365c17f3c8bded756b4e74faf794..03a4c2ee842e51e13b14774f1f86a4e7b22ae10c 100644 (file)
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -68,6 +68,8 @@ LockFile accept.lock
 
 PassEnv GIT_VALGRIND
 PassEnv GIT_VALGRIND_OPTIONS
+PassEnv GNUPGHOME
+PassEnv ASAN_OPTIONS
 
 Alias /dumb/ www/
 Alias /auth/dumb/ www/auth/dumb/