diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-12-17 13:15:45 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2013-12-17 13:15:45 -0500 |
commit | 3d5154550c92766347631e4d15fae825a0f165dd (patch) | |
tree | 1c696321c3613a2983d1872934b6d76d6931d9f5 /src/or/dirvote.c | |
parent | 59f50c80d443a7e148f85cfed493e3e703cc4386 (diff) | |
parent | d8cfa2ef4e6d57f6dd4a33e5b3cfb1a2a12fc4be (diff) | |
download | tor-3d5154550c92766347631e4d15fae825a0f165dd.tar.gz tor-3d5154550c92766347631e4d15fae825a0f165dd.zip |
Merge remote-tracking branch 'public/bug10409_023' into maint-0.2.4
Diffstat (limited to 'src/or/dirvote.c')
-rw-r--r-- | src/or/dirvote.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index e0af66e22d..c6d1244902 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3585,7 +3585,8 @@ dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method) { smartlist_t *lst = microdescs_parse_from_string(output, - output+strlen(output), 0, 1); + output+strlen(output), 0, + SAVED_NOWHERE); if (smartlist_len(lst) != 1) { log_warn(LD_DIR, "We generated a microdescriptor we couldn't parse."); SMARTLIST_FOREACH(lst, microdesc_t *, md, microdesc_free(md)); |