diff options
| author | Linus Nordberg <linus@torproject.org> | 2012-09-05 13:35:39 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@torproject.org> | 2012-09-05 13:35:39 +0200 |
| commit | f7c97cd40b92084164952dadf3dfeb6164aa6826 (patch) | |
| tree | c245fe7bb28a6f098fa12fe5a11dbece3295117f /doc | |
| parent | c77d1b7bda554d80c309c1d448d32f3220537b4f (diff) | |
| download | tor-f7c97cd40b92084164952dadf3dfeb6164aa6826.tar tor-f7c97cd40b92084164952dadf3dfeb6164aa6826.tar.gz | |
Remove AuthDirPublishIPv6 and let AuthDirHasIPv6Connectivity fill its function.
See #4771 for rationale.
Note that this patch does not take suggested changes in #4470 into
account and keeps treating AuthDirHasIPv6Connectivity as an
AUTOBOOL. Thus, bug fixes for that are included here as well.
This is a fix on master, unreleased as of now.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5e76105d2..93bde59d3 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1749,17 +1749,10 @@ DIRECTORY AUTHORITY SERVER OPTIONS **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). + 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) HIDDEN SERVICE OPTIONS ---------------------- |