April 2015 - tor-commits - lists.torproject.org

[tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6
by nickm＠torproject.org 06 Apr '15

06 Apr '15

commit 9ccf019b168909ef6674c71aebda9f90516bb6a1 Merge: 39c056e f620b8f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 6 10:03:26 2015 -0400 Merge branch 'maint-0.2.6' into release-0.2.6

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 06 Apr '15

06 Apr '15

commit 5633261f2e902e5b6c5956738febab9a180760d6 Merge: fe69a7e 542100d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 6 09:55:44 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

1 0

[tor/master] Bump 0.2.4 version
by nickm＠torproject.org 06 Apr '15

06 Apr '15

commit 442d577af5ab95eb91da794e3850ffed25e8c013 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 6 09:41:59 2015 -0400 Bump 0.2.4 version --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5cc9ab8..6ffe3cc 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.26]) +AC_INIT([tor],[0.2.4.27]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE

1 0

[tor/master] Bump 0.2.4 version more places
by nickm＠torproject.org 06 Apr '15

06 Apr '15

commit 542100d3cac59dc178cb01ca639544c0f335abd3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 6 09:48:53 2015 -0400 Bump 0.2.4 version more places --- 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 f16e637..a66bcd1 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.26" +!define VERSION "0.2.4.27" !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 a028e9e..baddef6 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.26" +#define VERSION "0.2.4.27"

1 0

[tor/master] bump 0.2.5 version to 0.2.5.12
by nickm＠torproject.org 06 Apr '15

06 Apr '15

commit 3a5d4d666ed9b6faa8d7f4ef58d5a2ff12375d89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 6 09:56:37 2015 -0400 bump 0.2.5 version to 0.2.5.12 --- 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 5372943..29ba2fd 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.11]) +AC_INIT([tor],[0.2.5.12]) 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 a5b7557..2fb15b8 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.11" +!define VERSION "0.2.5.12" !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 34e1471..6d6cde4 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.11" +#define VERSION "0.2.5.12"

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 06 Apr '15

06 Apr '15

commit eab67b06cf647e536c3ccaab7795b478413fa473 Merge: 0475552 3a5d4d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 6 09:59:06 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

1 0

[tor/master] bump version to 0.2.6.7-dev
by nickm＠torproject.org 06 Apr '15

06 Apr '15

commit f620b8f03286de641329cd9ae2027f3628a7d2a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 6 10:01:16 2015 -0400 bump version to 0.2.6.7-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 f88cfc2..cc271c8 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.7]) +AC_INIT([tor],[0.2.6.7-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 5365460..b8798d8 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.6.7" +!define VERSION "0.2.6.7-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 e9591e1..b014a12 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.6.7" +#define VERSION "0.2.6.7-dev"

1 0

[tor/master] bump version to 0.2.6.7
by nickm＠torproject.org 06 Apr '15

06 Apr '15

commit eb41214dbaf090ba9d556d2d501d2d486e2f8581 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 6 10:00:30 2015 -0400 bump version to 0.2.6.7 --- 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 5ea7708..f88cfc2 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.6-dev]) +AC_INIT([tor],[0.2.6.7]) 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 dda8244..5365460 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.6.6" +!define VERSION "0.2.6.7" !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 9b2a9b0..e9591e1 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.6.6" +#define VERSION "0.2.6.7"

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'
by nickm＠torproject.org 06 Apr '15

06 Apr '15

commit 65cd681635f54e40dfae3091d0dc6ddf53b7fdd0 Merge: e98b8bc f620b8f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 6 10:03:51 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6'

1 0

[tor/release-0.2.6] Bump 0.2.4 version more places
by nickm＠torproject.org 06 Apr '15

06 Apr '15

commit 542100d3cac59dc178cb01ca639544c0f335abd3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 6 09:48:53 2015 -0400 Bump 0.2.4 version more places --- 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 f16e637..a66bcd1 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.26" +!define VERSION "0.2.4.27" !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 a028e9e..baddef6 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.26" +#define VERSION "0.2.4.27"

1 0