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

[nickm at torproject.org]

commit 086f01e224a3118d83d8b5a14d5dc27d9af41d0a
Merge: 9b9fa62f26 8851861ff0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 10 14:30:09 2021 -0400

    Merge branch 'maint-0.4.6' into release-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(-)