commit 48b08f0592734085d88b7546e39d42f6606026d6 Merge: bf82389e1 0e762c0cf Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 19 08:26:49 2018 -0500

Merge branch 'ticket27359_v2_squashed'

changes/ticket27359 | 3 + src/core/include.am | 3 + src/feature/dirparse/microdesc_parse.c | 16 +- src/feature/nodelist/microdesc.c | 6 +- src/feature/nodelist/microdesc_st.h | 5 +- src/feature/nodelist/nodefamily.c | 373 ++++++++++++++++++++++++++++++++ src/feature/nodelist/nodefamily.h | 47 ++++ src/feature/nodelist/nodefamily_st.h | 48 ++++ src/feature/nodelist/nodelist.c | 114 ++++++---- src/feature/nodelist/nodelist.h | 11 +- src/test/test_microdesc.c | 8 +- src/test/test_nodelist.c | 385 ++++++++++++++++++++++++++++++++- 12 files changed, 954 insertions(+), 65 deletions(-)

diff --cc src/feature/nodelist/nodelist.c index 9ddb71e8a,d070f31c1..f93ecd5bf --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@@ -1930,17 -1965,12 +1973,12 @@@ nodes_in_same_family(const node_t *node }

/* Are they in the same family because the agree they are? */ - { - const smartlist_t *f1, *f2; - f1 = node_get_declared_family(node1); - f2 = node_get_declared_family(node2); - if (f1 && f2 && - node_in_nickname_smartlist(f1, node2) && - node_in_nickname_smartlist(f2, node1)) - return 1; + if (node_family_contains(node1, node2) && + node_family_contains(node2, node1)) { + return 1; }

- /* Are they in the same option because the user says they are? */ + /* Are they in the same family because the user says they are? */ if (options->NodeFamilySets) { SMARTLIST_FOREACH(options->NodeFamilySets, const routerset_t *, rs, { if (routerset_contains_node(rs, node1) &&