[or-cvs] [tor/release-0.2.1 2/2] bump to 0.2.1.26, and pick a release date

[arma at torproject.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Fri, 30 Apr 2010 13:40:00 -0400
Subject: bump to 0.2.1.26, and pick a release date
Commit: 77f30fb55b794b833b104b80504c3a2063e92809

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

diff --git a/ChangeLog b/ChangeLog
index e417cf2..3618718 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.2.1.26 - 2010-05-0?
+Changes in version 0.2.1.26 - 2010-05-02
   o Major bugfixes:
     - Teach relays to defend themselves from connection overload. Relays
       now close idle circuits early if it looks like they were intended
diff --git a/configure.in b/configure.in
index 34544e2..54b880c 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.25)
+AM_INIT_AUTOMAKE(tor, 0.2.1.26)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 6deb8d9..b98dde3 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.25"
+!define VERSION "0.2.1.26"
 !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 65804fe..bc9b000 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -226,6 +226,6 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.1.25"
+#define VERSION "0.2.1.26"
 
 
-- 
1.6.5