From: Roger Dingledine <arma@torproject.org>
Date: Wed, 18 May 2011 00:50:18 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92081f3cdc2e91f7eb9954af2b647ab0bc65d047;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

92081f3cdc2e91f7eb9954af2b647ab0bc65d047
diff --cc src/or/main.c
index 389ddbdf19,2c950245ac..1554e812cf
--- a/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