From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 1 Feb 2017 20:53:16 +0000 (-0500)
Subject: Merge remote-tracking branch 'asn/bug21052'
X-Git-Tag: tor-0.3.0.3-alpha~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d2ab29ce89d85f64f4bf4802d6b1e22a74a9ad9;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'asn/bug21052'
---

2d2ab29ce89d85f64f4bf4802d6b1e22a74a9ad9
diff --cc src/or/entrynodes.c
index e341739379,e26f32d56e..b7c05f1930
--- 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;