diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-07-19 17:52:21 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-07-19 17:52:21 -0400 |
| commit | a4995d1507d93186bcfcdc4d3f61b8c91f7f75cc (patch) | |
| tree | 886e6688a318744ba4d1679d33012f59784a1953 /doc | |
| parent | 24451e6f7d6813642cc3b092bf085fdbb4a9aefc (diff) | |
| parent | fff842a47c7aca7cc8d49ac0e487fa3c6a536c96 (diff) | |
| download | tor-a4995d1507d93186bcfcdc4d3f61b8c91f7f75cc.tar.gz tor-a4995d1507d93186bcfcdc4d3f61b8c91f7f75cc.zip | |
Merge branch 'tickets_5529_5534_5974_6406'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 78c34874c5..364bfdc2f4 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1728,6 +1728,20 @@ 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 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. When set to auto, Tor tries to find out if the authority + relay has IPv6 connectivity or not. (Default: auto) + +**AuthDirPublishIPv6** **0**|**1**:: + + Authoritative directories only. When set to 0, Tor will not + include IPv6 OR ports in votes. When set to 1, Tor will vote for + IPv6 OR ports. (Default: 0). + HIDDEN SERVICE OPTIONS ---------------------- |