commit 3d5154550c92766347631e4d15fae825a0f165dd Merge: 59f50c8 d8cfa2e Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 17 13:15:45 2013 -0500

Merge remote-tracking branch 'public/bug10409_023' into maint-0.2.4

changes/bug10409 | 3 +++ src/or/dirvote.c | 3 ++- src/or/microdesc.c | 3 +-- src/or/routerparse.c | 13 ++++++++++--- src/or/routerparse.h | 2 +- src/test/test_microdesc.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 62 insertions(+), 7 deletions(-)

diff --cc src/or/routerparse.c index 890d596,52f57ec..3aa4bdf --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@@ -4288,8 -4404,9 +4294,9 @@@ microdescs_parse_from_string(const cha tor_assert(cp);

md->bodylen = start_of_next_microdesc - cp; + md->saved_location = where; if (copy_body) - md->body = tor_strndup(cp, md->bodylen); + md->body = tor_memdup_nulterm(cp, md->bodylen); else md->body = (char*)cp; md->off = cp - start;