Merge branch 'maint-0.3.5'

This commit is contained in:
Nick Mathewson
2018-11-14 07:42:56 -05:00
3 changed files with 4 additions and 7 deletions
+1 -1
View File
@@ -1941,7 +1941,7 @@ nodes_in_same_family(const node_t *node1, const node_t *node2)
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) &&