aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-08-27 16:16:27 -0400
committerNick Mathewson <nickm@torproject.org>2012-08-27 16:16:27 -0400
commit0c5a44ed0a790951bdfd319eec734c04eb972a08 (patch)
tree89f4945bd65bc06450b95131cfcf04b6da54fd5d /doc
parente232938ec82c8c35b99331995d1aeaca67ba9ec1 (diff)
parentbffe0d3ccc6b49975eae9173b0c1c465d40d2dbf (diff)
downloadtor-0c5a44ed0a790951bdfd319eec734c04eb972a08.tar
tor-0c5a44ed0a790951bdfd319eec734c04eb972a08.tar.gz
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index d55baa05c..9b2ae82c8 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1472,6 +1472,11 @@ is non-zero):
its extra-info documents that it uploads to the directory authorities.
(Default: 1)
+**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)
+
DIRECTORY SERVER OPTIONS
------------------------
@@ -1811,6 +1816,7 @@ The following options are used for running a testing Tor network.
ClientRejectInternalAddresses 0
CountPrivateBandwidth 1
ExitPolicyRejectPrivate 0
+ ExtendAllowPrivateAddresses 1
V3AuthVotingInterval 5 minutes
V3AuthVoteDelay 20 seconds
V3AuthDistDelay 20 seconds