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

This commit is contained in:
Nick Mathewson 2013-08-22 20:47:23 -04:00
commit 223c7da080
2 changed files with 6 additions and 1 deletions

5
changes/bug9564 Normal file
View File

@ -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.

View File

@ -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);