From e2112dd0c021fb620e90dbef3456f96635982cfc Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 20 Oct 2014 10:24:21 -0400 Subject: [PATCH 1/3] bump maint-0.2.4 to 0.2.4.25-dev --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 345601332..9cf172af4 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.23]) +AC_INIT([tor],[0.2.4.25-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE From fed78bce8bc645866578a1739a10ee598bbaf4e0 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 20 Oct 2014 10:29:16 -0400 Subject: [PATCH 2/3] Whoops, bump the version properly. --- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 23a01b46c..1e578cd4a 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.4.23" +!define VERSION "0.2.4.25-dev" !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 c86e2b0fa..d3f3eb19a 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.23" +#define VERSION "0.2.4.25-dev" From 3202ac60067a0350bfea1d04fdfd1680aeb661dd Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 20 Oct 2014 10:32:09 -0400 Subject: [PATCH 3/3] bump maint-0.2.5 to 0.2.5.9-rc-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 9da79ac7b..4b98b9cfd 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.5.7-rc-dev]) +AC_INIT([tor],[0.2.5.9-rc-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 2415f45f3..88116ec85 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.5.7-rc-dev" +!define VERSION "0.2.5.9-rc-dev" !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 43ccbc59a..2c2ff7eb1 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.5.7-rc-dev" +#define VERSION "0.2.5.9-rc-dev"