diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-07 12:40:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-07 12:40:43 -0500 |
| commit | e854e01d5713108cf28e99ef9bc15ea27cb30759 (patch) | |
| tree | be8a6c6f129f63d4601c1ca4b857fedda7a717de | |
| parent | 30111a3a01993c7591eee1720b8434cb1b25c5b1 (diff) | |
| download | tor-e854e01d5713108cf28e99ef9bc15ea27cb30759.tar.gz tor-e854e01d5713108cf28e99ef9bc15ea27cb30759.zip | |
Some cleanups to bug2279 messages/docs from rransom
| -rw-r--r-- | doc/tor.1.txt | 11 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 2 |
2 files changed, 7 insertions, 6 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 diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 47e9035e90..f02479fd59 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1670,7 +1670,7 @@ connection_ap_handshake_rewrite_and_attach(edge_connection_t *conn, if (conn->is_transparent_ap) { log_warn(LD_NET, "Rejecting request for anonymous connection to private " - "address %s on a TransPort or NatdPort. Possible loop " + "address %s on a TransPort or NATDPort. Possible loop " "in your NAT rules?", safe_str_client(socks->address)); } else { log_warn(LD_NET, |