[or-cvs] more cleanups and bugfix

[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 directory.c routers.c 
Log Message:
more cleanups and bugfix


Index: circuit.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuit.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- circuit.c	11 Nov 2003 03:01:48 -0000	1.83
+++ circuit.c	11 Nov 2003 17:21:35 -0000	1.84
@@ -537,8 +537,7 @@
 
       if(!conn->has_sent_end) {
         log_fn(LOG_INFO,"Edge connection hasn't sent end yet? Bug.");
-        connection_edge_send_command(conn, circ, RELAY_COMMAND_END,
-                                     NULL, 0, conn->cpath_layer);
+        connection_edge_end(conn, END_STREAM_REASON_MISC, conn->cpath_layer);
       }
 
       if(conn == circ->p_streams) {

Index: directory.c
===================================================================
RCS file: /home/or/cvsroot/src/or/directory.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- directory.c	10 Nov 2003 08:06:53 -0000	1.47
+++ directory.c	11 Nov 2003 17:21:35 -0000	1.48
@@ -123,8 +123,7 @@
         if(router_get_dir_from_string(the_directory, conn->identity_pkey) < 0){
           log_fn(LOG_INFO,"...but parsing failed. Ignoring.");
         } else {
-          log_fn(LOG_INFO,"and got an %s directory; updated routers.", 
-              conn->identity_pkey ? "authenticated" : "unauthenticated");
+          log_fn(LOG_INFO,"updated routers.");
         }
         if(options.OnionRouter) { /* connect to them all */
           router_retry_connections();

Index: routers.c
===================================================================
RCS file: /home/or/cvsroot/src/or/routers.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- routers.c	10 Nov 2003 08:06:54 -0000	1.86
+++ routers.c	11 Nov 2003 17:21:35 -0000	1.87
@@ -545,7 +545,7 @@
     return -1;
   }
   if (compare_recommended_versions(VERSION, directory->software_versions) < 0) {
-    log(LOG_WARN, "You are running tor version %s, which is no longer supported.\nPlease upgrade to one of %s.", VERSION, directory->software_versions);
+    log(LOG_WARN, "You are running tor version %s, which is not recommended.\nPlease upgrade to one of %s.", VERSION, directory->software_versions);
     if(options.IgnoreVersion) {
       log(LOG_WARN, "IgnoreVersion is set. If it breaks, we told you so.");
     } else {