aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-29 13:03:27 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-29 13:03:27 -0400
commit0514bcd37c6e6e0eb3f3c47da94cb182d01ef15f (patch)
tree3ce1c5cea0b3733055ffd3ca9f7d0c620358f4ef /src
parentc0a73c8bf327e18b09b71cd77edcfac7fb9d3c69 (diff)
parent1d3ffc0ec96777203b2eafee5905464d54ef9f91 (diff)
downloadtor-0514bcd37c6e6e0eb3f3c47da94cb182d01ef15f.tar
tor-0514bcd37c6e6e0eb3f3c47da94cb182d01ef15f.tar.gz
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src')
-rw-r--r--src/or/routerparse.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 14f800e7b..5add728d6 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -4129,11 +4129,13 @@ microdescs_parse_from_string(const char *s, const char *eos,
microdesc_free(md);
md = NULL;
+ SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_clear(t));
memarea_clear(area);
smartlist_clear(tokens);
s = start_of_next_microdesc;
}
+ SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_clear(t));
memarea_drop_all(area);
smartlist_free(tokens);