[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.4

[nickm at torproject.org]

commit b9f65390089817a74bf20d93e93a15b41a970f79
Merge: fb2c889a38 f46f4562cf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 15 08:52:28 2021 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.4

 changes/ticket40286_minimal        | 5 +++++
 src/feature/dirparse/unparseable.c | 6 ++++++
 2 files changed, 11 insertions(+)