nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'linus/bug6770_3'

Browse Source 
Conflicts:
	doc/tor.1.txt
	src/or/config.c
This commit is contained in:
Nick Mathewson 2012-09-05 11:35:26 -04:00
commit 116c8409ba
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/tor.1.txt
View File

@ -1747,12 +1747,11 @@ DIRECTORY AUTHORITY SERVER OPTIONS
votes on whether to accept relays as hidden service directories.
(Default: 1)
**AuthDirHasIPv6Connectivity** **0**|**1**|**auto**::
Authoritative directories only. When set to 1, IPv6 OR ports are
being tested for reachability and voted on. When set to auto, Tor
tries to find out if the authority relay has IPv6 connectivity or
not. (Default: auto)
**AuthDirHasIPv6Connectivity** **0**|**1**::
Authoritative directories only. When set to 0, OR ports with an
IPv6 address are being accepted without reachability testing.
When set to 1, IPv6 OR ports are being tested just like IPv4 OR
ports. (Default: 0)
HIDDEN SERVICE OPTIONS
----------------------

2
src/or/config.c
View File

@ -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"),