Merge branch 'maint-0.2.2'

diff --cc src/or/main.c
index 389ddbdf19b040912ba8952834abc303960d5907,2c950245ac56caf4472e2a5796bd0ee8f128476f..1554e812cf967ba5caa54c98324676da06867e71
--- 1/src/or/main.c
--- 2/src/or/main.c
+++ b/src/or/main.c
@@@ -1108,10 -922,8 +1108,8 @@@ run_scheduled_events(time_t now
    }
  
    if (time_to_try_getting_descriptors < now) {
 -    update_router_descriptor_downloads(now);
 +    update_all_descriptor_downloads(now);
      update_extrainfo_downloads(now);
-     if (options->UseBridges)
-       fetch_bridge_descriptors(options, now);
      if (router_have_minimum_dir_info())
        time_to_try_getting_descriptors = now + LAZY_DESCRIPTOR_RETRY_INTERVAL;
      else