[tor-commits] [tor/master] Merge branch 'pr1599_squashed'

[teor at torproject.org]

commit b7cfca1dee4d4435f87c2e7b7233f51a956c56ee
Merge: c80694dec b910ae8cd
Author: teor <teor at torproject.org>
Date:   Wed Jan 15 22:31:01 2020 +1000

    Merge branch 'pr1599_squashed'

 scripts/maint/practracker/test_practracker.sh      | 32 ++++++++++++++++------
 .../maint/practracker/testdata/ex0-expected.txt    |  2 ++
 .../maint/practracker/testdata/ex1-expected.txt    |  2 ++
 .../testdata/ex1-overbroad-expected.txt            |  2 ++
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --cc scripts/maint/practracker/test_practracker.sh
index 207a5cede,d2b795103..afc267a00
--- a/scripts/maint/practracker/test_practracker.sh
+++ b/scripts/maint/practracker/test_practracker.sh
@@@ -1,7 -1,9 +1,10 @@@
  #!/bin/sh
  
+ # Fail if any subprocess fails unexpectedly
+ set -e
+ 
  umask 077
 +unset TOR_DISABLE_PRACTRACKER
  
  TMPDIR=""
  clean () {