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

[dgoulet at torproject.org]

commit 1fdfa8eeed7f29b1e44f29d0a07e467f6adb062f
Merge: 849fde27fe 7c5a67ccd9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 15 08:52:29 2021 -0400

    Merge branch 'maint-0.4.5' into release-0.4.5

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