commit ac9d08f66a3e5fd3fb3d456c4146b57c5ce1f1d6 Merge: 811ed8cf9 6d59ab16a Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 30 08:33:59 2018 -0400

Merge remote-tracking branch 'juga/ticket3723_03_squashed_rebased'

changes/ticket3723 | 3 + src/app/config/config.c | 2 +- src/feature/dirauth/dirvote.c | 44 +++- src/feature/dirauth/dirvote.h | 3 + src/feature/dircache/dirserv.c | 34 ++- src/feature/dircache/dirserv.h | 10 +- src/feature/nodelist/networkstatus.c | 5 + src/feature/nodelist/networkstatus_st.h | 3 + src/test/test_dir.c | 369 +++++++++++++++++++++++++------- 9 files changed, 390 insertions(+), 83 deletions(-)