Abolish globals in entrynodes.c; relativize guard context to new guard_selection_t structure

1 files changed, 3 insertions, 3 deletions

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 74b8d1b1d3..780e580dc2 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1953,9 +1953,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;