Merge branch 'tor-github/pr/1675'

doc/tor.1.txt

@@ -1703,7 +1703,9 @@ The following options are useful only for clients (that is, if
     connections via SOCKS. Set it to "auto" to have Tor pick a port for
     you. This directive can be specified multiple times to bind
     to multiple addresses/ports. If a unix domain socket is used, you may
-    quote the path using standard C escape sequences.
+    quote the path using standard C escape sequences. Most flags are off by
+    default, except where specified. Flags that are on by default can be
+    disabled by putting "No" before the flag name.
     (Default: 9050) +
      +
         NOTE: Although this option allows you to specify an IP address
@@ -1757,14 +1759,16 @@ The following options are useful only for clients (that is, if
     Other recognized __flags__ for a SocksPort are:
     **NoIPv4Traffic**;;
         Tell exits to not connect to IPv4 addresses in response to SOCKS
-        requests on this connection.
-    **IPv6Traffic**;;
-        Tell exits to allow IPv6 addresses in response to SOCKS requests on
-        this connection, so long as SOCKS5 is in use.  (SOCKS4 can't handle
-        IPv6.)
-    **PreferIPv6**;;
+        requests on this connection. (Allowing IPv4 is the default.)
+    **NoIPv6Traffic**;;
+        Tell exits to not connect to IPv6 addresses in response to SOCKS
+        requests on this connection. This option is only relevant when SOCKS5
+        is in use, because SOCKS4 can't handle IPv6.  (Allowing IPv6 is the
+        default.)
+    **NoPreferIPv6**;;
         Tells exits that, if a host has both an IPv4 and an IPv6 address,
-        we would prefer to connect to it via IPv6. (IPv4 is the default.)
+        we would prefer to connect to it via IPv4. (IPv6 is the default in
+        recent versions of Tor.)
     **NoDNSRequest**;;
         Do not ask exits to resolve DNS addresses in SOCKS5 requests. Tor will
         connect to IPv4 addresses, IPv6 addresses (if IPv6Traffic is set) and
@@ -1802,11 +1806,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**;;
+    **NoPreferIPv6Automap**;;
         When serving a hostname lookup request on this port that
         should get automapped (according to AutomapHostsOnResolve),
         if we could return either an IPv4 or an IPv6 answer, prefer
-        an IPv6 answer. (On by default.)
+        an IPv4 answer. (Tor prefers IPv6 by default.)
     **PreferSOCKSNoAuth**;;
         Ordinarily, when an application offers both "username/password
         authentication" and "no authentication" to Tor via SOCKS5, Tor