diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-23 09:01:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-23 09:01:24 -0400 |
| commit | 703254a8321788bd6d03ec5f335fe338916fef6f (patch) | |
| tree | 6decd78f0fc701c0c8f068089a4fa7cfa4cdc433 /src/or/networkstatus.c | |
| parent | 61dac57aa3790464dd50da9bbc78fd275f511f3d (diff) | |
| parent | a09ec22a9b1d213716ac1792752c266c3a92a1f6 (diff) | |
| download | tor-703254a8321788bd6d03ec5f335fe338916fef6f.tar.gz tor-703254a8321788bd6d03ec5f335fe338916fef6f.zip | |
Merge remote-tracking branch 'public/bug15942_v2_alternative'
Diffstat (limited to 'src/or/networkstatus.c')
| -rw-r--r-- | src/or/networkstatus.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index da51698da4..3471288969 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -86,9 +86,9 @@ static time_t time_to_download_next_consensus[N_CONSENSUS_FLAVORS]; static download_status_t consensus_dl_status[N_CONSENSUS_FLAVORS] = { { 0, 0, 0, DL_SCHED_CONSENSUS, DL_WANT_ANY_DIRSERVER, - DL_SCHED_INCREMENT_FAILURE }, + DL_SCHED_INCREMENT_FAILURE, DL_SCHED_RANDOM_EXPONENTIAL, 0, 0 }, { 0, 0, 0, DL_SCHED_CONSENSUS, DL_WANT_ANY_DIRSERVER, - DL_SCHED_INCREMENT_FAILURE }, + DL_SCHED_INCREMENT_FAILURE, DL_SCHED_RANDOM_EXPONENTIAL, 0, 0 }, }; #define N_CONSENSUS_BOOTSTRAP_SCHEDULES 2 @@ -105,10 +105,10 @@ static download_status_t consensus_bootstrap_dl_status[N_CONSENSUS_BOOTSTRAP_SCHEDULES] = { { 0, 0, 0, DL_SCHED_CONSENSUS, DL_WANT_AUTHORITY, - DL_SCHED_INCREMENT_ATTEMPT }, + DL_SCHED_INCREMENT_ATTEMPT, DL_SCHED_RANDOM_EXPONENTIAL, 0, 0 }, /* During bootstrap, DL_WANT_ANY_DIRSERVER means "use fallbacks". */ { 0, 0, 0, DL_SCHED_CONSENSUS, DL_WANT_ANY_DIRSERVER, - DL_SCHED_INCREMENT_ATTEMPT }, + DL_SCHED_INCREMENT_ATTEMPT, DL_SCHED_RANDOM_EXPONENTIAL, 0, 0 }, }; /** True iff we have logged a warning about this OR's version being older than |