aboutsummaryrefslogtreecommitdiff
path: root/src/app/config
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-08-12 09:53:59 +1000
committerteor <teor@torproject.org>2019-08-12 09:53:59 +1000
commit31fb2bceb546fb84899e5c797e3f101b86dd8687 (patch)
treec8b6af4f7b0ce985e7b678f5e8521de342af5fea /src/app/config
parent789fdbed0586aeec5b312195a453c9ddaf8d58be (diff)
parentc09e7a4e715d8266517896cfbc8fc80f19feba85 (diff)
downloadtor-31fb2bceb546fb84899e5c797e3f101b86dd8687.tar.gz
tor-31fb2bceb546fb84899e5c797e3f101b86dd8687.zip
Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5
Diffstat (limited to 'src/app/config')
-rw-r--r--src/app/config/config.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 68493e847d..0b1b758d96 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -2412,7 +2412,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