[or-cvs] redo the state descriptors now that we have a controller-wa...

[arma@xxxxxxxx (Roger Dingledine)]

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

Modified Files:
	connection.c 
Log Message:
redo the state descriptors now that we have a controller-wait state


Index: connection.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/connection.c,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -d -r1.349 -r1.350
--- connection.c	27 Mar 2005 04:55:12 -0000	1.349
+++ connection.c	31 Mar 2005 17:36:24 -0000	1.350
@@ -56,10 +56,11 @@
     "", /* 4 */
     "awaiting dest info",         /* app, 5 */
     "waiting for rendezvous desc",     /* 6 */
-    "waiting for safe circuit",        /* 7 */
-    "waiting for connected",           /* 8 */
-    "waiting for resolve",             /* 9 */
-    "open" },                          /* 10 */
+    "waiting for controller",          /* 7 */
+    "waiting for safe circuit",        /* 8 */
+    "waiting for connected",           /* 9 */
+    "waiting for resolve",             /* 10 */
+    "open" },                          /* 11 */
   { "ready" }, /* dir listener, 0 */
   { "",                           /* dir, 0 */
     "connecting",                      /* 1 */