diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-10-19 17:11:47 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-10-19 17:11:47 -0400 |
| commit | 12cf73c4516132a85f76d1c6e60c9492e8751987 (patch) | |
| tree | 11254e166ba6134597416fa2a8d91c3178212853 /src/or/routerlist.c | |
| parent | ec4142abdf7fa4efaa281413e31acc93bf22ea4a (diff) | |
| parent | 1c6f8841f47d5d55e73d18a9414fc68377a13c0e (diff) | |
| download | tor-12cf73c4516132a85f76d1c6e60c9492e8751987.tar.gz tor-12cf73c4516132a85f76d1c6e60c9492e8751987.zip | |
Merge remote-tracking branch 'andrea/ticket19858_v2'
Conflict in entrynodes.c: any_bridge_supports_microdescriptors was
removed in master, and modified in 19858_v2
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 85eb999ad6..83a25878d4 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2037,9 +2037,9 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, !router_supports_extrainfo(node->identity, is_trusted_extrainfo)) continue; /* Don't make the same node a guard twice */ - if (for_guard && node->using_as_guard) { - continue; - } + if (for_guard && is_node_used_as_guard(node)) { + continue; + } /* Ensure that a directory guard is actually a guard node. */ if (for_guard && !node->is_possible_guard) { continue; |