[tor-commits] [tor/master] Merge branch 'pr-1569-squashed'

[teor at torproject.org]

commit df6c5382ad0c3da45808bf67cec63f40942b561b
Merge: a4c22164c 92a6803e1
Author: teor <teor at torproject.org>
Date:   Tue Dec 3 12:57:06 2019 +1000

    Merge branch 'pr-1569-squashed'

 Makefile.am                                     |  7 +++
 scripts/maint/checkSpace.pl                     | 51 ++++++++-------
 scripts/maint/checkSpaceTest.sh                 | 36 +++++++++++
 scripts/maint/checkspace_tests/dubious.c        | 83 +++++++++++++++++++++++++
 scripts/maint/checkspace_tests/dubious.h        |  4 ++
 scripts/maint/checkspace_tests/expected.txt     | 31 +++++++++
 scripts/maint/checkspace_tests/good_guard.h     |  6 ++
 scripts/maint/checkspace_tests/same_guard.h     |  6 ++
 scripts/maint/checkspace_tests/subdir/dubious.c |  1 +
 src/test/include.am                             |  5 ++
 10 files changed, 208 insertions(+), 22 deletions(-)