[tor-commits] [tor/master] Merge branch 'dirvote_act_refactor_v2_squashed'

[nickm at torproject.org]

commit afd4fc689a5212a9aafa084f4e377db28583360d
Merge: bbf0b92b1 4a559e996
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 1 10:57:04 2018 -0400

    Merge branch 'dirvote_act_refactor_v2_squashed'

 changes/ticket25937      |  9 ++++++++
 src/or/config.c          | 33 +++++++++++++++++++++++++++++-
 src/or/dirauth/dirvote.c | 53 ++++++++++++++++++++++++++++++++----------------
 src/or/dirauth/dirvote.h |  5 +++--
 src/or/main.c            | 50 +++++++++++++++++++++++++++++++++++----------
 src/or/main.h            |  1 +
 src/or/networkstatus.c   |  1 +
 7 files changed, 121 insertions(+), 31 deletions(-)