diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-08-22 20:47:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-08-22 20:47:10 -0400 |
| commit | 43f187ec2e40517148c11f8eaa915ec2ae6d1ec4 (patch) | |
| tree | 1ee9bd18bf84ceeff70b99e6e308203208eab678 | |
| parent | edaea773e57cc39e892643bcce12c755810f508b (diff) | |
| parent | 8bf2892f51eb15dcba2a174968efa3cb12d5b6b6 (diff) | |
| download | tor-43f187ec2e40517148c11f8eaa915ec2ae6d1ec4.tar tor-43f187ec2e40517148c11f8eaa915ec2ae6d1ec4.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.3' into 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 000000000..0df00e369 --- /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 871584154..1b5c6dbb3 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1233,7 +1233,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); |