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

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

24 Oct '17

commit 2182bb827d271d9854ad0f93958933c4bee8899e Merge: 99756033f 912ebf165 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:10:42 2017 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

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

24 Oct '17

commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25 Merge: 5325e7cca 552b62028 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:11:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

1 0

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

24 Oct '17

commit 350fecfafe74d08be54d8162a01ab79dbe84d53a Merge: 51de3a1c1 122a7f884 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:11:38 2017 -0400 Merge branch 'maint-0.3.2'

1 0

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

24 Oct '17

commit 078604630dad7edc57cc9378102de65f06586efd Merge: 8669a1ea5 743eee493 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:10:42 2017 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 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.8] 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.5] 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/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit cce1a6efa6adbb90566fc6567c82c4410cd76bf9 Merge: 0d4addfc7 38a58076e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:10:37 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid version bump

1 0

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

24 Oct '17

commit 122a7f8848785e3cefef812749c7ec1844b26402 Merge: cce1a6efa 990322fca Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:11:38 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0

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

24 Oct '17

commit 38a58076e921d561fa1e488a4b0f983b12300ca4 Merge: cbb41ddfe 302b5f577 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:10:30 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump

1 0

[tor/master] bump version in the other places :/
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 5325e7ccab70383a629019323ba01d2c9215b5f4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 09:11:17 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 48a4d8e75..a179d8483 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.3.0.11-dev" +!define VERSION "0.3.0.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 7399f8178..47a00dc6d 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.3.0.11-dev" +#define VERSION "0.3.0.12"

1 0