diff options
author | teor <teor@torproject.org> | 2019-08-12 09:53:59 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2019-08-12 09:53:59 +1000 |
commit | 31fb2bceb546fb84899e5c797e3f101b86dd8687 (patch) | |
tree | c8b6af4f7b0ce985e7b678f5e8521de342af5fea /src/feature | |
parent | 789fdbed0586aeec5b312195a453c9ddaf8d58be (diff) | |
parent | c09e7a4e715d8266517896cfbc8fc80f19feba85 (diff) | |
download | tor-31fb2bceb546fb84899e5c797e3f101b86dd8687.tar.gz tor-31fb2bceb546fb84899e5c797e3f101b86dd8687.zip |
Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5
Diffstat (limited to 'src/feature')
-rw-r--r-- | src/feature/client/entrynodes.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index e543289ce0..15ec830594 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -3300,6 +3300,9 @@ num_bridges_usable,(int use_maybe_reachable)) } SMARTLIST_FOREACH_BEGIN(gs->sampled_entry_guards, entry_guard_t *, guard) { + /* Not a bridge, or not one we are configured to be able to use. */ + if (! guard->is_filtered_guard) + continue; /* Definitely not usable */ if (guard->is_reachable == GUARD_REACHABLE_NO) continue; |