From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 19 Mar 2013 18:18:07 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug8031' into maint-0.2.4
X-Git-Tag: tor-0.2.5.1-alpha~253^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de7e99f8bbc17bfaea260c6d8e2217678b5152af;p=thirdparty%2Ftor.git

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

de7e99f8bbc17bfaea260c6d8e2217678b5152af
diff --cc src/or/microdesc.c
index ac48930faf,bb9668da50..f9dbcac80d
--- 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;