diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-07 12:47:04 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-07 12:47:04 -0500 |
| commit | ff5810aea91fed15a6401f0f825bb9fbe16ca200 (patch) | |
| tree | 9cdeac8199fca63c791769e5d264df0c62fde4a8 /doc | |
| parent | c2c1f5b2a12e3c2141087ac9d787e07e531b0008 (diff) | |
| parent | 98cef0ac1e94fbcf7d1f9f70e077f22624033ecc (diff) | |
| download | tor-ff5810aea91fed15a6401f0f825bb9fbe16ca200.tar.gz tor-ff5810aea91fed15a6401f0f825bb9fbe16ca200.zip | |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/spec/control-spec.txt | 6 | ||||
| -rw-r--r-- | doc/tor.1.txt | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt index bd327dba7f..f86f94ba6f 100644 --- a/doc/spec/control-spec.txt +++ b/doc/spec/control-spec.txt @@ -1083,7 +1083,8 @@ Reason = "MISC" / "RESOLVEFAILED" / "CONNECTREFUSED" / "EXITPOLICY" / "DESTROY" / "DONE" / "TIMEOUT" / "NOROUTE" / "HIBERNATING" / "INTERNAL"/ "RESOURCELIMIT" / - "CONNRESET" / "TORPROTOCOL" / "NOTDIRECTORY" / "END" + "CONNRESET" / "TORPROTOCOL" / "NOTDIRECTORY" / "END" / + "PRIVATE_ADDR" The "REASON" field is provided only for FAILED, CLOSED, and DETACHED events, and only if extended events are enabled (see 3.19). Clients MUST @@ -1092,7 +1093,10 @@ END (We received a RELAY_END cell from the other side of this stream.) + PRIVATE_ADDR (The client tried to connect to a private address like + 127.0.0.1 or 10.0.0.1 over Tor.) [XXXX document more. -NM] + The "REMOTE_REASON" field is provided only when we receive a RELAY_END cell, and only if extended events are enabled. It contains the actual diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 65dc76956c..98415e8b63 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -667,8 +667,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 @@ -744,6 +745,12 @@ The following options are useful only for clients (that is, if 192.168.0.1). This option prevents certain browser-based attacks; don't turn it off unless you know what you're doing. (Default: 1). +**ClientRejectInternalAddresses** **0**|**1**:: + 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, or a + controller request). (Default: 1). + **DownloadExtraInfo** **0**|**1**:: If true, Tor downloads and caches "extra-info" documents. These documents contain information about servers other than the information in their @@ -1300,6 +1307,7 @@ The following options are used for running a testing Tor network. AuthDirMaxServersPerAddr 0 AuthDirMaxServersPerAuthAddr 0 ClientDNSRejectInternalAddresses 0 + ClientRejectInternalAddresses 0 ExitPolicyRejectPrivate 0 V3AuthVotingInterval 5 minutes V3AuthVoteDelay 20 seconds |