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

diff --cc src/or/dirvote.c
Simple merge

diff --cc src/or/microdesc.c
Simple merge

diff --cc src/or/routerparse.c
index 890d59660a5c348ff0fb951b68b4bcee0e0586e7,52f57ec591e930d2437c2fe75246d4bf4d597885..3aa4bdf8a5bdfa5b113ee1cdef14599d75d6f0f7
--- 1/src/or/routerparse.c
--- 2/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;

diff --cc src/or/routerparse.h
Simple merge

diff --cc src/test/test_microdesc.c
Simple merge