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/microdesc.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/microdesc.c')
| -rw-r--r-- | src/or/microdesc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 8b5581f4af..c4907faf6f 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -154,11 +154,10 @@ microdescs_add_to_cache(microdesc_cache_t *cache, { smartlist_t *descriptors, *added; const int allow_annotations = (where != SAVED_NOWHERE); - const int copy_body = (where != SAVED_IN_CACHE); descriptors = microdescs_parse_from_string(s, eos, allow_annotations, - copy_body); + where); if (listed_at > 0) { SMARTLIST_FOREACH(descriptors, microdesc_t *, md, md->last_listed = listed_at); |