[tor-commits] [tor/master] Merge branch 'mr/236'

[asn at torproject.org]

commit cc30c09f7c92fff7bf9e5621d31b2f9538ec0466
Merge: 1949afef98 fb3704b459
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Jan 13 15:23:54 2021 +0200

    Merge branch 'mr/236'

 changes/bug19011              |   7 +++
 src/feature/dirauth/dirvote.c | 115 +++++++++++++++++++++++-------------------
 src/feature/dirauth/dirvote.h |  10 +++-
 src/test/test_dirvote.c       |  25 +++++++++
 4 files changed, 105 insertions(+), 52 deletions(-)