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

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

25 Oct '17

commit 6ce8cc5dbba52c2a5e60d4311e8b9cfe684f210e Merge: 4edbbee2f 151d5eded Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 25 09:28:41 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

1 0

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

25 Oct '17

commit 7c2f688fb9b73c2aba6df9bd8792487e8d96cecc Merge: f68c1b140 6ce8cc5db Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 25 09:28:49 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump

1 0

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

25 Oct '17

commit 6ce8cc5dbba52c2a5e60d4311e8b9cfe684f210e Merge: 4edbbee2f 151d5eded Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 25 09:28:41 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

1 0

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

25 Oct '17

commit 6155f7669132165b71080663a83a914a7b8d8017 Merge: 987f628b7 7c2f688fb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 25 09:29:00 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 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.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 25 Oct '17

25 Oct '17

commit 7c2f688fb9b73c2aba6df9bd8792487e8d96cecc Merge: f68c1b140 6ce8cc5db Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 25 09:28:49 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump

1 0

[tor/release-0.3.2] bump to 0.2.5.15-dev
by nickm＠torproject.org 25 Oct '17

25 Oct '17

commit 82f8b27ff550854cbb7b7fa259e0a51763357880 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 25 09:26:53 2017 -0400 bump to 0.2.5.15-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 f989534a6..317778275 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.15]) +AC_INIT([tor],[0.2.5.15-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 519a73d2c..6dc7cbd76 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.15" +!define VERSION "0.2.5.15-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 6cbd31e52..5ba3ec194 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.15" +#define VERSION "0.2.5.15-dev"

1 0

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

25 Oct '17

commit faf568fa7e8cfbebc236b6aef743251b7e6b9df4 Merge: 9969b0dfd 82f8b27ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 25 09:28:15 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.2] bump to 0.2.8.16-dev
by nickm＠torproject.org 25 Oct '17

25 Oct '17

commit 9969b0dfda4199147807305ff9bde061248f1f42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 25 09:27:07 2017 -0400 bump to 0.2.8.16-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 79af3d4b6..6fb101bf9 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.16]) +AC_INIT([tor],[0.2.8.16-dev]) 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 60ee61ff8..b9eac37c5 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.15-dev" +!define VERSION "0.2.8.16-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 1f256c204..211243d1d 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.15-dev" +#define VERSION "0.2.8.16-dev"

1 0

[tor/release-0.3.2] bump to 0.2.9.13-dev
by nickm＠torproject.org 25 Oct '17

25 Oct '17

commit 46091a88ca6c3dd80c5a36e515d979930c1cdec1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 25 09:27:23 2017 -0400 bump to 0.2.9.13-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 786b4b095..f2c3f90ba 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.13]) +AC_INIT([tor],[0.2.9.13-dev]) 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 cd414dd43..919115b75 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.13" +!define VERSION "0.2.9.13-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 a249ba8c5..9c9166be1 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.13" +#define VERSION "0.2.9.13-dev"

1 0

[tor/release-0.3.2] bump to 0.3.0.12-dev
by nickm＠torproject.org 25 Oct '17

25 Oct '17

commit 4edbbee2fd5133ce1657a6a48cc4997e73233e34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 25 09:27:50 2017 -0400 bump to 0.3.0.12-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 60d4cc784..315bd2df3 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.12]) +AC_INIT([tor],[0.3.0.12-dev]) 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 a179d8483..160ef2675 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.12" +!define VERSION "0.3.0.12-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 47a00dc6d..f5a7451a5 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.12" +#define VERSION "0.3.0.12-dev"

1 0