diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-08-22 20:47:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-08-22 20:47:23 -0400 |
| commit | 223c7da080713691531817bbf8b61589aa0a67ff (patch) | |
| tree | 8c9b533303210ae7082d0505f3dc1883a2c0b053 | |
| parent | eb79dd42e7de31dff636f67e94da055d94558401 (diff) | |
| parent | 43f187ec2e40517148c11f8eaa915ec2ae6d1ec4 (diff) | |
| download | tor-223c7da080713691531817bbf8b61589aa0a67ff.tar.gz tor-223c7da080713691531817bbf8b61589aa0a67ff.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
| -rw-r--r-- | changes/bug9564 | 5 | ||||
| -rw-r--r-- | src/or/networkstatus.c | 2 |
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 35a20b06ca..c950731bb2 100644 --- a/src/or/networkstatus.c +++ b/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); |