Merge remote-tracking branch 'origin/maint-0.2.4'

changes/bug9564

@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+    - If the time to download the next old-style networkstatus is in
+      the future, do not decline to consider whether to download the
+      next microdescriptor networkstatus. Fixes bug 9564. Bugfix on
+      0.2.3.14-alpha.

src/or/networkstatus.c

@@ -1231,7 +1231,7 @@ update_consensus_networkstatus_downloads(time_t now)
     }
 
     if (time_to_download_next_consensus[i] > now)
-      return; /* Wait until the current consensus is older. */
+      continue; /* Wait until the current consensus is older. */
 
     resource = networkstatus_get_flavor_name(i);