[tor-commits] [tor/master] Document PreferIPv6Automap in the manpage

[nickm at torproject.org]

commit c1226cf4f90b6b4a0b13b3eaf1c62ca98874ccf7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Nov 25 15:33:07 2012 -0500

    Document PreferIPv6Automap in the manpage
---
 doc/tor.1.txt |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index ec350ba..85b7f4c 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