[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2

[teor at torproject.org]

commit afa4cc57bf101eb3effbd233fc3d18265279fe8e
Merge: f1173a63f 7e111d0ea
Author: teor <teor at torproject.org>
Date:   Tue Jan 14 17:41:40 2020 +1000

    Merge branch 'maint-0.4.2' into release-0.4.2

 changes/ticket32705_disable                   | 7 +++++++
 scripts/maint/practracker/practracker.py      | 2 ++
 scripts/maint/practracker/test_practracker.sh | 1 +
 3 files changed, 10 insertions(+)