commit 67351f672450d5f13754294405243a59ddd86de9 Merge: 391756f26 a1504f138 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 12 11:39:37 2018 -0400
Merge remote-tracking branch 'tor-github/pr/380'
changes/ticket27924 | 3 + src/app/main/main.c | 6 +- src/core/include.am | 29 +- src/core/mainloop/connection.c | 3 +- src/core/or/circuitbuild.c | 1 - src/core/or/policies.c | 4 +- src/core/or/protover.c | 2 +- src/core/or/relay.c | 1 - src/core/or/versions.c | 422 ++ src/core/or/versions.h | 44 + src/feature/client/entrynodes.c | 3 +- src/feature/control/control.c | 3 +- src/feature/dirauth/bwauth.c | 2 +- src/feature/dirauth/dirvote.c | 32 +- src/feature/dirauth/dsigs_parse.c | 282 ++ src/feature/dirauth/dsigs_parse.h | 22 + src/feature/dirauth/guardfraction.c | 2 +- src/feature/dirauth/process_descs.c | 3 +- src/feature/dircache/consdiffmgr.c | 2 +- src/feature/dircommon/consdiff.c | 2 +- src/feature/dirparse/authcert_members.i | 13 + src/feature/dirparse/authcert_parse.c | 207 + src/feature/dirparse/authcert_parse.h | 18 + src/feature/dirparse/microdesc_parse.c | 267 + src/feature/dirparse/microdesc_parse.h | 20 + src/feature/dirparse/ns_parse.c | 1685 +++++++ src/feature/dirparse/ns_parse.h | 45 + src/feature/{nodelist => dirparse}/parsecommon.c | 6 +- src/feature/{nodelist => dirparse}/parsecommon.h | 4 +- src/feature/dirparse/policy_parse.c | 218 + src/feature/dirparse/policy_parse.h | 25 + src/feature/dirparse/routerparse.c | 1242 +++++ src/feature/dirparse/routerparse.h | 49 + src/feature/dirparse/sigcommon.c | 185 + src/feature/dirparse/sigcommon.h | 48 + src/feature/dirparse/signing.c | 98 + src/feature/dirparse/signing.h | 23 + src/feature/dirparse/unparseable.c | 591 +++ src/feature/dirparse/unparseable.h | 56 + src/feature/hs/hs_descriptor.c | 2 +- src/feature/nodelist/authcert.c | 4 +- src/feature/nodelist/microdesc.c | 14 +- src/feature/nodelist/networkstatus.c | 22 +- src/feature/nodelist/networkstatus.h | 3 - src/feature/nodelist/nodelist.c | 1 - src/feature/nodelist/routerlist.c | 2 +- src/feature/nodelist/routerparse.c | 5701 ---------------------- src/feature/nodelist/routerparse.h | 161 - src/feature/nodelist/routerset.c | 2 +- src/feature/relay/router.c | 4 +- src/feature/rend/rendcache.c | 2 +- src/feature/rend/rendcommon.c | 3 +- src/feature/rend/rendparse.c | 600 +++ src/feature/rend/rendparse.h | 32 + src/feature/rend/rendservice.c | 2 +- src/test/fuzz/fuzz_consensus.c | 6 +- src/test/fuzz/fuzz_descriptor.c | 6 +- src/test/fuzz/fuzz_extrainfo.c | 6 +- src/test/fuzz/fuzz_hsdescv2.c | 4 +- src/test/fuzz/fuzz_hsdescv3.c | 3 +- src/test/fuzz/fuzz_iptsv2.c | 5 +- src/test/fuzz/fuzz_microdesc.c | 5 +- src/test/fuzz/fuzz_vrs.c | 5 +- src/test/test.c | 2 +- src/test/test_consdiffmgr.c | 2 +- src/test/test_dir.c | 10 +- src/test/test_dir_common.c | 2 + src/test/test_dir_common.h | 1 - src/test/test_dir_handle_get.c | 2 +- src/test/test_entrynodes.c | 1 - src/test/test_guardfraction.c | 4 +- src/test/test_hs_service.c | 31 +- src/test/test_microdesc.c | 5 +- src/test/test_policy.c | 11 +- src/test/test_routerlist.c | 3 +- src/test/test_routerset.c | 6 +- src/test/test_shared_random.c | 2 +- 77 files changed, 6349 insertions(+), 5996 deletions(-)