diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-05 11:35:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-05 11:35:26 -0400 |
| commit | 116c8409ba0e304306ee98a0ebb15450f130fae2 (patch) | |
| tree | 53259b969a969db3321f3dd08d989019bc339c91 /src/or | |
| parent | f7c97cd40b92084164952dadf3dfeb6164aa6826 (diff) | |
| parent | 0e53742a857b928a5b750ddd7b036e9eae2fdd9c (diff) | |
| download | tor-116c8409ba0e304306ee98a0ebb15450f130fae2.tar.gz tor-116c8409ba0e304306ee98a0ebb15450f130fae2.zip | |
Merge remote-tracking branch 'linus/bug6770_3'
Conflicts:
doc/tor.1.txt
src/or/config.c
Diffstat (limited to 'src/or')
| -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 8c41c7f53d..60276688ce 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -204,7 +204,7 @@ static config_var_t _option_vars[] = { V(AuthDirListBadExits, BOOL, "0"), V(AuthDirMaxServersPerAddr, UINT, "2"), V(AuthDirMaxServersPerAuthAddr,UINT, "5"), - V(AuthDirHasIPv6Connectivity, AUTOBOOL, "auto"), + V(AuthDirHasIPv6Connectivity, AUTOBOOL, "0"), VAR("AuthoritativeDirectory", BOOL, AuthoritativeDir, "0"), V(AutomapHostsOnResolve, BOOL, "0"), V(AutomapHostsSuffixes, CSV, ".onion,.exit"), |