go back to a single exitpolicy parameter

if your exitpolicy includes " *:*" then it is final,
else we append the default exit policy.
(thanks weasel)


svn:r1105

1 files changed, 5 insertions, 8 deletions

diff --git a/src/config/torrc.in b/src/config/torrc.in
index 183b091b80..b2480b5307 100644
--- a/src/config/torrc.in
+++ b/src/config/torrc.in
@@ -19,13 +19,10 @@ SocksBindAddress 127.0.0.1 # accept connections only from localhost
 #ORPort 9001 # where to listen for cell-speaking connections
 #ORBindAddress 0.0.0.0 # accept connections from anywhere
 
-## A comma-separated list of exit policies. Define this if you
-## want to *augment* the default exit policy.
-## These entries are considered before the default exit policy.
-#ExitPolicyPrepend accept 18.244.0.188:25
-
-## A comma-separated list of exit policies. Define this if you
-## want to *replace* the default exit policy.
-## They're considered in order, first match wins.
+## A comma-separated list of exit policies. If you want to *replace*
+## the default exit policy, end this with either a reject *:* or an
+## accept *:*. Otherwise, you're *augmenting* (prepending to) the
+## default exit policy.
+#ExitPolicy accept 18.244.0.188:25,accept 18.244.0.114:25
 #ExitPolicy reject *:*