diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-16 11:20:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-16 11:20:43 -0400 |
| commit | 17d368281ad374908fb019e29f3f012659be010c (patch) | |
| tree | a34ee421c26c1003f93b7928817699cc622c1933 /src/or/config.c | |
| parent | 1129362bd7208413d93f7f8e1b4317883a5c7910 (diff) | |
| parent | fab8fd2c18491440b37b71e140e23e6091bbbe32 (diff) | |
| download | tor-17d368281ad374908fb019e29f3f012659be010c.tar.gz tor-17d368281ad374908fb019e29f3f012659be010c.zip | |
Merge remote-tracking branch 'linus/bug9206_option'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 89f9e9ba47..14e8f9ab37 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -458,6 +458,7 @@ static config_var_t option_vars_[] = { V(TestingDescriptorMaxDownloadTries, UINT, "8"), V(TestingMicrodescMaxDownloadTries, UINT, "8"), V(TestingCertMaxDownloadTries, UINT, "8"), + V(TestingDirAuthVoteGuard, ROUTERSET, NULL), VAR("___UsingTestNetworkDefaults", BOOL, UsingTestNetworkDefaults_, "0"), { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL } |