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

commit d82970c8c316e70abf49b2e37f6e7ba3db32585b Merge: 6cc87bc269 8851861ff0 Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 10 14:30:09 2021 -0400 Merge branch 'maint-0.4.6' changes/ticket40374 | 4 ++++ src/feature/dirparse/parsecommon.c | 27 +++++---------------------- src/feature/dirparse/parsecommon.h | 1 - src/test/test_parsecommon.c | 7 ++----- 4 files changed, 11 insertions(+), 28 deletions(-)