diff options
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 3 | ||||
| -rw-r--r-- | src/or/router.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index bb335dd5f1..4aabe6b955 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3980,7 +3980,8 @@ options_transition_affects_descriptor(const or_options_t *old_options, !opt_streq(old_options->ContactInfo, new_options->ContactInfo) || !opt_streq(old_options->MyFamily, new_options->MyFamily) || !opt_streq(old_options->AccountingStart, new_options->AccountingStart) || - old_options->AccountingMax != new_options->AccountingMax) + old_options->AccountingMax != new_options->AccountingMax || + public_server_mode(old_options) != public_server_mode(new_options)) return 1; return 0; diff --git a/src/or/router.c b/src/or/router.c index 60ee93a522..eaad57bb99 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -84,6 +84,11 @@ static authority_cert_t *legacy_key_certificate = NULL; static void set_onion_key(crypto_pk_env_t *k) { + if (onionkey && !crypto_pk_cmp_keys(onionkey, k)) { + /* k is already our onion key; free it and return */ + crypto_free_pk_env(k); + return; + } tor_mutex_acquire(key_lock); crypto_free_pk_env(onionkey); onionkey = k; |