summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor (Tim Wilson-Brown) <teor2345@gmail.com>2016-04-20 17:36:20 +1000
committerteor (Tim Wilson-Brown) <teor2345@gmail.com>2016-04-28 12:26:38 +1000
commit75dd2a285bbb7b65420eb8e37ab4f259b2aedf2c (patch)
treef81652bef71de8af52f2a95cc4a470de89d2a558
parent692828bea558295b2480eab473f9131e85d1eb9e (diff)
downloadtor-75dd2a285bbb7b65420eb8e37ab4f259b2aedf2c.tar.gz
tor-75dd2a285bbb7b65420eb8e37ab4f259b2aedf2c.zip
Descriptors depend on more config options now they list begindir support
Bugfix on #12538 in 0.2.8.1-alpha.
-rw-r--r--src/or/config.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index f07ca649f8..0850013d33 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4343,8 +4343,10 @@ options_transition_affects_descriptor(const or_options_t *old_options,
!opt_streq(old_options->MyFamily, new_options->MyFamily) ||
!opt_streq(old_options->AccountingStart, new_options->AccountingStart) ||
old_options->AccountingMax != new_options->AccountingMax ||
+ old_options->AccountingRule != new_options->AccountingRule ||
public_server_mode(old_options) != public_server_mode(new_options) ||
- old_options->DirCache != new_options->DirCache)
+ old_options->DirCache != new_options->DirCache ||
+ old_options->AssumeReachable != new_options->AssumeReachable)
return 1;
return 0;