sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some cleanups to bug2279 messages/docs from rransom

This commit is contained in:
Nick Mathewson 2011-02-07 12:40:43 -05:00
parent 30111a3a01
commit e854e01d57
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/tor.1.txt
View File

@ -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

2
src/or/connection_edge.c
View File

@ -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,