From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 19 Nov 2018 13:26:49 +0000 (-0500)
Subject: Merge branch 'ticket27359_v2_squashed'
X-Git-Tag: tor-0.4.0.1-alpha~129
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=48b08f0592734085d88b7546e39d42f6606026d6;p=thirdparty%2Ftor.git

Merge branch 'ticket27359_v2_squashed'
---

48b08f0592734085d88b7546e39d42f6606026d6
diff --cc src/feature/nodelist/nodelist.c
index 9ddb71e8a6,d070f31c12..f93ecd5bfe
--- 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) &&