commit 672e26cad837e368dfe39d53546b85afd69ad75c Merge: a18230115 988d4903a Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 31 10:06:30 2018 -0400

Merge branch 'networkstatus_mmap_merge'

changes/feature27244 | 5 ++ src/feature/control/control.c | 6 ++- src/feature/dirauth/dirvote.c | 19 ++++--- src/feature/dircache/consdiffmgr.c | 83 +++++++++++++++++++++--------- src/feature/dircache/consdiffmgr.h | 11 +++- src/feature/dircache/dirserv.c | 5 +- src/feature/dircache/dirserv.h | 1 + src/feature/dirclient/dirclient.c | 22 +++++--- src/feature/dircommon/consdiff.c | 42 ++++++++------- src/feature/dircommon/consdiff.h | 15 +++--- src/feature/dirparse/authcert_parse.c | 16 +++--- src/feature/dirparse/authcert_parse.h | 1 + src/feature/dirparse/ns_parse.c | 55 ++++++++++++-------- src/feature/dirparse/ns_parse.h | 10 ++-- src/feature/nodelist/authcert.c | 3 +- src/feature/nodelist/networkstatus.c | 96 +++++++++++++++++++---------------- src/feature/nodelist/networkstatus.h | 4 +- src/feature/relay/router.c | 2 +- src/test/bench.c | 6 ++- src/test/fuzz/fuzz_consensus.c | 6 +-- src/test/fuzz/fuzz_diff.c | 32 +++++++----- src/test/fuzz/fuzz_diff_apply.c | 13 +++-- src/test/fuzz/fuzz_vrs.c | 16 +++--- src/test/test_consdiff.c | 94 +++++++++++++++++++++++----------- src/test/test_consdiffmgr.c | 41 +++++++++++---- src/test/test_dir.c | 44 ++++++++++++---- src/test/test_dir_common.c | 17 +++++-- src/test/test_dir_handle_get.c | 18 +++++-- src/test/test_routerlist.c | 19 +++++-- src/test/test_shared_random.c | 12 +++-- 30 files changed, 467 insertions(+), 247 deletions(-)