[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/699'

[nickm at torproject.org]

commit 5f42bc0f485f768081307f8afc1642140acb4810
Merge: 5687165cf b61c3c6df
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 13 15:19:59 2019 -0500

    Merge remote-tracking branch 'tor-github/pr/699'

 changes/ticket26698                     |   4 ++
 src/app/config/config.c                 |   3 +-
 src/feature/dirauth/bwauth.c            |  28 ++++++--
 src/feature/dirauth/bwauth.h            |   4 +-
 src/feature/dirauth/dirvote.c           |  40 ++++++++++-
 src/feature/nodelist/networkstatus_st.h |   3 +
 src/test/test_dir.c                     | 123 +++++++++++++++++++++++++++-----
 7 files changed, 178 insertions(+), 27 deletions(-)