diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-08 12:03:09 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-08 12:03:09 -0400 |
| commit | 63234b183963054b01f71fa8e318add0a640cea8 (patch) | |
| tree | 08e911ea38553f7f2eb5ddd9171e6f333e27fabf /src/or | |
| parent | c8c22980151b220ec79fc2979bc7db3a9fe962d5 (diff) | |
| parent | b2a050cb2ac796395b50ad8ae46fdb58bfc781c4 (diff) | |
| download | tor-63234b183963054b01f71fa8e318add0a640cea8.tar tor-63234b183963054b01f71fa8e318add0a640cea8.tar.gz | |
Merge branch 'bug9922'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/directory.c | 5 | ||||
| -rw-r--r-- | src/or/relay.c | 5 |
2 files changed, 6 insertions, 4 deletions
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; } } |