summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-04-25 08:01:54 -0400
committerNick Mathewson <nickm@torproject.org>2018-04-25 08:01:54 -0400
commit58f54a3588cf722a31b10fa0450225f7685c8629 (patch)
tree99355151e73fbbd89cb06fc688ab336960102b91 /src/or
parent85cd8386fa7da82d453bfb31b39184fbd8d96e08 (diff)
parent7c3f87eb4b2c3c4ce3422b3561bee36f3c9956c1 (diff)
downloadtor-58f54a3588cf722a31b10fa0450225f7685c8629.tar.gz
tor-58f54a3588cf722a31b10fa0450225f7685c8629.zip
Merge branch 'maint-0.3.2' into maint-0.3.3
Diffstat (limited to 'src/or')
-rw-r--r--src/or/router.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/router.c b/src/or/router.c
index a7a855555c..39b07c52ef 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -143,7 +143,7 @@ dup_onion_keys(crypto_pk_t **key, crypto_pk_t **last)
if (onionkey)
*key = crypto_pk_copy_full(onionkey);
else
- *last = NULL;
+ *key = NULL;
if (lastonionkey)
*last = crypto_pk_copy_full(lastonionkey);
else