[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1756/head'

[nickm at torproject.org]

commit 11d0016ca12c18b46e34b615672d46e5d4b95481
Merge: dca2c00ac d8cbb2965
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 19 11:57:27 2020 -0500

    Merge remote-tracking branch 'tor-github/pr/1756/head'

 scripts/maint/practracker/exceptions.txt | 34 ++++++++++++++------------------
 1 file changed, 15 insertions(+), 19 deletions(-)