[minion-cvs] Tweak some defaults to match documentation

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria.mit.edu:/tmp/cvs-serv15283/lib/mixminion

Modified Files:
	ClientMain.py Config.py 
Log Message:
Tweak some defaults to match documentation

Index: ClientMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientMain.py,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- ClientMain.py	7 Mar 2004 06:31:46 -0000	1.165
+++ ClientMain.py	18 Mar 2004 04:48:22 -0000	1.166
@@ -1042,7 +1042,7 @@
         else:
             p = 'ForwardPath'
         if self.path is None:
-            self.path = self.config['Security'].get(p, "*5")
+            self.path = self.config['Security'].get(p, "~5")
 
         if isSURB:
             if self.lifetime is not None:

Index: Config.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Config.py,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- Config.py	7 Mar 2004 06:31:46 -0000	1.80
+++ Config.py	18 Mar 2004 04:48:22 -0000	1.81
@@ -974,16 +974,16 @@
                    'FileParanoia': ('ALLOW', "boolean", "yes"),
                    },
         'DirectoryServers' :
-                   { '__SECTION__' : ('REQUIRE', None, None),
+                   { '__SECTION__' : ('ALLOW', None, None),
                      'ServerURL' : ('ALLOW*', None, None),
                      'MaxSkew' : ('ALLOW', "interval", "10 minutes"),
                      'DirectoryTimeout' : ('ALLOW', "interval", "1 minute") },
         'User' : { 'UserDir' : ('ALLOW', "filename", DEFAULT_USER_DIR) },
         'Security' : { 'SURBAddress' : ('ALLOW', None, None),
                        'SURBLifetime' : ('ALLOW', "interval", "7 days"),
-                       'ForwardPath' : ('ALLOW', None, "*6"),
-                       'ReplyPath' : ('ALLOW', None, "*4"),
-                       'SURBPath' : ('ALLOW', None, "*4"),
+                       'ForwardPath' : ('ALLOW', None, "~5"),
+                       'ReplyPath' : ('ALLOW', None, "~5"),
+                       'SURBPath' : ('ALLOW', None, "~5"),
                        'BlockServers' : ('ALLOW*', 'list', ""),
                        'BlockEntries' : ('ALLOW*', 'list', ""),
                        'BlockExits' : ('ALLOW*', 'list', ""),