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

diff --cc src/or/microdesc.c
index ac48930faf1faa05c8a7043805b312ea0f6f35ad,bb9668da508662c4b2753fd0477d1ade083ebb9c..f9dbcac80d9efc49496c07dc418953f1b96aef49
--- 1/src/or/microdesc.c
--- 2/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;