[or-cvs] trivial bugfixes

[arma@seul.org (Roger Dingledine)]

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

Modified Files:
	circuit.c 
Log Message:
trivial bugfixes


Index: circuit.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuit.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- circuit.c	17 Nov 2003 00:57:56 -0000	1.96
+++ circuit.c	17 Nov 2003 01:23:15 -0000	1.97
@@ -17,10 +17,10 @@
 static circuit_t *global_circuitlist=NULL;
 
 char *circuit_state_to_string[] = {
-  "receiving the onion",    /* 0 */
-  "waiting to process create", /* 1 */
-  "connecting to firsthop", /* 2 */
-  "open"                    /* 3 */
+  "doing handshakes",        /* 0 */
+  "processing the onion",    /* 1 */
+  "connecting to firsthop",  /* 2 */
+  "open"                     /* 3 */
 };
 
 /********* END VARIABLES ************/
@@ -297,7 +297,6 @@
     return 0;
   }
 
-  ++stats_n_relay_cells_relayed;
   /* not recognized. pass it on. */
   if(cell_direction == CELL_DIRECTION_OUT)
     conn = circ->n_conn;
@@ -311,6 +310,7 @@
   }
 
   log_fn(LOG_DEBUG,"Passing on unrecognized cell.");
+  ++stats_n_relay_cells_relayed;
   connection_or_write_cell_to_buf(cell, conn);
   return 0;
 }