From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 29 Sep 2010 04:38:44 +0000 (-0400)
Subject: Merge remote branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.1-alpha~354
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=703eb087f597fa3456627e47862038a4ce73089e;p=thirdparty%2Ftor.git

Merge remote branch 'origin/maint-0.2.2'
---

703eb087f597fa3456627e47862038a4ce73089e
diff --cc src/or/main.c
index 8ea1728fb7,582a1c287b..23daf13661
--- a/src/or/main.c
+++ b/src/or/main.c
@@@ -1065,9 -911,8 +1065,9 @@@ run_scheduled_events(time_t now
    if (time_to_try_getting_descriptors < now) {
      update_router_descriptor_downloads(now);
      update_extrainfo_downloads(now);
 +    update_microdesc_downloads(now);
      if (options->UseBridges)
-       fetch_bridge_descriptors(now);
+       fetch_bridge_descriptors(options, now);
      if (router_have_minimum_dir_info())
        time_to_try_getting_descriptors = now + LAZY_DESCRIPTOR_RETRY_INTERVAL;
      else