aboutsummaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-10-08 13:38:47 -0400
committerNick Mathewson <nickm@torproject.org>2013-10-08 13:38:47 -0400
commit66624ded3973ef9ad1e5fa5a3db53344186430e3 (patch)
tree6ce4aa9678fec8bdf71ed942e5baa123b1cf57f2 /src/or/directory.c
parentb571b966f2cc39e906a27bec6ae4f3e1e4376299 (diff)
parent50fc8fb5c5b591fbcaa7e9d5572fa52a1e1b19ae (diff)
downloadtor-66624ded3973ef9ad1e5fa5a3db53344186430e3.tar
tor-66624ded3973ef9ad1e5fa5a3db53344186430e3.tar.gz
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts: src/or/relay.c
Diffstat (limited to 'src/or/directory.c')
-rw-r--r--src/or/directory.c2
1 files changed, 2 insertions, 0 deletions
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);