From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 8 Dec 2015 15:23:41 +0000 (-0500)
Subject: Merge branch 'maint-0.2.6' into maint-0.2.7
X-Git-Tag: tor-0.2.7.6~6^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6a337557ae5c73e8dc8208b18f902e9eeb21404;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.6' into maint-0.2.7
---

c6a337557ae5c73e8dc8208b18f902e9eeb21404
diff --cc src/or/routerlist.c
index 03729bda5c,af8e68e880..79a5bb3910
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@@ -1501,8 -1498,17 +1501,14 @@@ router_pick_directory_server_impl(dirin
      if ((type & EXTRAINFO_DIRINFO) &&
          !router_supports_extrainfo(node->identity, is_trusted_extrainfo))
        continue;
-     if (for_guard && node->using_as_guard)
-       continue; /* Don't make the same node a guard twice. */
 -    if ((type & MICRODESC_DIRINFO) && !is_trusted &&
 -        !node->rs->version_supports_microdesc_cache)
 -      continue;
+     /* Don't make the same node a guard twice */
+     if (for_guard && node->using_as_guard) {
+       continue;
+     }
+     /* Ensure that a directory guard is actually a guard node. */
+     if (for_guard && !node->is_possible_guard) {
+       continue;
+     }
      if (try_excluding &&
          routerset_contains_routerstatus(options->ExcludeNodes, status,
                                          country)) {