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

[nickm at torproject.org]

commit 7c5a67ccd983bb028d21a5e8aa48b4cd9d6a8a1c
Merge: be17a5a3cf b9f6539008
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 15 08:52:29 2021 -0400

    Merge branch 'maint-0.4.4' into maint-0.4.5

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