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/test/test_options.c | |
parent | 591029253f4b79de0ecd47c464623b0ce13270ef (diff) | |
parent | 7babf33239eb1e349826753a9d0405cb59150cce (diff) | |
download | tor-eafcd7b0fccb0993d6c8bcaabc40231d0bdb5289.tar.gz tor-eafcd7b0fccb0993d6c8bcaabc40231d0bdb5289.zip |
Merge branch 'maint-0.2.8'
Diffstat (limited to 'src/test/test_options.c')
-rw-r--r-- | src/test/test_options.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/test_options.c b/src/test/test_options.c index d0a0bef4f5..20e8dd563a 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -307,9 +307,9 @@ fixed_get_uname(void) } #define TEST_OPTIONS_OLD_VALUES "TestingV3AuthInitialVotingInterval 1800\n" \ - "TestingClientBootstrapConsensusMaxDownloadTries 7\n" \ - "TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries 4\n" \ - "TestingClientBootstrapConsensusMaxInProgressTries 3\n" \ + "ClientBootstrapConsensusMaxDownloadTries 7\n" \ + "ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries 4\n" \ + "ClientBootstrapConsensusMaxInProgressTries 3\n" \ "TestingV3AuthInitialVoteDelay 300\n" \ "TestingV3AuthInitialDistDelay 300\n" \ "TestingClientMaxIntervalWithoutRequest 600\n" \ |