Merge branch 'bug9922'

changes/bug9922

@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+    - Fix a bug where clients using bridges would report themselves
+      as 50% bootstrapped even without a live consensus document.
+      Fixes bug 9922; bugfix on 0.2.1.1-alpha.
+

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;
 }
 

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;
       }
     }