aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-11-25 15:33:07 -0500
committerNick Mathewson <nickm@torproject.org>2012-12-17 14:51:31 -0500
commitc1226cf4f90b6b4a0b13b3eaf1c62ca98874ccf7 (patch)
tree48b0e27a873ded8c8ba433dd71e0292a1414d0fe
parent4ded40b0cadda803c2f1dc17f90f83f64d479392 (diff)
downloadtor-c1226cf4f90b6b4a0b13b3eaf1c62ca98874ccf7.tar.gz
tor-c1226cf4f90b6b4a0b13b3eaf1c62ca98874ccf7.zip
Document PreferIPv6Automap in the manpage
-rw-r--r--doc/tor.1.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index ec350ba617..85b7f4c35a 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -955,6 +955,11 @@ The following options are useful only for clients (that is, if
**UseDNSCache**;;
Tells the client to use any cached DNS answers we have when making
requests via this connection.
+ **PreferIPv6Automap**;;
+ When serving a hostname lookup request on this port that
+ should get automapped (according to AutomapHostsOnResove),
+ if we could return either an IPv4 or an IPv6 answer, prefer
+ an IPv6 answer. (On by default.)
**SOCKSListenAddress** __IP__[:__PORT__]::
Bind to this address to listen for connections from Socks-speaking