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

[nickm at torproject.org]

commit 33d1e45a68d251f1543c6a21c0af52c4cd720615
Merge: 9c63b3b0c2 61731e3550
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 15 09:01:59 2021 -0400

    Merge branch 'maint-0.4.5' into release-0.4.5

 changes/bug40316              | 5 +++++
 src/feature/dirauth/dirvote.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)