Merge remote branch 'origin/maint-0.2.2'

diff --cc src/or/connection_or.c
Simple merge

diff --cc src/or/main.c
index 8ea1728fb792e2a21262d122ba893be8bfc1bdac,582a1c287bc09ffe4d348c7ed63ef011f4a58ee9..23daf13661a40bf83fc0b3b919b89a4d27f06adb
--- 1/src/or/main.c
--- 2/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

diff --cc src/or/or.h
Simple merge

diff --cc src/or/routerlist.c
Simple merge