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

[asn at torproject.org]

commit 4d461e20f766ab6fe0979229e0281e31fc9491e7
Merge: 721e65a1d ee36bfa6d
Author: George Kadianakis <desnacked at riseup.net>
Date:   Thu May 2 17:48:09 2019 +0300

    Merge branch 'tor-github/pr/999'

 changes/ticket30345                      |  3 ++
 scripts/maint/practracker/exceptions.txt |  6 +--
 src/app/config/config.c                  |  2 +
 src/app/main/shutdown.c                  |  7 ---
 src/core/include.am                      | 25 ++++-----
 src/core/mainloop/mainloop.c             | 20 --------
 src/feature/control/fmt_serverstatus.c   |  1 -
 src/feature/dirauth/bridgeauth.c         | 55 ++++++++++++++++++++
 src/feature/dirauth/bridgeauth.h         | 12 +++++
 src/feature/dirauth/dirauth_periodic.c   | 19 +++++++
 src/feature/dirauth/dirauth_sys.c        |  7 +++
 src/feature/dirauth/dirvote.c            |  4 +-
 src/feature/dirauth/recommend_pkg.h      | 12 +++++
 src/feature/dirauth/voteflags.c          | 66 ++++++++----------------
 src/feature/dirauth/voteflags.h          | 12 +++--
 src/feature/nodelist/fmt_routerstatus.c  | 41 ---------------
 src/feature/nodelist/networkstatus.c     | 87 ++++++++++++++++----------------
 src/feature/nodelist/networkstatus.h     |  5 +-
 src/feature/nodelist/routerlist.c        |  4 ++
 src/test/test_voting_flags.c             |  2 +-
 20 files changed, 208 insertions(+), 182 deletions(-)