October 2014 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit af0fdb85e9f3404b735f6fbdb3fd3aa67758eb17 Merge: fd8f21e fed78bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:31:20 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit d6fab2afd7f37a3a31063654a8f5451d5d290bcf Merge: c6416f3 3202ac6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:33:53 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' This is an "ours" merge so we can leave the version in master alone.

1 0

[tor/master] bump maint-0.2.5 to 0.2.5.9-rc-dev
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit 3202ac60067a0350bfea1d04fdfd1680aeb661dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:32:09 2014 -0400 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 9da79ac..4b98b9c 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 2415f45..88116ec 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 43ccbc5..2c2ff7e 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"

1 0

[tor/release-0.2.5] bump maint-0.2.4 to 0.2.4.25-dev
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit e2112dd0c021fb620e90dbef3456f96635982cfc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:24:21 2014 -0400 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 3456013..9cf172a 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

1 0

[tor/release-0.2.5] Whoops, bump the version properly.
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit fed78bce8bc645866578a1739a10ee598bbaf4e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:29:16 2014 -0400 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 23a01b4..1e578cd 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 c86e2b0..d3f3eb1 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"

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit af0fdb85e9f3404b735f6fbdb3fd3aa67758eb17 Merge: fd8f21e fed78bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:31:20 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

1 0

[tor/release-0.2.5] bump maint-0.2.5 to 0.2.5.9-rc-dev
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit 3202ac60067a0350bfea1d04fdfd1680aeb661dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:32:09 2014 -0400 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 9da79ac..4b98b9c 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 2415f45..88116ec 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 43ccbc5..2c2ff7e 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"

1 0

[tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit 023ce9e0f8701aa67c7eab29582454ee01b517dc Merge: 334f4f6 3202ac6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:33:18 2014 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 Conflicts: configure.ac contrib/win32build/tor-mingw.nsi.in src/win32/orconfig.h configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.5] bump maint-0.2.5 to 0.2.5.9-rc-dev
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit 3202ac60067a0350bfea1d04fdfd1680aeb661dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:32:09 2014 -0400 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 9da79ac..4b98b9c 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 2415f45..88116ec 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 43ccbc5..2c2ff7e 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"

1 0

[tor/maint-0.2.5] bump maint-0.2.4 to 0.2.4.25-dev
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit e2112dd0c021fb620e90dbef3456f96635982cfc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:24:21 2014 -0400 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 3456013..9cf172a 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

1 0