[or-cvs] [tor/master] bump to 0.2.2.11-alpha

[arma at torproject.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Thu, 15 Apr 2010 11:02:31 -0400
Subject: bump to 0.2.2.11-alpha
Commit: 9cde5a4629769d422d28f4b4b71fa87e3d64aa09

---
 ChangeLog                |   10 +++++-----
 configure.in             |    2 +-
 contrib/tor-mingw.nsi.in |    2 +-
 src/win32/orconfig.h     |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2bc1cdd..f479444 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,10 +9,10 @@ Changes in version 0.2.2.11-alpha - 2010-04-15
       on 0.2.2.7-alpha. Rename CircPriorityHalflifeMsec to
       CircuitPriorityHalflifeMsec, so authorities can tell newer relays
       about the option without breaking older ones.
-    - Fix SSL renegotiation behavior on OpenSSL versions that claim to
-      be earlier than 0.9.8m, but which have in reality backported huge
-      swaths of 0.9.8m or 0.9.8n renegotiation behavior. Possible fix
-      for some cases of bug 1346.
+    - Fix SSL renegotiation behavior on OpenSSL versions like on Centos
+      that claim to be earlier than 0.9.8m, but which have in reality
+      backported huge swaths of 0.9.8m or 0.9.8n renegotiation
+      behavior. Possible fix for some cases of bug 1346.
 
   o Minor features:
     - Experiment with a more aggressive approach to preventing clients
@@ -22,7 +22,7 @@ Changes in version 0.2.2.11-alpha - 2010-04-15
       how it goes!
     - Add support for statically linking zlib by specifying
       --enable-static-zlib, to go with our support for statically linking
-      openssl/libevent. Resolves bug 1358.
+      openssl and libevent. Resolves bug 1358.
 
   o Minor bugfixes:
     - Fix a segfault that happens whenever a Tor client that is using
diff --git a/configure.in b/configure.in
index 91010ab..0c9b2ab 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_INIT
-AM_INIT_AUTOMAKE(tor, 0.2.2.10-alpha-dev)
+AM_INIT_AUTOMAKE(tor, 0.2.2.11-alpha)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 3283c2f..b041dad 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.2.10-alpha-dev"
+!define VERSION "0.2.2.11-alpha"
 !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 ce6d854..873ea88 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -226,5 +226,5 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.2.10-alpha-dev"
+#define VERSION "0.2.2.11-alpha"
 
-- 
1.6.5