commit c4864de5734b623999701da30a42019cabc42e54 Merge: 6dba86d7c 19536fd18 Author: David Goulet dgoulet@torproject.org Date: Thu Aug 1 10:18:10 2019 -0400

Merge branch 'tor-github/pr/1177'

Makefile.am | 2 +- changes/ticket29746 | 4 + changes/ticket30752 | 6 + scripts/maint/practracker/metrics.py | 10 +- scripts/maint/practracker/practracker.py | 125 +++++++++++++-------- scripts/maint/practracker/practracker_tests.py | 18 ++- scripts/maint/practracker/problem.py | 106 +++++++++++++---- scripts/maint/practracker/test_practracker.sh | 50 +++++++++ scripts/maint/practracker/testdata/a.c | 38 +++++++ scripts/maint/practracker/testdata/b.c | 15 +++ scripts/maint/practracker/testdata/ex.txt | 0 .../maint/practracker/testdata/ex0-expected.txt | 7 ++ scripts/maint/practracker/testdata/ex0.txt | 0 .../maint/practracker/testdata/ex1-expected.txt | 3 + scripts/maint/practracker/testdata/ex1.txt | 11 ++ scripts/maint/practracker/testdata/not_c_file | 2 + scripts/maint/practracker/util.py | 14 ++- 17 files changed, 331 insertions(+), 80 deletions(-)