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

[dgoulet at torproject.org]

commit 683c794273aaaf4a330f9b01b8523d2b8b2934e8
Merge: c90535c539 fd58e74ddc
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Oct 27 09:36:16 2020 -0400

    Merge branch 'tor-gitlab/mr/176'

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