summaryrefslogtreecommitdiff
path: root/src/config
diff options
context:
space:
mode:
authorteor (Tim Wilson-Brown) <teor2345@gmail.com>2015-09-22 11:50:04 +1000
committerteor (Tim Wilson-Brown) <teor2345@gmail.com>2015-09-22 12:14:27 +1000
commitb584152874b57e36533ec35bc7c2d38cabf832bf (patch)
treed46158cc9e510b0c54264bea13568f6ad7506814 /src/config
parent726852514211cf707e7b811a5393e3bfbb4dba11 (diff)
downloadtor-b584152874b57e36533ec35bc7c2d38cabf832bf.tar.gz
tor-b584152874b57e36533ec35bc7c2d38cabf832bf.zip
Update private ExitPolicy in man page and torrcs for 10727, formatting
Update the definition of the private exit policy in the man page and torrcs. It didn't get merged correctly into the man page, and it was incomplete in the torrcs. (Unfortunately, we only reject the primary configured IPv4 and IPv6 addresses, not all configured IPv4 and IPv6 addresses.) Also fixup msn page formatting errors from changes in tickets 16069 and 17027, mainly unescaped *s.
Diffstat (limited to 'src/config')
-rw-r--r--src/config/torrc.minimal.in-staging2
-rw-r--r--src/config/torrc.sample.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging
index e3b528fcd0..ff324a96da 100644
--- a/src/config/torrc.minimal.in-staging
+++ b/src/config/torrc.minimal.in-staging
@@ -178,7 +178,7 @@
## users will be told that those destinations are down.
##
## For security, by default Tor rejects connections to private (local)
-## networks, including to the configured public IPv4 and IPv6 addresses,
+## networks, including to the configured primary public IPv4 and IPv6 addresses,
## and any public IPv4 and IPv6 addresses on any interface on the relay.
## See the man page entry for ExitPolicyRejectPrivate if you want to allow
## "exit enclaving".
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index e3b528fcd0..ff324a96da 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -178,7 +178,7 @@
## users will be told that those destinations are down.
##
## For security, by default Tor rejects connections to private (local)
-## networks, including to the configured public IPv4 and IPv6 addresses,
+## networks, including to the configured primary public IPv4 and IPv6 addresses,
## and any public IPv4 and IPv6 addresses on any interface on the relay.
## See the man page entry for ExitPolicyRejectPrivate if you want to allow
## "exit enclaving".