diff options
| author | David Goulet <dgoulet@torproject.org> | 2019-06-04 09:57:03 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-06-04 09:57:03 -0400 |
| commit | a63c5f844bcf022f6c83897d111b01344f67b40b (patch) | |
| tree | 8a2aea0560c6ec6a2e740447bfca948decbc1331 /src | |
| parent | 33382184b67d43b859de2f50d24cc7955b9f0db7 (diff) | |
| parent | 5e594831c761626022c323e48a8df9cb9deb2291 (diff) | |
| download | tor-a63c5f844bcf022f6c83897d111b01344f67b40b.tar.gz tor-a63c5f844bcf022f6c83897d111b01344f67b40b.zip | |
Merge branch 'tor-github/pr/1067'
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/config/config.c | 3 | ||||
| -rw-r--r-- | src/feature/client/entrynodes.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index d03305627b..d1b9d06bb3 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -2387,7 +2387,8 @@ options_act(const or_options_t *old_options) if (!bool_eq(directory_fetches_dir_info_early(options), directory_fetches_dir_info_early(old_options)) || !bool_eq(directory_fetches_dir_info_later(options), - directory_fetches_dir_info_later(old_options))) { + directory_fetches_dir_info_later(old_options)) || + !config_lines_eq(old_options->Bridges, options->Bridges)) { /* Make sure update_router_have_minimum_dir_info() gets called. */ router_dir_info_changed(); /* We might need to download a new consensus status later or sooner than 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; |