commit 66624ded3973ef9ad1e5fa5a3db53344186430e3 Merge: b571b96 50fc8fb Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 8 13:38:47 2013 -0400

Merge remote-tracking branch 'origin/maint-0.2.4'

Conflicts: src/or/relay.c

changes/bug9927 | 4 ++++ src/or/directory.c | 2 ++ src/or/relay.c | 1 + 3 files changed, 7 insertions(+)

diff --cc src/or/relay.c index b2695ce,29dc361..d12850d --- a/src/or/relay.c +++ b/src/or/relay.c @@@ -1106,9 -1103,9 +1106,10 @@@ connection_edge_process_relay_cell_not_ 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()); + if (TO_DIR_CONN(dirconn)->router_purpose == ROUTER_PURPOSE_GENERAL) + control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, + count_loading_descriptors_progress()); break; } }