[tor-commits] [tor/master] Merge branch 'bug40316_035_v2' into maint-0.3.5

[nickm at torproject.org]

commit f078aab71ef56e1942caec5f27e0f336f2a7c7d1
Merge: efca9ce41c 890ae4fb1a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 15 08:58:54 2021 -0400

    Merge branch 'bug40316_035_v2' into maint-0.3.5

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