diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-04-27 15:20:01 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-04-27 15:20:01 -0400 |
commit | 78c610eea9472348634e05b49f9d3a9f4dcc221c (patch) | |
tree | b06dec95f80aee4824871bc8c03d70b5f4a9440a /src/or/routerparse.c | |
parent | 8b686d98c47226dfc4d7c87d6a472b592135ae07 (diff) | |
parent | 247cbab6c8a37c5e6225bfd60491b071a29331e4 (diff) | |
download | tor-78c610eea9472348634e05b49f9d3a9f4dcc221c.tar.gz tor-78c610eea9472348634e05b49f9d3a9f4dcc221c.zip |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
doc/tor.1.txt
Diffstat (limited to 'src/or/routerparse.c')
-rw-r--r-- | src/or/routerparse.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index e44fd8c989..80214b3cfb 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4357,6 +4357,7 @@ microdescs_parse_from_string(const char *s, const char *eos, md = NULL; next: microdesc_free(md); + md = NULL; memarea_clear(area); smartlist_clear(tokens); |