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

[nickm at torproject.org]

commit 8851861ff087efe3ab95069952ab93108dbb6bf1
Merge: af6da4a36b 8d0d7a665a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 10 14:30:00 2021 -0400

    Merge branch 'ticket40374_046' into 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(-)