summaryrefslogtreecommitdiff
path: root/src/app
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/app
parentdd62cb788ea0e526cbed835c6c8b5eb15ed8685b (diff)
parentc09e7a4e715d8266517896cfbc8fc80f19feba85 (diff)
downloadtor-fd8beab4ddfa5b26da405705bed64570ceab7925.tar.gz
tor-fd8beab4ddfa5b26da405705bed64570ceab7925.zip
Merge branch 'bug29875_035' into bug29875_master
Diffstat (limited to 'src/app')
-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 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