[or-cvs] go back to a single exitpolicy parameter

[Roger Dingledine]

Update of /home/or/cvsroot/src/config
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/config

Modified Files:
	torrc.in 
Log Message:
go back to a single exitpolicy parameter
if your exitpolicy includes " *:*" then it is final,
else we append the default exit policy.
(thanks weasel)


Index: torrc.in
===================================================================
RCS file: /home/or/cvsroot/src/config/torrc.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- torrc.in	18 Feb 2004 03:56:12 -0000	1.7
+++ torrc.in	18 Feb 2004 07:23:38 -0000	1.8
@@ -19,13 +19,10 @@
 #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 *:*