aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2010-03-15 18:08:29 -0400
committerRoger Dingledine <arma@torproject.org>2010-03-15 18:08:29 -0400
commit94dccce3faee409df1c8d1031fee1be6d6d51da6 (patch)
tree28b402938b2dc5ee6c383a9e4b4bc395eef6fd1b
parent841351e612e1891c6754eb8fba817e7b1afe6c24 (diff)
downloadtor-94dccce3faee409df1c8d1031fee1be6d6d51da6.tar
tor-94dccce3faee409df1c8d1031fee1be6d6d51da6.tar.gz
bump to 0.2.1.25
it's perfect, let's ship it
-rw-r--r--ChangeLog2
-rw-r--r--configure.in2
-rw-r--r--contrib/tor-mingw.nsi.in2
-rw-r--r--src/win32/orconfig.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d2efce8c0..157fabe16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.2.1.25 - 2010-03-??
+Changes in version 0.2.1.25 - 2010-03-15
o Major bugfixes:
- Fix a regression from our patch for bug 1244 that caused relays
to guess their IP address incorrectly if they didn't set Address
diff --git a/configure.in b/configure.in
index f84d10b0f..34544e27a 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.24-dev)
+AM_INIT_AUTOMAKE(tor, 0.2.1.25)
AM_CONFIG_HEADER(orconfig.h)
AC_CANONICAL_HOST
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 9f747d708..36239a3fb 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.24-dev"
+!define VERSION "0.2.1.25"
!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 49bb58376..65804fe19 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.24-dev"
+#define VERSION "0.2.1.25"