diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-10-08 13:38:47 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2013-10-08 13:38:47 -0400 |
commit | 66624ded3973ef9ad1e5fa5a3db53344186430e3 (patch) | |
tree | 6ce4aa9678fec8bdf71ed942e5baa123b1cf57f2 | |
parent | b571b966f2cc39e906a27bec6ae4f3e1e4376299 (diff) | |
parent | 50fc8fb5c5b591fbcaa7e9d5572fa52a1e1b19ae (diff) | |
download | tor-66624ded3973ef9ad1e5fa5a3db53344186430e3.tar tor-66624ded3973ef9ad1e5fa5a3db53344186430e3.tar.gz |
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts:
src/or/relay.c
-rw-r--r-- | changes/bug9927 | 4 | ||||
-rw-r--r-- | src/or/directory.c | 2 | ||||
-rw-r--r-- | src/or/relay.c | 1 |
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()); |