December 2016 - tor-commits - lists.torproject.org

[tor/master] Bump to 0.2.8.10
by nickm＠torproject.org 01 Dec '16

01 Dec '16

commit 9157405c03f17635d80019eaf243388fb29df9dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 1 13:34:21 2016 -0500 Bump to 0.2.8.10 --- 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 6647523..eb1fac3 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.9-dev]) +AC_INIT([tor],[0.2.8.10]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 4a4bc9b..93e9516 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.8.9-dev" +!define VERSION "0.2.8.10" !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 689f36e..0a3d77a 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.9-dev" +#define VERSION "0.2.8.10"

1 0

[tor/maint-0.2.9] Bump to 0.2.8.10
by nickm＠torproject.org 01 Dec '16

01 Dec '16

commit 9157405c03f17635d80019eaf243388fb29df9dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 1 13:34:21 2016 -0500 Bump to 0.2.8.10 --- 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 6647523..eb1fac3 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.9-dev]) +AC_INIT([tor],[0.2.8.10]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 4a4bc9b..93e9516 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.8.9-dev" +!define VERSION "0.2.8.10" !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 689f36e..0a3d77a 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.9-dev" +#define VERSION "0.2.8.10"

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 01 Dec '16

01 Dec '16

commit bb0d668677e5cb04f6e7b079e4f846d9a34505e4 Merge: fc47cc3 82bd2af Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 1 13:36:06 2016 -0500 Merge branch 'maint-0.2.9'

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 01 Dec '16

01 Dec '16

commit 647dbf65fd1385f87f85df9a1a2d6e293f44f506 Merge: bb0d668 9e297f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 1 13:37:03 2016 -0500 Merge branch 'maint-0.2.9'

1 0

[tor/master] Bump to 0.2.9.6-rc
by nickm＠torproject.org 01 Dec '16

01 Dec '16

commit 9e297f819738b1ae58982db89c19ba9c99236c0c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 1 13:36:38 2016 -0500 Bump to 0.2.9.6-rc --- 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 1d56b9b..98dad9b 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.5-alpha-dev]) +AC_INIT([tor],[0.2.9.6-rc]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 3086e9b..7771dd2 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.9.5-alpha-dev" +!define VERSION "0.2.9.6-rc" !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 7f42796..76bb1b8 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.9.5-alpha-dev" +#define VERSION "0.2.9.6-rc"

1 0

[tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 01 Dec '16

01 Dec '16

commit 82bd2af78df57206bdcc81e7343a78b7f07c4a1b Merge: 52cb1ed 9157405 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 1 13:35:34 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9

1 0

[tor/maint-0.2.9] Bump to 0.2.9.6-rc
by nickm＠torproject.org 01 Dec '16

01 Dec '16

commit 9e297f819738b1ae58982db89c19ba9c99236c0c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 1 13:36:38 2016 -0500 Bump to 0.2.9.6-rc --- 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 1d56b9b..98dad9b 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.5-alpha-dev]) +AC_INIT([tor],[0.2.9.6-rc]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 3086e9b..7771dd2 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.9.5-alpha-dev" +!define VERSION "0.2.9.6-rc" !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 7f42796..76bb1b8 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.9.5-alpha-dev" +#define VERSION "0.2.9.6-rc"

1 0

[tor/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 01 Dec '16

01 Dec '16

commit 82bd2af78df57206bdcc81e7343a78b7f07c4a1b Merge: 52cb1ed 9157405 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 1 13:35:34 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 01 Dec '16

01 Dec '16

commit fb739ac5764e9da72622e55283d41c1136ee1067 Merge: 18ee1d2 9157405 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 1 13:34:29 2016 -0500 Merge branch 'maint-0.2.8' into release-0.2.8 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/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 01 Dec '16

01 Dec '16

commit 2f7c10df1216fbad4c7a981e180843ea5b7aca74 Merge: d6ecfe6 82bd2af Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 1 13:35:46 2016 -0500 Merge branch 'maint-0.2.9' into release-0.2.9

1 0