March 2013 - tor-commits - lists.torproject.org

r26122: {website} update obfsproxy bundle packages (website/trunk/include)
by Erinn Clark 19 Mar '13

19 Mar '13

Author: erinn Date: 2013-03-19 18:24:18 +0000 (Tue, 19 Mar 2013) New Revision: 26122 Modified: website/trunk/include/versions.wmi Log: update obfsproxy bundle packages Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2013-03-19 17:15:17 UTC (rev 26121) +++ website/trunk/include/versions.wmi 2013-03-19 18:24:18 UTC (rev 26122) @@ -33,7 +33,7 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> <define-tag version-torbrowserbundlealpha whitespace=delete>2.4.11-alpha-1</define-tag> -<define-tag version-torobfsbundlealpha whitespace=delete>2.4.7-alpha-1</define-tag> +<define-tag version-torobfsbundlealpha whitespace=delete>2.4.11-alpha-1</define-tag> <define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-5</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-5</define-tag> @@ -44,8 +44,8 @@ <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.4.11-alpha-1</define-tag> <define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.4.11-alpha-1</define-tag> -<define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.4.7-alpha-1</define-tag> -<define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.4.7-alpha-1</define-tag> +<define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.4.11-alpha-1</define-tag> +<define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.4.11-alpha-1</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>2.3.25-5</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-5</define-tag> @@ -55,8 +55,8 @@ <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.4.11-alpha-1</define-tag> <define-tag version-torbrowserbundleosx64alpha whitespace=delete>2.4.11-alpha-1</define-tag> -<define-tag version-torobfsbundleosx32alpha whitespace=delete>2.4.7-alpha-1</define-tag> -<define-tag version-torobfsbundleosx64alpha whitespace=delete>2.4.7-alpha-1</define-tag> +<define-tag version-torobfsbundleosx32alpha whitespace=delete>2.4.11-alpha-1</define-tag> +<define-tag version-torobfsbundleosx64alpha whitespace=delete>2.4.11-alpha-1</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.21</define-tag> <define-tag version-vidalia-alpha whitespace=delete>0.3.1</define-tag>

1 0

[tor/master] Use fds, not stdio, to manage microdescriptor files
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit d54ccbe9fd5c9ca6ff53ad7d0efc4d0e837062ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 14:37:44 2013 -0400 Use fds, not stdio, to manage microdescriptor files This is part of an attempt to mitigate 8031. --- src/or/microdesc.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index b4d22c1..0a9724f 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -70,7 +70,7 @@ HT_GENERATE(microdesc_map, microdesc_t, node, * *<b>annotation_len_out</b> to the number of bytes written as * annotations. */ static ssize_t -dump_microdescriptor(FILE *f, microdesc_t *md, size_t *annotation_len_out) +dump_microdescriptor(int fd, microdesc_t *md, size_t *annotation_len_out) { ssize_t r = 0; size_t written; @@ -80,10 +80,10 @@ dump_microdescriptor(FILE *f, microdesc_t *md, size_t *annotation_len_out) char annotation[ISO_TIME_LEN+32]; format_iso_time(buf, md->last_listed); tor_snprintf(annotation, sizeof(annotation), "@last-listed %s\n", buf); - if (fputs(annotation, f) < 0) { + if (write_all(fd, annotation, strlen(annotation), 0) < 0) { log_warn(LD_DIR, "Couldn't write microdescriptor annotation: %s", - strerror(ferror(f))); + strerror(errno)); return -1; } r += strlen(annotation); @@ -92,13 +92,13 @@ dump_microdescriptor(FILE *f, microdesc_t *md, size_t *annotation_len_out) *annotation_len_out = 0; } - md->off = (off_t) ftell(f); - written = fwrite(md->body, 1, md->bodylen, f); + md->off = tor_fd_getpos(fd); + written = write_all(fd, md->body, md->bodylen, 0); if (written != md->bodylen) { log_warn(LD_DIR, "Couldn't dump microdescriptor (wrote %lu out of %lu): %s", (unsigned long)written, (unsigned long)md->bodylen, - strerror(ferror(f))); + strerror(errno)); return -1; } r += md->bodylen; @@ -197,15 +197,15 @@ microdescs_add_list_to_cache(microdesc_cache_t *cache, { smartlist_t *added; open_file_t *open_file = NULL; - FILE *f = NULL; + int fd = -1; // int n_added = 0; ssize_t size = 0; if (where == SAVED_NOWHERE && !no_save) { - f = start_writing_to_stdio_file(cache->journal_fname, - OPEN_FLAGS_APPEND|O_BINARY, - 0600, &open_file); - if (!f) { + fd = start_writing_to_file(cache->journal_fname, + OPEN_FLAGS_APPEND|O_BINARY, + 0600, &open_file); + if (fd < 0) { log_warn(LD_DIR, "Couldn't append to journal in %s: %s", cache->journal_fname, strerror(errno)); return NULL; @@ -227,9 +227,9 @@ microdescs_add_list_to_cache(microdesc_cache_t *cache, } /* 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; */ abort_writing_to_file(open_file); @@ -251,7 +251,7 @@ microdescs_add_list_to_cache(microdesc_cache_t *cache, cache->total_len_seen += md->bodylen; } SMARTLIST_FOREACH_END(md); - if (f) + if (fd >= 0) finish_writing_to_file(open_file); /*XXX Check me.*/ { @@ -405,7 +405,7 @@ int microdesc_cache_rebuild(microdesc_cache_t *cache, int force) { open_file_t *open_file; - FILE *f; + int fd = -1; microdesc_t **mdp; smartlist_t *wrote; ssize_t size; @@ -429,10 +429,10 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) orig_size = (int)(cache->cache_content ? cache->cache_content->size : 0); orig_size += (int)cache->journal_len; - f = start_writing_to_stdio_file(cache->cache_fname, - OPEN_FLAGS_REPLACE|O_BINARY, - 0600, &open_file); - if (!f) + fd = start_writing_to_file(cache->cache_fname, + OPEN_FLAGS_REPLACE|O_BINARY, + 0600, &open_file); + if (fd < 0) return -1; wrote = smartlist_new(); @@ -443,7 +443,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) if (md->no_save) continue; - size = dump_microdescriptor(f, md, &annotation_len); + size = dump_microdescriptor(fd, md, &annotation_len); if (size < 0) { /* XXX handle errors from dump_microdescriptor() */ /* log? return -1? die? coredump the universe? */

1 0

[tor/master] Check more error codes when writing microdescriptors.
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 6905c1f60d2d0e658481df70fdcaa73251becacc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 14:50:41 2013 -0400 Check more error codes when writing microdescriptors. Possible partial fix, or diagnosis tool, for bug 8031. --- changes/bug8031 | 7 +++++++ src/or/microdesc.c | 18 ++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/changes/bug8031 b/changes/bug8031 new file mode 100644 index 0000000..17329ec --- /dev/null +++ b/changes/bug8031 @@ -0,0 +1,7 @@ + o Minor bugfixes: + - Use direct writes rather than stdio when building microdescriptor + caches, in an attempt to mitigate bug 8031, or at least make it + less common. + - Warn more aggressively when flushing microdescriptors to a + microdescriptor cache fails, in an attempt to mitegate bug 8031, + or at least make it more diagnosable. diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 0a9724f..7d3f631 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -251,8 +251,14 @@ microdescs_add_list_to_cache(microdesc_cache_t *cache, cache->total_len_seen += md->bodylen; } SMARTLIST_FOREACH_END(md); - if (fd >= 0) - finish_writing_to_file(open_file); /*XXX Check me.*/ + if (fd >= 0) { + if (finish_writing_to_file(open_file) < 0) { + log_warn(LD_DIR, "Error appending to microdescriptor file: %s", + strerror(errno)); + smartlist_clear(added); + return added; + } + } { networkstatus_t *ns = networkstatus_get_latest_consensus(); @@ -459,11 +465,15 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) smartlist_add(wrote, md); } + if (finish_writing_to_file(open_file) < 0) { + log_warn(LD_DIR, "Error rebuilding microdescriptor cache: %s", + strerror(errno)); + return -1; + } + if (cache->cache_content) tor_munmap_file(cache->cache_content); - finish_writing_to_file(open_file); /*XXX Check me.*/ - cache->cache_content = tor_mmap_file(cache->cache_fname); if (!cache->cache_content && smartlist_len(wrote)) {

1 0

[tor/master] Another possible diagnostic for 8031.
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 1eebb566911380c22768a8d25061a8f917688349 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 14:52:56 2013 -0400 Another possible diagnostic for 8031. This time, I'm checking whether our calculated offset matches our real offset, in each case, as we go along. I don't think this is the bug, but it can't hurt to check. --- src/or/microdesc.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 7d3f631..bb9668d 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -415,7 +415,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) microdesc_t **mdp; smartlist_t *wrote; ssize_t size; - off_t off = 0; + off_t off = 0, off_real; int orig_size, new_size; if (cache == NULL) { @@ -458,6 +458,14 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) tor_assert(((size_t)size) == annotation_len + md->bodylen); md->off = off + annotation_len; off += size; + off_real = tor_fd_getpos(fd); + if (off_real != off) { + log_warn(LD_BUG, "Discontinuity in position in microdescriptor cache." + "By my count, I'm at "I64_FORMAT + ", but I should be at "I64_FORMAT, + I64_PRINTF_ARG(off), I64_PRINTF_ARG(off_real)); + off = off_real; + } if (md->saved_location != SAVED_IN_CACHE) { tor_free(md->body); md->saved_location = SAVED_IN_CACHE;

1 0

[tor/master] Merge remote-tracking branch 'public/bug8031' into maint-0.2.4
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit de7e99f8bbc17bfaea260c6d8e2217678b5152af Merge: 4eaca17 1eebb56 Author: Nick Mathewson <nickm(a)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;

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 084c857704209572ca3dc9ffe8c1213189e35442 Merge: e6602f5 de7e99f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 14:19:19 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8031 | 7 +++++ src/or/microdesc.c | 66 +++++++++++++++++++++++++++++++++------------------- 2 files changed, 49 insertions(+), 24 deletions(-)

1 0

[tor/maint-0.2.4] Use fds, not stdio, to manage microdescriptor files
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit d54ccbe9fd5c9ca6ff53ad7d0efc4d0e837062ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 14:37:44 2013 -0400 Use fds, not stdio, to manage microdescriptor files This is part of an attempt to mitigate 8031. --- src/or/microdesc.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index b4d22c1..0a9724f 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -70,7 +70,7 @@ HT_GENERATE(microdesc_map, microdesc_t, node, * *<b>annotation_len_out</b> to the number of bytes written as * annotations. */ static ssize_t -dump_microdescriptor(FILE *f, microdesc_t *md, size_t *annotation_len_out) +dump_microdescriptor(int fd, microdesc_t *md, size_t *annotation_len_out) { ssize_t r = 0; size_t written; @@ -80,10 +80,10 @@ dump_microdescriptor(FILE *f, microdesc_t *md, size_t *annotation_len_out) char annotation[ISO_TIME_LEN+32]; format_iso_time(buf, md->last_listed); tor_snprintf(annotation, sizeof(annotation), "@last-listed %s\n", buf); - if (fputs(annotation, f) < 0) { + if (write_all(fd, annotation, strlen(annotation), 0) < 0) { log_warn(LD_DIR, "Couldn't write microdescriptor annotation: %s", - strerror(ferror(f))); + strerror(errno)); return -1; } r += strlen(annotation); @@ -92,13 +92,13 @@ dump_microdescriptor(FILE *f, microdesc_t *md, size_t *annotation_len_out) *annotation_len_out = 0; } - md->off = (off_t) ftell(f); - written = fwrite(md->body, 1, md->bodylen, f); + md->off = tor_fd_getpos(fd); + written = write_all(fd, md->body, md->bodylen, 0); if (written != md->bodylen) { log_warn(LD_DIR, "Couldn't dump microdescriptor (wrote %lu out of %lu): %s", (unsigned long)written, (unsigned long)md->bodylen, - strerror(ferror(f))); + strerror(errno)); return -1; } r += md->bodylen; @@ -197,15 +197,15 @@ microdescs_add_list_to_cache(microdesc_cache_t *cache, { smartlist_t *added; open_file_t *open_file = NULL; - FILE *f = NULL; + int fd = -1; // int n_added = 0; ssize_t size = 0; if (where == SAVED_NOWHERE && !no_save) { - f = start_writing_to_stdio_file(cache->journal_fname, - OPEN_FLAGS_APPEND|O_BINARY, - 0600, &open_file); - if (!f) { + fd = start_writing_to_file(cache->journal_fname, + OPEN_FLAGS_APPEND|O_BINARY, + 0600, &open_file); + if (fd < 0) { log_warn(LD_DIR, "Couldn't append to journal in %s: %s", cache->journal_fname, strerror(errno)); return NULL; @@ -227,9 +227,9 @@ microdescs_add_list_to_cache(microdesc_cache_t *cache, } /* 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; */ abort_writing_to_file(open_file); @@ -251,7 +251,7 @@ microdescs_add_list_to_cache(microdesc_cache_t *cache, cache->total_len_seen += md->bodylen; } SMARTLIST_FOREACH_END(md); - if (f) + if (fd >= 0) finish_writing_to_file(open_file); /*XXX Check me.*/ { @@ -405,7 +405,7 @@ int microdesc_cache_rebuild(microdesc_cache_t *cache, int force) { open_file_t *open_file; - FILE *f; + int fd = -1; microdesc_t **mdp; smartlist_t *wrote; ssize_t size; @@ -429,10 +429,10 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) orig_size = (int)(cache->cache_content ? cache->cache_content->size : 0); orig_size += (int)cache->journal_len; - f = start_writing_to_stdio_file(cache->cache_fname, - OPEN_FLAGS_REPLACE|O_BINARY, - 0600, &open_file); - if (!f) + fd = start_writing_to_file(cache->cache_fname, + OPEN_FLAGS_REPLACE|O_BINARY, + 0600, &open_file); + if (fd < 0) return -1; wrote = smartlist_new(); @@ -443,7 +443,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) if (md->no_save) continue; - size = dump_microdescriptor(f, md, &annotation_len); + size = dump_microdescriptor(fd, md, &annotation_len); if (size < 0) { /* XXX handle errors from dump_microdescriptor() */ /* log? return -1? die? coredump the universe? */

1 0

[tor/maint-0.2.4] Check more error codes when writing microdescriptors.
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 6905c1f60d2d0e658481df70fdcaa73251becacc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 14:50:41 2013 -0400 Check more error codes when writing microdescriptors. Possible partial fix, or diagnosis tool, for bug 8031. --- changes/bug8031 | 7 +++++++ src/or/microdesc.c | 18 ++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/changes/bug8031 b/changes/bug8031 new file mode 100644 index 0000000..17329ec --- /dev/null +++ b/changes/bug8031 @@ -0,0 +1,7 @@ + o Minor bugfixes: + - Use direct writes rather than stdio when building microdescriptor + caches, in an attempt to mitigate bug 8031, or at least make it + less common. + - Warn more aggressively when flushing microdescriptors to a + microdescriptor cache fails, in an attempt to mitegate bug 8031, + or at least make it more diagnosable. diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 0a9724f..7d3f631 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -251,8 +251,14 @@ microdescs_add_list_to_cache(microdesc_cache_t *cache, cache->total_len_seen += md->bodylen; } SMARTLIST_FOREACH_END(md); - if (fd >= 0) - finish_writing_to_file(open_file); /*XXX Check me.*/ + if (fd >= 0) { + if (finish_writing_to_file(open_file) < 0) { + log_warn(LD_DIR, "Error appending to microdescriptor file: %s", + strerror(errno)); + smartlist_clear(added); + return added; + } + } { networkstatus_t *ns = networkstatus_get_latest_consensus(); @@ -459,11 +465,15 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) smartlist_add(wrote, md); } + if (finish_writing_to_file(open_file) < 0) { + log_warn(LD_DIR, "Error rebuilding microdescriptor cache: %s", + strerror(errno)); + return -1; + } + if (cache->cache_content) tor_munmap_file(cache->cache_content); - finish_writing_to_file(open_file); /*XXX Check me.*/ - cache->cache_content = tor_mmap_file(cache->cache_fname); if (!cache->cache_content && smartlist_len(wrote)) {

1 0

[tor/maint-0.2.4] Another possible diagnostic for 8031.
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 1eebb566911380c22768a8d25061a8f917688349 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 14:52:56 2013 -0400 Another possible diagnostic for 8031. This time, I'm checking whether our calculated offset matches our real offset, in each case, as we go along. I don't think this is the bug, but it can't hurt to check. --- src/or/microdesc.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 7d3f631..bb9668d 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -415,7 +415,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) microdesc_t **mdp; smartlist_t *wrote; ssize_t size; - off_t off = 0; + off_t off = 0, off_real; int orig_size, new_size; if (cache == NULL) { @@ -458,6 +458,14 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) tor_assert(((size_t)size) == annotation_len + md->bodylen); md->off = off + annotation_len; off += size; + off_real = tor_fd_getpos(fd); + if (off_real != off) { + log_warn(LD_BUG, "Discontinuity in position in microdescriptor cache." + "By my count, I'm at "I64_FORMAT + ", but I should be at "I64_FORMAT, + I64_PRINTF_ARG(off), I64_PRINTF_ARG(off_real)); + off = off_real; + } if (md->saved_location != SAVED_IN_CACHE) { tor_free(md->body); md->saved_location = SAVED_IN_CACHE;

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug8031' into maint-0.2.4
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit de7e99f8bbc17bfaea260c6d8e2217678b5152af Merge: 4eaca17 1eebb56 Author: Nick Mathewson <nickm(a)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;

1 0