[tor-commits] [tor/maint-0.2.8] Descriptors depend on more config options now they list begindir support

[nickm@xxxxxxxxxxxxxx]

commit 75dd2a285bbb7b65420eb8e37ab4f259b2aedf2c
Author: teor (Tim Wilson-Brown) <teor2345@xxxxxxxxx>
Date:   Wed Apr 20 17:36:20 2016 +1000

    Descriptors depend on more config options now they list begindir support
    
    Bugfix on #12538 in 0.2.8.1-alpha.
---
 src/or/config.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/or/config.c b/src/or/config.c
index f07ca64..0850013 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;



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits