Browse Source

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

Nick Mathewson 11 years ago
parent
commit
50fc8fb5c5
3 changed files with 7 additions and 0 deletions
  1. 4 0
      changes/bug9927
  2. 2 0
      src/or/directory.c
  3. 1 0
      src/or/relay.c

+ 4 - 0
changes/bug9927

@@ -0,0 +1,4 @@
+  o Minor features:
+    - Generate bootstrapping status update events correctly for fetching
+      microdescriptors. Fixes bug 9927.
+

+ 2 - 0
src/or/directory.c

@@ -2111,6 +2111,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
         /* Mark remaining ones as failed. */
         dir_microdesc_download_failed(which, status_code);
       }
+      control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,
+                              count_loading_descriptors_progress());
       SMARTLIST_FOREACH(which, char *, cp, tor_free(cp));
       smartlist_free(which);
       smartlist_free(mds);

+ 1 - 0
src/or/relay.c

@@ -1103,6 +1103,7 @@ connection_edge_process_relay_cell_not_open(
           control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_STATUS, 0);
           break;
         case DIR_PURPOSE_FETCH_SERVERDESC:
+        case DIR_PURPOSE_FETCH_MICRODESC:
           control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,
                                   count_loading_descriptors_progress());
           break;