commit 1f95e80351cdb45de0994a0a3aba277267d41ad0 Merge: d4f558e38 a2f81b644 Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 5 09:24:51 2018 -0500

Merge branch 'prop293_squashed'

changes/ticket26770 | 8 ++ src/feature/dirauth/dirvote.c | 19 +++- src/feature/dirauth/dirvote.h | 3 + src/feature/dirauth/voteflags.c | 8 +- src/feature/dirauth/voteflags.h | 6 +- src/feature/dirparse/ns_parse.c | 2 + src/feature/nodelist/fmt_routerstatus.c | 3 +- src/feature/nodelist/networkstatus.c | 4 +- src/feature/nodelist/networkstatus.h | 5 +- src/feature/nodelist/routerstatus_st.h | 2 + src/feature/relay/router.c | 11 +- src/feature/relay/router.h | 4 + src/test/fuzz/fuzz_vrs.c | 8 +- src/test/include.am | 1 + src/test/test.c | 3 +- src/test/test.h | 1 + src/test/test_dir.c | 75 +++++++++++++ src/test/test_router.c | 98 ++++++++++++++++ src/test/test_voting_flags.c | 192 ++++++++++++++++++++++++++++++++ 19 files changed, 438 insertions(+), 15 deletions(-)