[minion-cvs] Backport bugfixes to maintenance branch

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
      Tag: mixminion-v0-0-6-patches
	README 
Log Message:
Backport bugfixes to maintenance branch

Index: README
===================================================================
RCS file: /home/minion/cvsroot/src/minion/README,v
retrieving revision 1.70
retrieving revision 1.70.2.1
diff -u -d -r1.70 -r1.70.2.1
--- README	15 Dec 2003 04:41:53 -0000	1.70
+++ README	18 Dec 2003 23:13:55 -0000	1.70.2.1
@@ -408,15 +408,6 @@
       this:
              -P 'Foo,~3,Bar'      [Foo, about three random servers, then Bar.]
 
-      If you have specified a path length (explicitly or in ~/.mixminionrc)
-      you can use a '*' to indicate as many random servers as are needed to
-      make your path long enough:
-
-             -P 'Foo,*'           [Path that starts with Foo]
-             -P '*,Foo'           [Path that ends with Foo]
-             -P 'Foo,Bar,*,Quux'  [Path that starts with Foo and Bar,
-                                   and ends with Quux]
-
       {ADVANCED} By default, the swap point will be halfway through
       the path (rounding up). To specify a swap point explicitly, use
       a colon in your path, as in:
@@ -434,7 +425,7 @@
 To send a dummy message, specify "drop" instead of an email address, as in:
 
       mixminion send -t drop
-      mixminion send -t drop -P '*,Foo'
+      mixminion send -t drop -P '*4,Foo'
       mixminion send -t drop -H 8
 
 To queue a message for later transmission, run "mixminion queue" instead of
@@ -495,9 +486,9 @@
       Also, you can control path selection in the same way as with
       sending messages:
 
-      mixminion generate-surb -H 3        (a 3-hop path)
-      mixminion generate-surb -P '*,Foo'  (end with server foo)
-      mixminion generate-surb -P 'Bar,*'  (start with server bar)
+      mixminion generate-surb -H 3         (a 3-hop path)
+      mixminion generate-surb -P '*3,Foo'  (a 4-hop path ending with foo)
+      mixminion generate-surb -P 'Bar,*3'  (a 4-hop path starting with bar)
 
       You can use the '-n' option to generate many reply blocks at once:
 
@@ -528,11 +519,11 @@
 
       The other options to 'send' and 'pool' still apply; the reply block
       takes the place of the destination address:
-         mixminion send -R <reply-block>          (Read from stdin)
-         mixminion send -R <reply-block> -D yes   (Reload directory)
-         mixminion send -R <reply-block> -H 4     (Use 4 hops before reply.)
-         mixminion send -R <reply-block> -P 'Z,*' (Start with server "Z".)
-         mixminion pool -R <reply-block>          (Pool the message.)
+         mixminion send -R <reply-block>           (Read from stdin)
+         mixminion send -R <reply-block> -D yes    (Reload directory)
+         mixminion send -R <reply-block> -H 4      (Use 4 hops before reply.)
+         mixminion send -R <reply-block> -P 'Z,*3' (Start with server "Z".)
+         mixminion pool -R <reply-block>           (Pool the message.)
 
       IMPORTANT: Mixminion reply blocks can only be used once!  (Thus,
       SURB="Single Use Reply Block".)  The program will remember which