From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 17 Dec 2013 18:15:45 +0000 (-0500)
Subject: Merge remote-tracking branch 'public/bug10409_023' into maint-0.2.4
X-Git-Tag: tor-0.2.5.2-alpha~61^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d5154550c92766347631e4d15fae825a0f165dd;p=thirdparty%2Ftor.git

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

3d5154550c92766347631e4d15fae825a0f165dd
diff --cc src/or/routerparse.c
index 890d59660a,52f57ec591..3aa4bdf8a5
--- 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;