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

[nickm at torproject.org]

commit 61731e35507fea1c932f80f0849dcae924113df1
Merge: a6533af9e8 5ec579610a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 15 09:01:59 2021 -0400

    Merge branch 'maint-0.4.4' into maint-0.4.5

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