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

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.4' into release-0.4.4

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