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

[nickm at torproject.org]

commit 2eb900f7e2ca64e6ce16fc86410cafd935e7cd1e
Merge: b9f6539008 efca9ce41c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 15 08:54:00 2021 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.4

 changes/ticket40286_minimal        | 7 ++++---
 src/feature/dirparse/unparseable.c | 7 +++++--
 2 files changed, 9 insertions(+), 5 deletions(-)