commit 41324b5ae1334a40baa87785ad18d1a4d9df5322 Author: George Kadianakis desnacked@riseup.net Date: Thu Mar 2 16:47:47 2017 +0200
Revert "Restore correct behavior of 0.3.0.4-rc with bridges+ipv6-min"
This reverts commit 5298ab59170be74aed20e04e5378ec66eef6476e. --- src/or/entrynodes.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index c3c576c..729e4b0 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -3365,14 +3365,7 @@ guard_selection_have_enough_dir_info_to_build_circuits(guard_selection_t *gs) * guards in our list, since these are the guards that we typically use for * circuits. */ num_primary_to_check = get_n_primary_guards_to_use(GUARD_USAGE_TRAFFIC); - /* - We had added this to try to guarantee that we'd not normally try a guard - without a descriptor, even if we didn't use the first guard. But it led - to problems with the chutney bridges+ipv6-min test. A better solution is - needed. - - num_primary_to_check++; - */ + num_primary_to_check++;
SMARTLIST_FOREACH_BEGIN(gs->primary_entry_guards, entry_guard_t *, guard) { entry_guard_consider_retry(guard);