diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-29 20:56:39 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-29 20:56:39 -0500 |
| commit | 628b735fe39e13cc37afb567b32d4b006da51c89 (patch) | |
| tree | 8a896c306e0dd749896b0c32548e4fca7da5bd51 /src/or/rendcommon.c | |
| parent | 441ab6cdd57252b44dd6110e273a7f4e406842b0 (diff) | |
| parent | a2791f43f595d06dbaeff7c4ea0bcecc5c04e2de (diff) | |
| download | tor-628b735fe39e13cc37afb567b32d4b006da51c89.tar tor-628b735fe39e13cc37afb567b32d4b006da51c89.tar.gz | |
Merge remote-tracking branch 'rransom-tor/bug3460-v4'
Conflicts:
src/or/rendservice.c
Diffstat (limited to 'src/or/rendcommon.c')
| -rw-r--r-- | src/or/rendcommon.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 94bb00221..d09e6566c 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -440,6 +440,11 @@ rend_intro_point_free(rend_intro_point_t *intro) extend_info_free(intro->extend_info); crypto_free_pk_env(intro->intro_key); + + if (intro->accepted_intro_rsa_parts != NULL) { + digestmap_free(intro->accepted_intro_rsa_parts, _tor_free); + } + tor_free(intro); } |