aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug99274
-rw-r--r--src/or/directory.c2
-rw-r--r--src/or/relay.c1
3 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug9927 b/changes/bug9927
new file mode 100644
index 000000000..e66280c3c
--- /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 8c242d8e7..12c5b189f 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2125,6 +2125,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 b2695ceec..d12850d18 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1106,6 +1106,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:
if (TO_DIR_CONN(dirconn)->router_purpose == ROUTER_PURPOSE_GENERAL)
control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,
count_loading_descriptors_progress());