diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-04 10:18:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-04 10:18:51 -0400 |
| commit | 05ded76cb6791d5f9472e39c9e3ebb64f450d219 (patch) | |
| tree | 1cd1a33c83140d779c063cd92ea8bd64a49c6b1d /src/or/config.c | |
| parent | 3da9a14f1c8b02215db1a14e31b6d5de4074998b (diff) | |
| parent | 2131cc125bde702b30ad7655967f13ef9e4c8973 (diff) | |
| download | tor-05ded76cb6791d5f9472e39c9e3ebb64f450d219.tar.gz tor-05ded76cb6791d5f9472e39c9e3ebb64f450d219.zip | |
Merge remote-tracking branch 'arma/bug6759'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index a7d6a21a74..a5a8fec507 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -466,7 +466,7 @@ static config_var_t _option_vars[] = { /** Override default values with these if the user sets the TestingTorNetwork * option. */ static const config_var_t testing_tor_network_defaults[] = { - V(ServerDNSAllowBrokenConfig, BOOL, "1"), + V(ServerDNSAllowBrokenConfig, BOOL, "1"), V(DirAllowPrivateAddresses, BOOL, "1"), V(EnforceDistinctSubnets, BOOL, "0"), V(AssumeReachable, BOOL, "1"), |