torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug21415_testfix_030' into maint-0.3.0

Browse Source
This commit is contained in:
Nick Mathewson
2017-04-03 09:27:40 -04:00
parent ef4c10fb42 6cab0f8ad7
commit 5d8061cd01
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/entrynodes.c
+1 -8
View File
@@ -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);