aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-08-22 10:00:37 -0400
committerNick Mathewson <nickm@torproject.org>2013-08-22 10:00:37 -0400
commit2530c842207ecbec0d178fa5ce804a61a1c6ec6c (patch)
tree7e7edeadd87de62dd9f0b105fb2135b329b7bdbe
parent64410cc88888ff964a82613cc53475def98d9de7 (diff)
downloadtor-2530c842207ecbec0d178fa5ce804a61a1c6ec6c.tar.gz
tor-2530c842207ecbec0d178fa5ce804a61a1c6ec6c.zip
Replace return with continue in update_consensus_networkstatus_downloads
Fix for bug 9564; bugfix on 0.2.3.14-alpha.
-rw-r--r--changes/bug95645
-rw-r--r--src/or/networkstatus.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug9564 b/changes/bug9564
new file mode 100644
index 0000000000..0df00e3698
--- /dev/null
+++ b/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.
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 2553a74e50..e780eadac7 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1239,7 +1239,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);