[tor-commits] [tor/master] Merge branch 'tor-github/pr/1763'

[asn at torproject.org]

commit edc0bf5089df13d1d6a246e67bddb484ac99ad59
Merge: 6472d9cfd a5bc08579
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Mar 3 14:35:31 2020 +0200

    Merge branch 'tor-github/pr/1763'

 changes/ticket33436                                |   4 +
 src/feature/dirauth/dirauth_config.c               |   4 +-
 src/feature/dirauth/dirvote.c                      |   8 +-
 src/feature/dirauth/include.am                     |   6 +-
 src/feature/dirauth/shared_random.c                |   4 +-
 src/feature/dirauth/shared_random_state.c          |   6 +-
 .../{dircommon => dirauth}/voting_schedule.c       | 113 ++++++++++-----------
 .../{dircommon => dirauth}/voting_schedule.h       |  39 ++++++-
 src/feature/dircommon/include.am                   |   6 +-
 src/feature/hs_common/shared_random_client.c       |  82 +++++++++------
 src/feature/hs_common/shared_random_client.h       |   2 -
 src/feature/nodelist/networkstatus.c               |  48 ++++++++-
 src/feature/nodelist/networkstatus.h               |   3 +
 src/test/test_dir.c                                |   4 +-
 src/test/test_dir_common.c                         |   2 +-
 src/test/test_dir_handle_get.c                     |  16 +--
 src/test/test_hs_common.c                          |  18 ++--
 src/test/test_hs_service.c                         |  12 +--
 src/test/test_shared_random.c                      |  26 ++---
 src/test/test_voting_schedule.c                    |   6 +-
 20 files changed, 251 insertions(+), 158 deletions(-)