diff options
| author | Roger Dingledine <arma@torproject.org> | 2003-11-11 17:21:35 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2003-11-11 17:21:35 +0000 |
| commit | 9c8a54a39f05669c095444fb6f484b5e8b0fba58 (patch) | |
| tree | 2e46bcb17c31728f61794dfe76fa439d8a41fb23 /src | |
| parent | d0acbe86d1e4ee8abd1cba983d932a70ab6c7693 (diff) | |
| download | tor-9c8a54a39f05669c095444fb6f484b5e8b0fba58.tar tor-9c8a54a39f05669c095444fb6f484b5e8b0fba58.tar.gz | |
more cleanups and bugfix
svn:r790
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/circuit.c | 3 | ||||
| -rw-r--r-- | src/or/directory.c | 3 | ||||
| -rw-r--r-- | src/or/routers.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/or/circuit.c b/src/or/circuit.c index 60d6aadf4..8b7ffe523 100644 --- 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 204909ee8..258b0b548 100644 --- 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 c0e93017f..7c9c787fe 100644 --- 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 { |