commit de7e99f8bbc17bfaea260c6d8e2217678b5152af Merge: 4eaca17 1eebb56 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 19 14:18:07 2013 -0400

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

changes/bug8031 | 7 +++++ src/or/microdesc.c | 66 +++++++++++++++++++++++++++++++++------------------- 2 files changed, 49 insertions(+), 24 deletions(-)

diff --cc src/or/microdesc.c index ac48930,bb9668d..f9dbcac --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@@ -228,11 -227,11 +228,11 @@@ microdescs_add_list_to_cache(microdesc_ }

/* Okay, it's a new one. */ - if (f) { + if (fd >= 0) { size_t annotation_len; - size = dump_microdescriptor(f, md, &annotation_len); + size = dump_microdescriptor(fd, md, &annotation_len); if (size < 0) { - /* we already warned in dump_microdescriptor; */ + /* we already warned in dump_microdescriptor */ abort_writing_to_file(open_file); smartlist_clear(added); return added;