diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-14 07:42:56 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-14 07:42:56 -0500 |
| commit | 586c3a7c902dfb6fdf52390ecb2a08d6fceef77a (patch) | |
| tree | e9380565d863f62ac2c47587bd0b87b290d47405 /src/feature | |
| parent | a6a7a1f3edd93bb3d9b328e6124e0912cdc94c7b (diff) | |
| parent | 9daf06d171035582c0fca3516f265a59fffc7bbf (diff) | |
| download | tor-586c3a7c902dfb6fdf52390ecb2a08d6fceef77a.tar.gz tor-586c3a7c902dfb6fdf52390ecb2a08d6fceef77a.zip | |
Merge branch 'maint-0.3.5'
Diffstat (limited to 'src/feature')
| -rw-r--r-- | src/feature/nodelist/nodelist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index a1a1b0ea37..2a369e0da7 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -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) && |