cleanups, bump to 0.1.2.4-alpha

svn:r9015

6 files changed, 7 insertions, 7 deletions

diff --git a/src/common/compat.c b/src/common/compat.c
index ba0acec09..3156adea8 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -142,8 +142,8 @@ tor_mmap_file(const char *filename)
   size += (size%page_size) ? page_size-(size%page_size) : 0;
 
   if (!size) {
-    /* zero-length file. if we call mmap on it, we'll end up setting
-     * data to NULL below, and bad things will happen. So just fail. */
+    /* Zero-length file. If we call mmap on it, it will succeed but
+     * return NULL, and bad things will happen. So just fail. */
     log_notice(LD_FS,"File \"%s\" is empty. Ignoring.",filename);
     return NULL;
   }
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)));
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5697ac7b8..cd56c9fbb 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -227,5 +227,5 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.1.2.3-alpha-dev"
+#define VERSION "0.1.2.4-alpha"