0.2.0.31 is ready to go

svn:r16733

4 files changed, 27 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index ed84b38d3c..11872876a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
 Changes in version 0.2.0.31 - 2008-09-??
- o Major bugfixes:
+  o Major bugfixes:
     - Make sure that two circuits can never exist on the same connection
-      with the same circuit ID, even if one is marked for close.  This
-      is conceivably a bugfix for bug 779; fixes a bug on 0.1.0.4-rc.
+      with the same circuit ID, even if one is marked for close. This
+      is conceivably a bugfix for bug 779. Bugfix on 0.1.0.4-rc.
     - Relays now reject risky extend cells: if the extend cell includes
       a digest of all zeroes, or asks to extend back to the relay that
       sent the extend cell, tear down the circuit. Ideas suggested
@@ -12,41 +12,37 @@ Changes in version 0.2.0.31 - 2008-09-??
       current circuit's exit relay (or its family). Anonymity bugfix
       pointed out by rovv.
 
- o Minor bugfixes:
-    - Fix a small alignment and memory-wasting bug on buffer chunks.  Spotted
-      by rovv.
-    - Recover 3-7 bytes that were wasted per memory chunk.  Fixes bug
-      794; bug spotted by rovv.  Bugfix on 0.2.0.1-alpha.
+  o Minor bugfixes:
+    - Recover 3-7 bytes that were wasted per memory chunk. Fixes bug
+      794; bug spotted by rovv. Bugfix on 0.2.0.1-alpha.
     - Correctly detect the presence of the linux/netfilter_ipv4.h header
-      when building against recent kernels.  Bugfix on 0.1.2.1-alpha.
+      when building against recent kernels. Bugfix on 0.1.2.1-alpha.
     - Pick size of default geoip filename string correctly on windows.
       Fixes bug 806. Bugfix on 0.2.0.30.
-    - Make the autoconf script accept the obsolete --with-ssl-dir option as
-      an alias for the actually-working --with-openssl-dir option.  Fix the
-      help documentation to recommend --with-openssl-dir.  Based on a patch
-      by "Dave". Bugfix on 0.2.0.1-alpha.
+    - Make the autoconf script accept the obsolete --with-ssl-dir
+      option as an alias for the actually-working --with-openssl-dir
+      option. Fix the help documentation to recommend --with-openssl-dir.
+      Based on a patch by "Dave". Bugfix on 0.2.0.1-alpha.
     - Disallow session resumption attempts during the renegotiation
-      stage of the v2 handshake protocol.  Clients should never be
-      trying session resumption at this point, but apparently some
-      did, in ways that caused the handshake to fail.  Bugfix on
-      0.2.0.20-rc.  Bug found by Geoff Goodell.
+      stage of the v2 handshake protocol. Clients should never be trying
+      session resumption at this point, but apparently some did, in
+      ways that caused the handshake to fail. Bug found by Geoff Goodell.
+      Bugfix on 0.2.0.20-rc.
     - When using the TransPort option on OpenBSD, and using the User
       option to change UID and drop privileges, make sure to open
-      /dev/pf before dropping privileges.  Fixes bug 782.  Patch from
-      Christopher Davis.  Bugfix on 0.1.2.1-alpha.
-    - Try to attach connections immediately upon receiving a RENDEZVOUS2 or
-      RENDEZVOUS_ESTABLISHED cell.  This can save a second or two on the
-      client side when connecting to a hidden service.  Bugfix on 0.0.6pre1.
-      Found and fixed by Christian Wilms; resolves bug 743.
-
- o Minor bugfixes (controller):
+      /dev/pf before dropping privileges. Fixes bug 782. Patch from
+      Christopher Davis. Bugfix on 0.1.2.1-alpha.
+    - Try to attach connections immediately upon receiving a RENDEZVOUS2
+      or RENDEZVOUS_ESTABLISHED cell. This can save a second or two
+      on the client side when connecting to a hidden service. Bugfix
+      on 0.0.6pre1. Found and fixed by Christian Wilms; resolves bug 743.
     - When closing an application-side connection because its circuit is
-      getting torn down, generate the stream event correctly.  Bugfix on
-      0.1.2.x.  Anonymous patch.
+      getting torn down, generate the stream event correctly. Bugfix on
+      0.1.2.x. Anonymous patch.
 
 
 Changes in version 0.2.0.30 - 2008-07-15
- o Minor bugfixes:
+  o Minor bugfixes:
     - Stop using __attribute__((nonnull)) with GCC: it can give us useful
       warnings (occasionally), but it can also cause the compiler to
       eliminate error-checking code. Suggested by Peter Gutmann.
diff --git a/configure.in b/configure.in
index b9e3c2d9f5..61d64436fc 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_INIT
-AM_INIT_AUTOMAKE(tor, 0.2.0.30)
+AM_INIT_AUTOMAKE(tor, 0.2.0.31)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index a4f99728b4..ff3a99a7c1 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -9,7 +9,7 @@
 !include "FileFunc.nsh"
 !insertmacro GetParameters
   
-!define VERSION "0.2.0.30"
+!define VERSION "0.2.0.31"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index caa6c2c445..94970305cd 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -227,6 +227,6 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.0.30"
+#define VERSION "0.2.0.31"