]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Descriptors depend on more config options now they list begindir support
authorteor (Tim Wilson-Brown) <teor2345@gmail.com>
Wed, 20 Apr 2016 07:36:20 +0000 (17:36 +1000)
committerteor (Tim Wilson-Brown) <teor2345@gmail.com>
Thu, 28 Apr 2016 02:26:38 +0000 (12:26 +1000)
Bugfix on #12538 in 0.2.8.1-alpha.

src/or/config.c

index f07ca649f831175f010704e1ea5dff5c8a3504e3..0850013d3381f6b03cf4548668fa18a55d1fc713 100644 (file)
@@ -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;