Merge branch 'maint-0.4.2' into release-0.4.2

changes/ticket32705_disable

@@ -0,0 +1,7 @@
+  o Minor bugfixes (testing):
+    - When TOR_DISABLE_PRACTRACKER is set, do not apply it to the
+      test_practracker.sh script.  Doing so caused a test failure.
+      Fixes bug 32705; bugfix on 0.4.2.1-alpha.
+    - When TOR_DISABLE_PRACTRACKER is set, log a notice to stderr
+      when skipping practracker checks.
+      Fixes bug 32705; bugfix on 0.4.2.1-alpha.

scripts/maint/practracker/practracker.py

@@ -297,5 +297,7 @@ variable.
 
 if __name__ == '__main__':
     if os.environ.get("TOR_DISABLE_PRACTRACKER"):
+        print("TOR_DISABLE_PRACTRACKER is set, skipping practracker tests.",
+              file=sys.stderr)
         sys.exit(0)
     main(sys.argv)

scripts/maint/practracker/test_practracker.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 umask 077
+unset TOR_DISABLE_PRACTRACKER
 
 TMPDIR=""
 clean () {