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 /doc | |
| 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 'doc')
| -rw-r--r-- | doc/tor.1.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 93bde59d3f..9a8de25921 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -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 ---------------------- |