diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-05-28 11:04:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-05-28 11:04:33 -0400 |
| commit | 1b52e95028e0d84b7a112e4b8f2e393261dbb19c (patch) | |
| tree | 3dba31b96e31d4c9816a2f124afc5ff2152af2c8 /src/or/microdesc.c | |
| parent | 0989ba33834c17b2eac3bb87596fca115965ce3c (diff) | |
| parent | 5eb584e2e91bd5d6d204b9bb62a95c0edf43ff71 (diff) | |
| download | tor-1b52e95028e0d84b7a112e4b8f2e393261dbb19c.tar.gz tor-1b52e95028e0d84b7a112e4b8f2e393261dbb19c.zip | |
Merge branch '12498_ed25519_keys_v6'
Fixed numerous conflicts, and ported code to use new base64 api.
Diffstat (limited to 'src/or/microdesc.c')
| -rw-r--r-- | src/or/microdesc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 0511e870d1..ee48f6a419 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -738,6 +738,7 @@ microdesc_free_(microdesc_t *md, const char *fname, int lineno) if (md->onion_pkey) crypto_pk_free(md->onion_pkey); tor_free(md->onion_curve25519_pkey); + tor_free(md->ed25519_identity_pkey); if (md->body && md->saved_location != SAVED_IN_CACHE) tor_free(md->body); |