diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-04-03 09:27:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-04-03 09:27:40 -0400 |
| commit | 5d8061cd019a751530a25fa99a7300b84df1722f (patch) | |
| tree | 294b03781a387e86ec7b5bdc108ce71716678bf7 /src/or/entrynodes.c | |
| parent | ef4c10fb42e796a7a1662b5f1db27d10347e89af (diff) | |
| parent | 6cab0f8ad712def4f5a9bdfb9d11b0e773f7f76a (diff) | |
| download | tor-5d8061cd019a751530a25fa99a7300b84df1722f.tar.gz tor-5d8061cd019a751530a25fa99a7300b84df1722f.zip | |
Merge remote-tracking branch 'public/bug21415_testfix_030' into maint-0.3.0
Diffstat (limited to 'src/or/entrynodes.c')
| -rw-r--r-- | src/or/entrynodes.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index e0a3854b74..5b5e13bced 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -3367,14 +3367,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); |