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

[tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 990322fca450d2230067a3035468c5ac7168e760 Merge: 38a58076e 7bebd1b02 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:11:33 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump

1 0

[tor/release-0.2.9] bump to 0.2.5.15
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 743eee4930e7f5e37e18cc0f81e86133ab62885f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:09:00 2017 -0400 bump to 0.2.5.15 --- 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 4eeb34dca..f989534a6 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.14-dev]) +AC_INIT([tor],[0.2.5.15]) 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 af09326f1..519a73d2c 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.14-dev" +!define VERSION "0.2.5.15" !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 5e670c35c..6cbd31e52 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.14-dev" +#define VERSION "0.2.5.15"

1 0

[tor/release-0.2.9] bump to 0.2.8.16
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6 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.15-dev]) +AC_INIT([tor],[0.2.8.16]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4])

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump

1 0

[tor/release-0.2.9] bump to 0.2.9.13
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:09:26 2017 -0400 bump to 0.2.9.13 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 76140cbd1..786b4b095 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.12-dev]) +AC_INIT([tor],[0.2.9.13]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4])

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.8
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge to avoid version bump

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit a574ab8e2f78e75db45521d185b1a21262489995 Merge: 3353942fd 725f23710 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:10:42 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge to avoid version bump

1 0

[tor/release-0.3.0] bump to 0.3.0.12
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit d913a7317bf205d580cde70a0b58010295fe6c4c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:09:35 2017 -0400 bump to 0.3.0.12 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3f36da739..60d4cc784 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.3.0.11-dev]) +AC_INIT([tor],[0.3.0.12]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4])

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 302b5f577dc0840fd9f738d160ef14b88a71b67f Merge: d913a7317 725f23710 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:10:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

1 0