[tor-commits] [tor/master] Merge branch 'maint-0.4.2'

[teor at torproject.org]

commit 8095c785f1929b379ab3341b42cbdb05c7598950
Merge: 8b46372f2 7e111d0ea
Author: teor <teor at torproject.org>
Date:   Tue Jan 14 17:41:44 2020 +1000

    Merge branch 'maint-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(+)