Merge branch 'maint-0.4.2'

This commit is contained in:
teor 2020-01-14 17:41:44 +10:00
commit 8095c785f1
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
3 changed files with 10 additions and 0 deletions

View File

@ -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.

View File

@ -300,5 +300,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)

View File

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