[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

[arma at torproject.org]

commit 92081f3cdc2e91f7eb9954af2b647ab0bc65d047
Merge: c240efa 07c5026
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue May 17 20:50:18 2011 -0400

    Merge branch 'maint-0.2.2'

 changes/bug3198 |    4 ++++
 src/or/main.c   |    5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --cc src/or/main.c
index 389ddbd,2c95024..1554e81
--- 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