more cleanups and bugfix

svn:r790

diff --git a/src/or/circuit.c b/src/or/circuit.c
index 60d6aadf4ef990bfc9e3ee967bec0e806c4951e7..8b7ffe523ace3181aa5c55274c2d14ee3851981b 100644 (file)
--- a/src/or/circuit.c
+++ b/src/or/circuit.c
@@ -537,8 +537,7 @@ void circuit_about_to_close_connection(connection_t *conn) {
 
       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) {

diff --git a/src/or/directory.c b/src/or/directory.c
index 204909ee8583f943571ae94bff3d485bbfc55b97..258b0b548eddad4eb9adcc1da9658cdf11732239 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -123,8 +123,7 @@ int connection_dir_process_inbuf(connection_t *conn) {
         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();

diff --git a/src/or/routers.c b/src/or/routers.c
index c0e93017f5684dd00cb9d4d8390f17832711219b..7c9c787fe6f3cb5a24a7a4750f76ef036d6058fd 100644 (file)
--- a/src/or/routers.c
+++ b/src/or/routers.c
@@ -545,7 +545,7 @@ int router_get_dir_from_string(char *s, crypto_pk_env_t *pkey)
     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 {