From c5b90daf868963ce7a46b117338fbaaeba30895e Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Sat, 2 Dec 2006 22:47:46 +0000 Subject: cleanups, bump to 0.1.2.4-alpha svn:r9015 --- src/or/connection.c | 2 +- src/or/connection_edge.c | 2 +- src/or/main.c | 2 +- src/or/routerlist.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/or') diff --git a/src/or/connection.c b/src/or/connection.c index 428d71608..582e6e1d6 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1166,7 +1166,7 @@ connection_read_bucket_decrement(connection_t *conn, int num_read) } } -/** If we have exhaused our global read bucket, or the read bucket for conn, +/** If we have exhausted our global read bucket, or the read bucket for conn, * stop reading. */ static void connection_consider_empty_buckets(connection_t *conn) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index ada9a4a40..94b52444c 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1396,7 +1396,7 @@ connection_ap_get_original_destination(edge_connection_t *conn, * If the handshake is complete, send it to * connection_ap_handshake_rewrite_and_attach(). * - * Return -1 if an unexpected error with conn ocurrs (and mark it for close), + * Return -1 if an unexpected error with conn occurs (and mark it for close), * else return 0. */ static int diff --git a/src/or/main.c b/src/or/main.c index ff0e686f6..fa97e4122 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -319,7 +319,7 @@ connection_stop_reading(connection_t *conn) tor_assert(conn); tor_assert(conn->read_event); - log_debug(LD_NET,"connection_stop_reading() called."); + log_debug(LD_NET,"entering."); if (event_del(conn->read_event)) log_warn(LD_NET, "Error from libevent setting read event state for %d " "to unwatched: %s", diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 26247b687..0745bc5a2 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4108,7 +4108,7 @@ router_differences_are_cosmetic(routerinfo_t *r1, routerinfo_t *r2) return 0; /* Did uptime fail to increase by approximately the amount we would think, - * give or take 4 hours? */ + * give or take some slop? */ r1pub = r1->cache_info.published_on; r2pub = r2->cache_info.published_on; time_difference = abs(r2->uptime - (r1->uptime + (r2pub - r1pub))); -- cgit v1.2.3