commit bd6007d8986d851bb9e76fc2d9a72143a03f04ac Merge: 1f377e910 b54a5e704 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 20 11:07:50 2018 -0400
Merge branch 'split_routerlist_dirserv_v2'
src/app/config/config.c | 5 +- src/core/include.am | 26 + src/core/mainloop/main.c | 7 + src/core/or/channeltls.c | 2 +- src/core/or/circuitbuild.c | 2 +- src/core/or/connection_or.c | 3 +- src/core/or/policies.c | 4 +- src/core/or/reasons.c | 2 +- src/feature/client/bridges.c | 2 + src/feature/client/entrynodes.c | 2 +- src/feature/control/control.c | 3 + src/feature/control/fmt_serverstatus.c | 103 ++ src/feature/control/fmt_serverstatus.h | 18 + src/feature/dirauth/bwauth.c | 453 +++++ src/feature/dirauth/bwauth.h | 58 + src/feature/dirauth/dirvote.c | 7 + src/feature/dirauth/dirvote.h | 8 +- src/feature/dirauth/guardfraction.c | 333 ++++ src/feature/dirauth/guardfraction.h | 24 + src/feature/dirauth/process_descs.c | 835 +++++++++ src/feature/dirauth/process_descs.h | 38 + src/feature/dirauth/reachability.c | 205 +++ src/feature/dirauth/reachability.h | 36 + src/feature/dirauth/recommend_pkg.c | 90 + src/feature/dirauth/recommend_pkg.h | 17 + src/feature/dirauth/shared_random.c | 3 +- src/feature/dirauth/voteflags.c | 644 +++++++ src/feature/dirauth/voteflags.h | 31 + src/feature/dircache/directory.c | 5 + src/feature/dircache/dirserv.c | 3000 ++----------------------------- src/feature/dircache/dirserv.h | 130 -- src/feature/hs/hs_service.c | 2 +- src/feature/nodelist/authcert.c | 1205 +++++++++++++ src/feature/nodelist/authcert.h | 60 + src/feature/nodelist/dirlist.c | 421 +++++ src/feature/nodelist/dirlist.h | 47 + src/feature/nodelist/fmt_routerstatus.c | 253 +++ src/feature/nodelist/fmt_routerstatus.h | 41 + src/feature/nodelist/microdesc.c | 1 + src/feature/nodelist/networkstatus.c | 6 + src/feature/nodelist/node_select.c | 1108 ++++++++++++ src/feature/nodelist/node_select.h | 102 ++ src/feature/nodelist/nodelist.c | 3 + src/feature/nodelist/routerlist.c | 2779 +--------------------------- src/feature/nodelist/routerlist.h | 154 +- src/feature/nodelist/routerparse.c | 2 +- src/feature/relay/router.c | 3 + src/feature/rend/rendservice.c | 2 +- src/test/test_config.c | 1 + src/test/test_controller.c | 2 +- src/test/test_dir.c | 16 +- src/test/test_dir_handle_get.c | 2 + src/test/test_guardfraction.c | 5 +- src/test/test_routerlist.c | 3 + src/test/test_shared_random.c | 3 +- 55 files changed, 6456 insertions(+), 5861 deletions(-)