[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug21052'

[nickm at torproject.org]

commit 2d2ab29ce89d85f64f4bf4802d6b1e22a74a9ad9
Merge: 77788fa def7115
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 1 15:53:16 2017 -0500

    Merge remote-tracking branch 'asn/bug21052'

 changes/bug21052    |  4 +++
 src/or/entrynodes.c | 74 +++++++++++++++++++++++++++++++++++------------------
 2 files changed, 53 insertions(+), 25 deletions(-)

diff --cc src/or/entrynodes.c
index e341739,e26f32d..b7c05f1
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@@ -1851,10 -1944,11 +1897,12 @@@ select_entry_guard_for_circuit(guard_se
                                                     rst,
                                                     SAMPLE_EXCLUDE_CONFIRMED |
                                                     SAMPLE_EXCLUDE_PRIMARY |
 -                                                   SAMPLE_EXCLUDE_PENDING);
 +                                                   SAMPLE_EXCLUDE_PENDING |
 +                                                   flags);
      if (guard == NULL) {
-       log_info(LD_GUARD, "Absolutely no sampled guards were available.");
+       log_info(LD_GUARD, "Absolutely no sampled guards were available. "
+                "Marking all guards for retry and starting from top again.");
+       mark_all_guards_maybe_reachable(gs);
        return NULL;
      }
      guard->is_pending = 1;