[tor-commits] [tor/maint-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7

[nickm at torproject.org]

commit c6a337557ae5c73e8dc8208b18f902e9eeb21404
Merge: eeb9751 1adc2bf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 8 10:23:41 2015 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/bug17772    |    7 +++++++
 src/or/routerlist.c |   10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --cc src/or/routerlist.c
index 03729bd,af8e68e..79a5bb3
--- 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)) {