diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-04-12 13:02:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-04-12 13:02:37 -0400 |
| commit | eafcd7b0fccb0993d6c8bcaabc40231d0bdb5289 (patch) | |
| tree | 7150d30d4d173ddf6d2c04109b1b8d97dfb70119 /src/or/or.h | |
| parent | 591029253f4b79de0ecd47c464623b0ce13270ef (diff) | |
| parent | 7babf33239eb1e349826753a9d0405cb59150cce (diff) | |
| download | tor-eafcd7b0fccb0993d6c8bcaabc40231d0bdb5289.tar.gz tor-eafcd7b0fccb0993d6c8bcaabc40231d0bdb5289.zip | |
Merge branch 'maint-0.2.8'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/or/or.h b/src/or/or.h index 905c49fa13..08e1f9ba11 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4193,7 +4193,7 @@ typedef struct { * This schedule is incremented by (potentially concurrent) connection * attempts, unlike other schedules, which are incremented by connection * failures. Only altered on testing networks. */ - smartlist_t *TestingClientBootstrapConsensusAuthorityDownloadSchedule; + smartlist_t *ClientBootstrapConsensusAuthorityDownloadSchedule; /** Schedule for when clients should download consensuses from fallback * directory mirrors if they are bootstrapping (that is, they don't have a @@ -4203,7 +4203,7 @@ typedef struct { * This schedule is incremented by (potentially concurrent) connection * attempts, unlike other schedules, which are incremented by connection * failures. Only altered on testing networks. */ - smartlist_t *TestingClientBootstrapConsensusFallbackDownloadSchedule; + smartlist_t *ClientBootstrapConsensusFallbackDownloadSchedule; /** Schedule for when clients should download consensuses from authorities * if they are bootstrapping (that is, they don't have a usable, reasonably @@ -4213,7 +4213,7 @@ typedef struct { * This schedule is incremented by (potentially concurrent) connection * attempts, unlike other schedules, which are incremented by connection * failures. Only altered on testing networks. */ - smartlist_t *TestingClientBootstrapConsensusAuthorityOnlyDownloadSchedule; + smartlist_t *ClientBootstrapConsensusAuthorityOnlyDownloadSchedule; /** Schedule for when clients should download bridge descriptors. Only * altered on testing networks. */ @@ -4235,17 +4235,17 @@ typedef struct { /** How many times will a client try to fetch a consensus while * bootstrapping using a list of fallback directories, before it gives up? * Only altered on testing networks. */ - int TestingClientBootstrapConsensusMaxDownloadTries; + int ClientBootstrapConsensusMaxDownloadTries; /** How many times will a client try to fetch a consensus while * bootstrapping using only a list of authorities, before it gives up? * Only altered on testing networks. */ - int TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries; + int ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries; /** How many simultaneous in-progress connections will we make when trying * to fetch a consensus before we wait for one to complete, timeout, or * error out? Only altered on testing networks. */ - int TestingClientBootstrapConsensusMaxInProgressTries; + int ClientBootstrapConsensusMaxInProgressTries; /** How many times will we try to download a router's descriptor before * giving up? Only altered on testing networks. */ |