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 'sysrqb/bug14216_bad_since'

Browse Source
This commit is contained in:
Nick Mathewson
2015-02-02 10:23:52 -05:00
parent 55639bc67f 4cb59ceb8e
commit f4b79bc420
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug14216
+5
View File
@@ -0,0 +1,5 @@
o Minor bugfixes:
- When we are using bridges and we had a network connectivity problem, only
retry connecting to our currently configured bridges, not all bridges we
know about and remember using.
Fixes bug 14216; bugfix on tor-0.2.2.17-alpha. Patch from arma.
src/or/entrynodes.c
+3 -1
View File
@@ -2368,7 +2368,9 @@ entries_retry_helper(const or_options_t *options, int act)
SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, e) {
node = node_get_by_id(e->identity);
if (node && node_has_descriptor(node) &&
node_is_bridge(node) == need_bridges) {
node_is_bridge(node) == need_bridges &&
(!need_bridges || (!e->bad_since &&
node_is_a_configured_bridge(node)))) {
any_known = 1;
if (node->is_running)
any_running = 1; /* some entry is both known and running */