commit de0b07c634c45297bad794567cb44ab91988b0ca Merge: 5e5e019b3 3a643078c Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 26 09:47:59 2018 -0400

Merge branch 'router_split'

changes/ticket_27864 | 3 + src/app/config/config.c | 80 +-- src/app/config/statefile.c | 1 + src/app/main/main.c | 74 +-- src/core/include.am | 18 +- src/core/mainloop/connection.c | 46 +- src/core/mainloop/mainloop.c | 60 +-- src/core/mainloop/netstatus.c | 28 ++ src/core/mainloop/netstatus.h | 13 + src/core/or/channelpadding.c | 1 + src/core/or/channeltls.c | 1 + src/core/or/circuitbuild.c | 47 +- src/core/or/circuitstats.c | 1 + src/core/or/circuituse.c | 26 +- src/core/or/command.c | 21 +- src/core/or/connection_edge.c | 44 +- src/core/or/connection_or.c | 2 + src/core/or/dos.c | 2 +- src/core/or/policies.c | 1 + src/core/or/relay.c | 2 +- src/core/or/status.c | 1 + src/feature/client/bridges.c | 18 +- src/feature/client/entrynodes.c | 35 +- src/feature/control/control.c | 55 ++- src/feature/control/fmt_serverstatus.c | 3 +- src/feature/dirauth/authmode.c | 70 +++ src/feature/dirauth/authmode.h | 42 ++ src/feature/dirauth/dirvote.c | 2 +- src/feature/dirauth/mode.h | 38 -- src/feature/dirauth/process_descs.c | 2 + src/feature/dirauth/reachability.c | 4 +- src/feature/dirauth/shared_random.c | 2 +- src/feature/dircache/dircache.c | 4 +- src/feature/dircache/dirserv.c | 1 + src/feature/dirclient/dirclient.c | 7 +- src/feature/dirclient/dlstatus.c | 2 +- src/feature/hs/hs_circuit.c | 23 +- src/feature/hs/hs_client.c | 22 +- src/feature/hs/hs_common.c | 22 +- src/feature/hs/hs_service.c | 31 +- src/feature/keymgt/loadkey.c | 755 ++++++++++++++++++++++++++++ src/feature/keymgt/loadkey.h | 55 +++ src/feature/nodelist/authcert.c | 3 +- src/feature/nodelist/describe.c | 183 +++++++ src/feature/nodelist/describe.h | 25 + src/feature/nodelist/dirlist.c | 1 + src/feature/nodelist/networkstatus.c | 50 +- src/feature/nodelist/nickname.c | 62 +++ src/feature/nodelist/nickname.h | 19 + src/feature/nodelist/node_select.c | 4 +- src/feature/nodelist/nodelist.c | 29 +- src/feature/nodelist/routerinfo.c | 79 +++ src/feature/nodelist/routerinfo.h | 27 + src/feature/nodelist/routerlist.c | 16 +- src/feature/nodelist/routerparse.c | 33 +- src/feature/nodelist/routerset.c | 6 +- src/feature/nodelist/torcert.c | 37 ++ src/feature/nodelist/torcert.h | 6 + src/feature/relay/dns.c | 19 +- src/feature/relay/router.c | 866 ++------------------------------- src/feature/relay/router.h | 51 +- src/feature/relay/routerkeys.c | 683 +------------------------- src/feature/relay/routerkeys.h | 41 -- src/feature/relay/routermode.c | 80 +++ src/feature/relay/routermode.h | 24 + src/feature/relay/selftest.c | 301 ++++++++++++ src/feature/relay/selftest.h | 24 + src/feature/rend/rendclient.c | 24 +- src/feature/rend/rendservice.c | 35 +- src/feature/stats/rephist.c | 4 +- src/test/fuzz/fuzz_descriptor.c | 4 +- src/test/test_config.c | 1 + src/test/test_dir.c | 52 +- src/test/test_routerkeys.c | 1 + src/test/test_status.c | 1 + 75 files changed, 2398 insertions(+), 2058 deletions(-)