diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-07-07 11:08:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-07-07 11:08:03 -0400 |
| commit | 6b670d6032b33f255f88e31a727b8f042b1dfcef (patch) | |
| tree | 290fa726b1ce5c3c333230073b5f964fc9f7e887 /src/or/router.c | |
| parent | 586d0abe591e241124790b6ee0d273158e96bd0c (diff) | |
| parent | bc3c54a07f035c69b81cbf7817b8071938abf2ca (diff) | |
| download | tor-6b670d6032b33f255f88e31a727b8f042b1dfcef.tar tor-6b670d6032b33f255f88e31a727b8f042b1dfcef.tar.gz | |
Merge branch 'bug3263'
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/router.c b/src/or/router.c index 60ee93a52..eaad57bb9 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; |