diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-07 11:02:15 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-07 11:02:15 -0500 |
| commit | 1934bf75ef753e437aa60fe466312017840dd737 (patch) | |
| tree | a9e3ab22935ed509f1e96dc88884d690468b02ec /src/or/config.c | |
| parent | 800dff13080111b1ce1c2f5e28d9ba326299f62a (diff) | |
| parent | 293aca9929cfa0205d16899191c16855a607ac77 (diff) | |
| download | tor-1934bf75ef753e437aa60fe466312017840dd737.tar.gz tor-1934bf75ef753e437aa60fe466312017840dd737.zip | |
Merge branch 'maint-0.2.9'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index fef12083e0..9553822ba3 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -550,7 +550,7 @@ static config_var_t option_vars_[] = { * When clients have authorities and fallbacks available, they use these * schedules: (we stagger the times to avoid thundering herds) */ V(ClientBootstrapConsensusAuthorityDownloadSchedule, CSV_INTERVAL, - "10, 11, 3600, 10800, 25200, 54000, 111600, 262800" /* 3 days + 1 hour */), + "6, 11, 3600, 10800, 25200, 54000, 111600, 262800" /* 3 days + 1 hour */), V(ClientBootstrapConsensusFallbackDownloadSchedule, CSV_INTERVAL, "0, 1, 4, 11, 3600, 10800, 25200, 54000, 111600, 262800"), /* When clients only have authorities available, they use this schedule: */ @@ -561,7 +561,7 @@ static config_var_t option_vars_[] = { * blackholed. Clients will try 3 directories simultaneously. * (Relays never use simultaneous connections.) */ V(ClientBootstrapConsensusMaxInProgressTries, UINT, "3"), - V(TestingBridgeDownloadSchedule, CSV_INTERVAL, "3600, 900, 900, 3600"), + V(TestingBridgeDownloadSchedule, CSV_INTERVAL, "1200, 900, 900, 3600"), V(TestingClientMaxIntervalWithoutRequest, INTERVAL, "10 minutes"), V(TestingDirConnectionMaxStall, INTERVAL, "5 minutes"), V(TestingConsensusMaxDownloadTries, UINT, "8"), |