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

Conflicts:
	src/or/relay.c

diff --cc src/or/directory.c
Simple merge

diff --cc src/or/relay.c
index b2695ceec8740270f1a97e34e5b252952855198b,29dc36194aaf92edc09c8d93b393b3fd9b7ca51f..d12850d18386d23643679070a96c9f5a7708d3e4
--- 1/src/or/relay.c
--- 2/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:
 -          control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,
 -                                  count_loading_descriptors_progress());
+         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());
            break;
        }
      }