diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-12-09 10:47:59 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-12-09 10:47:59 -0500 |
| commit | caff66530924f45ce8aacdef0f00002a0b001ccd (patch) | |
| tree | 996bb3f78f83c969b8f7ef1d301a8afe41895685 /doc | |
| parent | d6a3b1f0199db5b6d792f84b5073e532e4c6d10b (diff) | |
| parent | 45f2e7ec040c20d2640de2df1ce5da94d338f76f (diff) | |
| download | tor-caff66530924f45ce8aacdef0f00002a0b001ccd.tar.gz tor-caff66530924f45ce8aacdef0f00002a0b001ccd.zip | |
Merge remote-tracking branch 'teor/first-hop-no-private'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 56b709f421..c5ef054f61 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1898,9 +1898,11 @@ is non-zero): (Default: 1) [[ExtendAllowPrivateAddresses]] **ExtendAllowPrivateAddresses** **0**|**1**:: - When this option is enabled, Tor routers allow EXTEND request to - localhost, RFC1918 addresses, and so on. This can create security issues; - you should probably leave it off. (Default: 0) + When this option is enabled, Tor will connect to localhost, RFC1918 + addresses, and so on. In particular, Tor will make direct connections, and + Tor routers allow EXTEND requests, to these private addresses. This can + create security issues; you should probably leave it off. + (Default: 0) [[MaxMemInQueues]] **MaxMemInQueues** __N__ **bytes**|**KB**|**MB**|**GB**:: This option configures a threshold above which Tor will assume that it |