aboutsummaryrefslogtreecommitdiff
path: root/src/feature/client
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-05-31 12:40:43 -0400
committerNick Mathewson <nickm@torproject.org>2019-05-31 12:40:43 -0400
commitfd8beab4ddfa5b26da405705bed64570ceab7925 (patch)
tree7b00e7230434243302d80aca950d255b45c96ffd /src/feature/client
parentdd62cb788ea0e526cbed835c6c8b5eb15ed8685b (diff)
parentc09e7a4e715d8266517896cfbc8fc80f19feba85 (diff)
downloadtor-fd8beab4ddfa5b26da405705bed64570ceab7925.tar.gz
tor-fd8beab4ddfa5b26da405705bed64570ceab7925.zip
Merge branch 'bug29875_035' into bug29875_master
Diffstat (limited to 'src/feature/client')
-rw-r--r--src/feature/client/entrynodes.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index e59f8b34e0..4afcee2021 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;