bump to 0.2.1.3-alphator-0.2.1.3-alpha

svn:r16369

6 files changed, 26 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index c815eafd25..255f0dc1f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,14 @@
-Changes in version 0.2.1.3-alpha - 2008-07-xx
+Changes in version 0.2.1.3-alpha - 2008-08-03
   o Bootstrapping bugfixes (on 0.2.1.x-alpha):
     - Send a bootstrap problem "warn" event on the first problem if the
       reason is NO_ROUTE (that is, our network is down).
 
   o Major features:
-    - Implements most of proposal 110: The first K cells to be send
-      along a circuit are marked as special "early" cells; only K
-      "early" cells will be allowed.  Once this code is universal, we
-      can block certain kinds of DOS attack by only allowing EXTEND
-      commands in these cells.
+    - Implement most of proposal 110: The first K cells to be sent
+      along a circuit are marked as special "early" cells; only K "early"
+      cells will be allowed. Once this code is universal, we can block
+      certain kinds of DOS attack by requiring that EXTEND commands must
+      be sent using an "early" cell.
 
   o Major bugfixes:
     - Try to attach connections immediately upon receiving a RENDEZVOUS2
@@ -16,23 +16,23 @@ Changes in version 0.2.1.3-alpha - 2008-07-xx
       on the client side when connecting to a hidden service. Bugfix
       on 0.0.6pre1. Found and fixed by Christian Wilms; resolves bug 743.
     - Ensure that two circuits can never exist on the same connection
-      with the same circuit ID, even if one is marked for close.  This
+      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.
 
   o Minor features:
     - When relays do their initial bandwidth measurement, don't limit
-      to just our our entry guards for the test circuits. Otherwise we
-      tend to have multiple test circuits going through a single entry
-      guard, which makes our bandwidth test less accurate. Fixes part
-      of bug 654; patch contributed by Josh Albrecht.
+      to just our entry guards for the test circuits. Otherwise we tend
+      to have multiple test circuits going through a single entry guard,
+      which makes our bandwidth test less accurate. Fixes part of bug 654;
+      patch contributed by Josh Albrecht.
     - Add an ExcludeExitNodes option so users can list a set of nodes
       that should be be excluded from the exit node position, but
-      allowed elsewhere.  Implements proposal 151.
+      allowed elsewhere. Implements proposal 151.
     - Allow address patterns (e.g., 255.128.0.0/16) to appear in
       ExcludeNodes and ExcludeExitNodes lists.
-    - Change the implementation of ExcludeNodes and ExcludeExitNodes
-      to be more efficient.  Formerly it was quadratic in the number
-      of servers; now it should be linear.  Fixes bug 509.
+    - Change the implementation of ExcludeNodes and ExcludeExitNodes to
+      be more efficient. Formerly it was quadratic in the number of
+      servers; now it should be linear. Fixes bug 509.
     - Save 16-22 bytes per open circuit by moving the n_hop, n_port,
       and n_conn_id_digest fields into a separate structure that's
       only needed when the circuit has not yet attached to an n_conn.
@@ -43,7 +43,7 @@ Changes in version 0.2.1.3-alpha - 2008-07-xx
       "root:wheel". Fixes bug 676, reported by Serge Koksharov.
     - 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.
+      eliminate error-checking code. Suggested by Peter Gutmann.
     - When a hidden service is giving up on an introduction point candidate
       that was not included in the last published rendezvous descriptor,
       don't reschedule publication of the next descriptor. Fixes bug 763.
@@ -51,18 +51,19 @@ Changes in version 0.2.1.3-alpha - 2008-07-xx
     - Mark RendNodes, RendExcludeNodes, HiddenServiceNodes, and
       HiddenServiceExcludeNodes as obsolete: they never worked properly,
       and nobody claims to be using them. Fixes bug 754. Bugfix on
-      0.1.0.1-rc.  Patch from Christian Wilms.
+      0.1.0.1-rc. Patch from Christian Wilms.
     - Fix a small alignment and memory-wasting bug on buffer chunks.  Spotted
       by rovv.
 
   o Minor bugfixes (controller):
     - 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.
+      Bugfix on 0.1.2.x. Anonymous patch.
 
   o Removed features
-    - Remove all backward-compatibility code to support servers running
-      versions of Tor so old as to no longer work at all on the Tor network.
+    - Remove all backward-compatibility code to support relays running
+      versions of Tor so old that they no longer work at all on the
+      Tor network.
 
 
 Changes in version 0.2.0.29-rc - 2008-07-08
diff --git a/configure.in b/configure.in
index 1c551543f9..fd45b27f08 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.1.2-alpha-dev)
+AM_INIT_AUTOMAKE(tor, 0.2.1.3-alpha)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index cba24d9422..b45be9af15 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.1.2-alpha-dev"
+!define VERSION "0.2.1.3-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
 !define LICENSE "LICENSE"
diff --git a/doc/spec/version-spec.txt b/doc/spec/version-spec.txt
index e17c56bf41..dc2c901ed4 100644
--- a/doc/spec/version-spec.txt
+++ b/doc/spec/version-spec.txt
@@ -23,7 +23,7 @@ $Id$
 
  After 0.1.0, versions are of the format:
     MAJOR.MINOR.MICRO(.PATCHLEVEL)(-status_tag)
- The stuff in parenthesis is optional.  As before, MAJOR, MINOR, MICRO,
+ The stuff in parentheses is optional.  As before, MAJOR, MINOR, MICRO,
  and PATCHLEVEL are numbers, with an absent number equivalent to 0.
  All versions should be distinguishable purely by those four
  numbers. The status tag is purely informational, and lets you know how
diff --git a/src/or/or.h b/src/or/or.h
index 9777bc6233..14f032fdd8 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -881,7 +881,7 @@ typedef struct connection_t {
   const char *marked_for_close_file; /**< For debugging: in which file were
                                       * we marked for close? */
   char *address; /**< FQDN (or IP) of the guy on the other end.
-                  * strdup into this, because free_connection frees it. */
+                  * strdup into this, because free_connection() frees it. */
   /** Another connection that's connected to this one in lieu of a socket. */
   struct connection_t *linked_conn;
 
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 4cf47eac41..d9153c7005 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.1.2-alpha-dev"
+#define VERSION "0.2.1.3-alpha"