Commit 9c8a54a3 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

more cleanups and bugfix


svn:r790
parent d0acbe86
...@@ -537,8 +537,7 @@ void circuit_about_to_close_connection(connection_t *conn) { ...@@ -537,8 +537,7 @@ void circuit_about_to_close_connection(connection_t *conn) {
if(!conn->has_sent_end) { if(!conn->has_sent_end) {
log_fn(LOG_INFO,"Edge connection hasn't sent end yet? Bug."); log_fn(LOG_INFO,"Edge connection hasn't sent end yet? Bug.");
connection_edge_send_command(conn, circ, RELAY_COMMAND_END, connection_edge_end(conn, END_STREAM_REASON_MISC, conn->cpath_layer);
NULL, 0, conn->cpath_layer);
} }
if(conn == circ->p_streams) { if(conn == circ->p_streams) {
......
...@@ -123,8 +123,7 @@ int connection_dir_process_inbuf(connection_t *conn) { ...@@ -123,8 +123,7 @@ int connection_dir_process_inbuf(connection_t *conn) {
if(router_get_dir_from_string(the_directory, conn->identity_pkey) < 0){ if(router_get_dir_from_string(the_directory, conn->identity_pkey) < 0){
log_fn(LOG_INFO,"...but parsing failed. Ignoring."); log_fn(LOG_INFO,"...but parsing failed. Ignoring.");
} else { } else {
log_fn(LOG_INFO,"and got an %s directory; updated routers.", log_fn(LOG_INFO,"updated routers.");
conn->identity_pkey ? "authenticated" : "unauthenticated");
} }
if(options.OnionRouter) { /* connect to them all */ if(options.OnionRouter) { /* connect to them all */
router_retry_connections(); router_retry_connections();
......
...@@ -545,7 +545,7 @@ int router_get_dir_from_string(char *s, crypto_pk_env_t *pkey) ...@@ -545,7 +545,7 @@ int router_get_dir_from_string(char *s, crypto_pk_env_t *pkey)
return -1; return -1;
} }
if (compare_recommended_versions(VERSION, directory->software_versions) < 0) { 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) { if(options.IgnoreVersion) {
log(LOG_WARN, "IgnoreVersion is set. If it breaks, we told you so."); log(LOG_WARN, "IgnoreVersion is set. If it breaks, we told you so.");
} else { } else {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment