[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/176' into maint-0.4.4

[dgoulet at torproject.org]

commit 26cfac18803ae1eb9f449d563842347f4d9340f9
Merge: c1bcc1da03 fd58e74ddc
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Oct 27 10:18:16 2020 -0400

    Merge branch 'tor-gitlab/mr/176' into maint-0.4.4

 changes/ticket40162           |  7 ++++++
 src/feature/dirauth/dirvote.h | 52 +++++++++++++++++++++++++++++++++----------
 2 files changed, 47 insertions(+), 12 deletions(-)