[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

[nickm at torproject.org]

commit cfeb063f2462ef374a77d38c39a14b88255dc8a5
Merge: efb174df24 a6533af9e8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 15 08:54:00 2021 -0400

    Merge branch 'maint-0.4.5'

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