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

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

25 Oct '17

commit 151d5ededf9fb334a5195904945f95cf626f51bc Merge: 46091a88c faf568fa7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 25 09:28:29 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.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 25 Oct '17

25 Oct '17

commit fd59766a9cf5853bce5fa884afed8c8a48ae16b8 Merge: cff872f51 faf568fa7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 25 09:29:00 2017 -0400 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/master] 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.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 25 Oct '17

25 Oct '17

commit e1af8fd61757fa50380111b047219e942935a2c5 Merge: fbe15d1d7 151d5eded Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 25 09:29:00 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 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.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.2.5] 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.2.8] 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.2.5] Merge branch 'maint-0.2.5' into release-0.2.5
by nickm＠torproject.org 25 Oct '17

25 Oct '17

commit 765fd0845f58dee27e48a1a786e9dacb00663616 Merge: 5a0e73c75 82f8b27ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 25 09:29:00 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] 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.2.8] 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