commit 796a9b37ea346f413f6684505ca31879ddf3f0f1 Merge: 6846d1486 380d178e5 Author: David Goulet dgoulet@torproject.org Date: Mon Sep 9 14:53:12 2019 -0400
Merge branch 'tor-github/pr/1264'
Makefile.am | 2 ++ changes/ticket31477 | 3 +++ scripts/maint/practracker/exceptions.txt | 9 +++++++++ scripts/maint/practracker/practracker.py | 3 ++- scripts/maint/practracker/test_practracker.sh | 4 +++- scripts/maint/practracker/testdata/.may_include | 3 +++ scripts/maint/practracker/testdata/a.c | 2 +- scripts/maint/practracker/testdata/ex0-expected.txt | 4 ++++ scripts/maint/practracker/testdata/ex1.txt | 4 ++++ scripts/maint/practracker/testdata/header.h | 8 ++++++++ 10 files changed, 39 insertions(+), 3 deletions(-)