diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-02 10:23:52 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-02 10:23:52 -0500 |
| commit | f4b79bc4208132d057a7be04e6135480129c5048 (patch) | |
| tree | edb1cf4fb0ee83a6eecca43d980d6c676ca1fb21 /src | |
| parent | 55639bc67f66e0bb41af1474ce8654d49faf9a61 (diff) | |
| parent | 4cb59ceb8ef603f5661f87e4787d45255fbe210c (diff) | |
| download | tor-f4b79bc4208132d057a7be04e6135480129c5048.tar.gz tor-f4b79bc4208132d057a7be04e6135480129c5048.zip | |
Merge remote-tracking branch 'sysrqb/bug14216_bad_since'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/entrynodes.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 5b0e342662..17cb825de3 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -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 */ |