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 /src/or/relay.c | |
| 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
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 1 |
1 files changed, 1 insertions, 0 deletions
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()); |