diff options
| author | Roger Dingledine <arma@torproject.org> | 2013-10-08 11:50:53 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2013-10-08 11:50:53 -0400 |
| commit | 5f13ae4b032d033ec51bb79fc69717e02faaefd1 (patch) | |
| tree | 3554cdcc701561c6360161f4bd0cbf52f227896f | |
| parent | 245ecfff36c0cecc8e4aef5ad8c062d7d4c07955 (diff) | |
| download | tor-5f13ae4b032d033ec51bb79fc69717e02faaefd1.tar tor-5f13ae4b032d033ec51bb79fc69717e02faaefd1.tar.gz | |
don't lie about bootstrap progress when clients use bridges
we were listing 50% as soon as we got a bridge's relay descriptor,
even if we didn't have any consensus, certificates, etc yet.
| -rw-r--r-- | changes/bug9922 | 3 | ||||
| -rw-r--r-- | src/or/directory.c | 5 | ||||
| -rw-r--r-- | src/or/relay.c | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/changes/bug9922 b/changes/bug9922 new file mode 100644 index 000000000..195380030 --- /dev/null +++ b/changes/bug9922 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - When clients use bridges, [...] Fixes bug 9922; bugfix on [...] + diff --git a/src/or/directory.c b/src/or/directory.c index 45992e88b..8c242d8e7 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1639,8 +1639,9 @@ load_downloaded_routers(const char *body, smartlist_t *which, added = router_load_routers_from_string(body, NULL, SAVED_NOWHERE, which, descriptor_digests, buf); - control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, - count_loading_descriptors_progress()); + if (general) + control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, + count_loading_descriptors_progress()); return added; } diff --git a/src/or/relay.c b/src/or/relay.c index 010dd1dbf..b2695ceec 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1106,8 +1106,9 @@ connection_edge_process_relay_cell_not_open( control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_STATUS, 0); break; case DIR_PURPOSE_FETCH_SERVERDESC: - control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, - count_loading_descriptors_progress()); + if (TO_DIR_CONN(dirconn)->router_purpose == ROUTER_PURPOSE_GENERAL) + control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, + count_loading_descriptors_progress()); break; } } |