From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 8 Oct 2013 17:38:47 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.2-alpha~145
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66624ded3973ef9ad1e5fa5a3db53344186430e3;p=thirdparty%2Ftor.git

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

Conflicts:
	src/or/relay.c
---

66624ded3973ef9ad1e5fa5a3db53344186430e3
diff --cc src/or/relay.c
index b2695ceec8,29dc36194a..d12850d183
--- 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;
        }
      }