cleanups, bump to 0.1.2.4-alpha

svn:r9015

10 files changed, 42 insertions, 34 deletions

diff --git a/ChangeLog b/ChangeLog
index 7a1e920ba0..c712086225 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,28 +1,31 @@
-Changes in version 0.1.2.4-alpha - 2006-11-??
-  o Major features
-    - Add support for using natd; this allows FreeBSDs earlier than 5.1.2 to
-      have ipfw send connections through Tor without using SOCKS. (Patch from
-      Zajcev Evgeny with tweaks from tup.)
-
-  o Minor features
-    - Add breakdown of public key operations to dumped statistics.
-    - Make cross.sh cross-compilation script work even when autogen.sh hasn't
-      been run. (Patch from Michael Mohr.)
-
-  o Minor features, controller
-    - Make all connections to addresses of the form .noconnect immediately
-      get closed.  This is more useful than you'd think, since it lets
-      application/controller combos successfully tell when they're talking to
-      the same Tor by watching for STREAM events.
-
-  o Major bugfixes
+Changes in version 0.1.2.4-alpha - 2006-12-02
+  o Major features:
+    - Add support for using natd; this allows FreeBSDs earlier than
+      5.1.2 to have ipfw send connections through Tor without using
+      SOCKS. (Patch from Zajcev Evgeny with tweaks from tup.)
+
+  o Minor features:
+    - Make all connections to addresses of the form ".noconnect"
+      immediately get closed. This lets application/controller combos
+      successfully test whether they're talking to the same Tor by
+      watching for STREAM events.
+    - Make cross.sh cross-compilation script work even when autogen.sh
+      hasn't been run. (Patch from Michael Mohr.)
+    - Statistics dumped by -USR2 now include a breakdown of public key
+      operations, for profiling.
+
+  o Major bugfixes:
+    - Fix a major leak when directory authorities parse their
+      approved-routers list, a minor memory leak when we fail to pick
+      an exit node, and a few rare leaks on errors.
     - Handle TransPort connections even when the server sends data before
-      the client sends data.  Previously, the connection would just hang
+      the client sends data. Previously, the connection would just hang
       until the client sent data. (Patch from tup based on patch from
       Zajcev Evgeny.)
-    - Fix a memory leak when we fail to pick an exit node.
+    - Avoid assert failure when our cached-routers file is empty on
+      startup.
 
-  o Minor bugfixes
+  o Minor bugfixes:
     - Don't log spurious warnings when we see a circuit close reason we
       don't recognize; it's probably just from a newer version of Tor.
     - Have directory authorities allow larger amounts of drift in uptime
@@ -31,10 +34,12 @@ Changes in version 0.1.2.4-alpha - 2006-11-??
       per day.
     - Start linking to the Tor specification and Tor reference manual
       correctly in the Windows installer.
-    - Avoid assert failure when our cached-routers file is empty on
-      startup.
-    - Don't corrupt last_guesssed_ip in router_new_address_suggestion() when
-      we're running as a client.
+    - Add Vidalia to the OS X uninstaller script, so when we uninstall
+      Tor/Privoxy we also uninstall Vidalia.
+    - Resume building on Irix64, and fix a lot of warnings from its
+      MIPSpro C compiler.
+    - Don't corrupt last_guessed_ip in router_new_address_suggestion()
+      when we're running as a client.
 
 
 Changes in version 0.1.2.3-alpha - 2006-10-29
diff --git a/configure.in b/configure.in
index 157f5e4184..b9267b8b63 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
 dnl See LICENSE for licensing information
 
 AC_INIT
-AM_INIT_AUTOMAKE(tor, 0.1.2.3-alpha-dev)
+AM_INIT_AUTOMAKE(tor, 0.1.2.4-alpha)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index cd89e79300..1506a10423 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -5,7 +5,7 @@
 ;
 !include "MUI.nsh"
 
-!define VERSION "0.1.2.3-alpha-dev"
+!define VERSION "0.1.2.4-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "http://tor.eff.org/"
 
diff --git a/doc/control-spec.txt b/doc/control-spec.txt
index a69664b509..0f964ae97c 100644
--- a/doc/control-spec.txt
+++ b/doc/control-spec.txt
@@ -460,6 +460,9 @@ $Id$
       A space-separated list of all the events supported by this version of
       Tor's USEFEATURE.
 
+    "next-circuit/IP:port"
+      XXX todo.
+
     "dir/status/authority"
     "dir/status/fp/<F>"
     "dir/status/fp/<F1>+<F2>+<F3>"
diff --git a/src/common/compat.c b/src/common/compat.c
index ba0acec094..3156adea87 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 428d71608f..582e6e1d68 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 ada9a4a400..94b52444c1 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 ff0e686f69..fa97e41226 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 26247b6872..0745bc5a28 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 5697ac7b89..cd56c9fbb9 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"