summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-10-21 11:18:11 -0400
committerNick Mathewson <nickm@torproject.org>2015-10-21 11:18:11 -0400
commit52fd384a465ba91762bc4f71d239ed1e5150f947 (patch)
treead0aae0c702d711c9fc6249b1f4582d0122f94cb /src/or
parentf41be5f9df1bb944c52431f3740e90716b42db6c (diff)
parent9c4a0aef0c0d8e1c3ad8d9ed7b655eae8a175ccb (diff)
downloadtor-52fd384a465ba91762bc4f71d239ed1e5150f947.tar.gz
tor-52fd384a465ba91762bc4f71d239ed1e5150f947.zip
Merge remote-tracking branch 'origin/maint-0.2.7'
Diffstat (limited to 'src/or')
-rw-r--r--src/or/routerkeys.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c
index 765dac883a..d88bfca13a 100644
--- a/src/or/routerkeys.c
+++ b/src/or/routerkeys.c
@@ -836,6 +836,8 @@ load_ed_keys(const or_options_t *options, time_t now)
INIT_ED_KEY_INCLUDE_SIGNING_KEY_IN_CERT);
char *fname =
options_get_datadir_fname2(options, "keys", "ed25519_signing");
+ ed25519_keypair_free(sign);
+ tor_cert_free(sign_cert);
sign = ed_key_init_from_file(fname,
flags, LOG_WARN,
sign_signing_key_with_id, now,