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

[nickm at torproject.org]

commit eb02c323eb2e4b5db5039502be9fd93c0fd19d84
Merge: a7986755e 29842f68e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 11 08:41:55 2019 -0400

    Merge branch 'maint-0.4.1'

 changes/bug30781                         | 4 ++++
 scripts/maint/practracker/exceptions.txt | 2 +-
 src/feature/dirparse/routerparse.c       | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)