diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-08-18 09:53:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-08-18 09:53:50 -0400 |
| commit | 2f5202c6362408df5aad8f57f8dfffbafcbe0833 (patch) | |
| tree | afbc0a829ed5de2d0ba0ec0b481c3baefdd07ae2 /src/or/config.c | |
| parent | 988d208814e68162d78f66a033940f715a24834a (diff) | |
| parent | 3acb27af3db084166c61e0b40f89deea299df420 (diff) | |
| download | tor-2f5202c6362408df5aad8f57f8dfffbafcbe0833.tar.gz tor-2f5202c6362408df5aad8f57f8dfffbafcbe0833.zip | |
Merge remote-tracking branch 'teor/feature14882-TestingDirAuthVoteIsStrict-v3'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index dabf9e0acb..8d0bbd8798 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -479,8 +479,11 @@ static config_var_t option_vars_[] = { V(TestingMicrodescMaxDownloadTries, UINT, "8"), V(TestingCertMaxDownloadTries, UINT, "8"), V(TestingDirAuthVoteExit, ROUTERSET, NULL), + V(TestingDirAuthVoteExitIsStrict, BOOL, "0"), V(TestingDirAuthVoteGuard, ROUTERSET, NULL), + V(TestingDirAuthVoteGuardIsStrict, BOOL, "0"), V(TestingDirAuthVoteHSDir, ROUTERSET, NULL), + V(TestingDirAuthVoteHSDirIsStrict, BOOL, "0"), VAR("___UsingTestNetworkDefaults", BOOL, UsingTestNetworkDefaults_, "0"), { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL } |