diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-08 13:37:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-08 13:37:13 -0400 |
| commit | 50fc8fb5c5b591fbcaa7e9d5572fa52a1e1b19ae (patch) | |
| tree | 349afd738b38c1fffa24701f9eb30f71afd0e184 | |
| parent | 7e0f1fa52adcf67d7b9c5459a3cc74f57bbfa3e2 (diff) | |
| parent | c7c24785ee1b846c608ae4691df7d10476885b66 (diff) | |
| download | tor-50fc8fb5c5b591fbcaa7e9d5572fa52a1e1b19ae.tar tor-50fc8fb5c5b591fbcaa7e9d5572fa52a1e1b19ae.tar.gz | |
Merge remote-tracking branch 'public/bug9927' into maint-0.2.4
| -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 b4381ac0d..3752367c4 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 3138c5e8d..29dc36194 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; |