[tor-commits] [tor/maint-0.2.4] Generate bootstrapping status messages for microdescs too

[nickm at torproject.org]

commit c7c24785ee1b846c608ae4691df7d10476885b66
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 8 11:31:08 2013 -0400

    Generate bootstrapping status messages for microdescs too
    
    Fix for 9927.
---
 changes/bug9927    |    4 ++++
 src/or/directory.c |    2 ++
 src/or/relay.c     |    1 +
 3 files changed, 7 insertions(+)

diff --git a/changes/bug9927 b/changes/bug9927
new file mode 100644
index 0000000..e66280c
--- /dev/null
+++ b/changes/bug9927
@@ -0,0 +1,4 @@
+  o Minor features:
+    - Generate bootstrapping status update events correctly for fetching
+      microdescriptors. Fixes bug 9927.
+
diff --git a/src/or/directory.c b/src/or/directory.c
index b4381ac..3752367 100644
--- a/src/or/directory.c
+++ b/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);
diff --git a/src/or/relay.c b/src/or/relay.c
index 3138c5e..29dc361 100644
--- a/src/or/relay.c
+++ b/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;