summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-02-07 12:40:43 -0500
committerNick Mathewson <nickm@torproject.org>2011-02-07 12:40:43 -0500
commite854e01d5713108cf28e99ef9bc15ea27cb30759 (patch)
treebe8a6c6f129f63d4601c1ca4b857fedda7a717de /doc
parent30111a3a01993c7591eee1720b8434cb1b25c5b1 (diff)
downloadtor-e854e01d5713108cf28e99ef9bc15ea27cb30759.tar.gz
tor-e854e01d5713108cf28e99ef9bc15ea27cb30759.zip
Some cleanups to bug2279 messages/docs from rransom
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 685e788d5e..8909d8280a 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -654,8 +654,9 @@ The following options are useful only for clients (that is, if
can leak your location to attackers. (Default: 1)
**VirtualAddrNetwork** __Address__/__bits__::
- When a controller asks for a virtual (unused) address with the MAPADDRESS
- command, Tor picks an unassigned address from this range. (Default:
+ When Tor needs to assign a virtual (unused) address because of a MAPADDRESS
+ command from the controller or the AutpmapHostsOnResolve feature, Tor
+ picks an unassigned address from this range. (Default:
127.192.0.0/10) +
+
When providing proxy server service to a network of computers using a tool
@@ -732,10 +733,10 @@ The following options are useful only for clients (that is, if
turn it off unless you know what you're doing. (Default: 1).
**ClientRejectInternalAddresses** **0**|**1**::
- If true, Tor does not try to fulfil requests to connect to an internal
+ If true, Tor does not try to fulfill requests to connect to an internal
address (like 127.0.0.1 or 192.168.0.1) __unless a exit node is
- specifically requested__ (for example, via a .exit hostname, a controller
- request). (Default: 1).
+ specifically requested__ (for example, via a .exit hostname, or a
+ controller request). (Default: 1).
**DownloadExtraInfo** **0**|**1**::
If true, Tor downloads and caches "extra-info" documents. These documents