summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-02-22 16:10:40 -0500
committerteor (Tim Wilson-Brown) <teor2345@gmail.com>2015-12-14 23:43:50 +1100
commit85003f4c80b7c980099fedca7dba0c0a90209084 (patch)
tree095ed5940d719cca70efad4fb712006b8d21000a /doc
parentf3ed5ec0cac4719e249e629760756314d7cfecba (diff)
downloadtor-85003f4c80b7c980099fedca7dba0c0a90209084.tar.gz
tor-85003f4c80b7c980099fedca7dba0c0a90209084.zip
Add a new ipv6=address:orport flag to DirAuthority and FallbackDir
Resolves # 6027
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 041b000f09..3ef5674d2b 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -358,7 +358,7 @@ GENERAL OPTIONS
DataDirectory. If the option is set to 1, make the DataDirectory readable
by the default GID. (Default: 0)
-[[FallbackDir]] **FallbackDir** __address__:__port__ orport=__port__ id=__fingerprint__ [weight=__num__]::
+[[FallbackDir]] **FallbackDir** __address__:__port__ orport=__port__ id=__fingerprint__ [weight=__num__] [ipv6=__address__:__orport__]::
When we're unable to connect to any directory cache for directory info
(usually because we don't know about any yet) we try a FallbackDir.
By default, the directory authorities are also FallbackDirs.
@@ -374,9 +374,12 @@ GENERAL OPTIONS
"bridge" flag is set. If a flag "orport=**port**" is given, Tor will use the
given port when opening encrypted tunnels to the dirserver. If a flag
"weight=**num**" is given, then the directory server is chosen randomly
- with probability proportional to that weight (default 1.0). Lastly, if a
+ with probability proportional to that weight (default 1.0). If a
flag "v3ident=**fp**" is given, the dirserver is a v3 directory authority
- whose v3 long-term signing key has the fingerprint **fp**. +
+ whose v3 long-term signing key has the fingerprint **fp**. Lastly,
+ if an "ipv6=__address__:__orport__" flag is present, then the directory
+ authority is listening for IPv6 connections on the indicated IPv6 address
+ and OR Port. +
+
If no **DirAuthority** line is given, Tor will use the default directory
authorities. NOTE: this option is intended for setting up a private Tor