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

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

18 Sep '17

commit 23c5259a384b435c76b5cae40f68f07aec34d241 Merge: e78347fcc 42e12a353 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 18 14:40:36 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" to avoid version bump.

1 0

[tor/master] bump to 0.2.8.15-dev
by nickm＠torproject.org 18 Sep '17

18 Sep '17

commit 0a72d1c8f1b1a92b829a93f28e43ca3c6f74e526 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 18 14:39:40 2017 -0400 bump to 0.2.8.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 4695f111d..55ace93cb 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]) +AC_INIT([tor],[0.2.8.15-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 57002a04e..60ee61ff8 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" +!define VERSION "0.2.8.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 bb09bafe0..1f256c204 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" +#define VERSION "0.2.8.15-dev"

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 18 Sep '17

18 Sep '17

commit 586c327e072ec5a85fcb93cc64e703e201251eb2 Merge: 0e85b7106 23c5259a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 18 14:40:43 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" to avoid version bump.

1 0

[tor/maint-0.3.1] bump to 0.3.1.7-dev
by nickm＠torproject.org 18 Sep '17

18 Sep '17

commit 0e85b71066d6341e817529c6a697b3f95e113564 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 18 14:40:04 2017 -0400 bump to 0.3.1.7-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 9c6b14bf4..ecff48f85 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.1.7]) +AC_INIT([tor],[0.3.1.7-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 7357ec685..0373af313 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.1.7" +!define VERSION "0.3.1.7-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 895d867d3..e74d54a72 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.1.7" +#define VERSION "0.3.1.7-dev"

1 0

[tor/master] bump to 0.2.9.12-dev
by nickm＠torproject.org 18 Sep '17

18 Sep '17

commit a57f1ff7abdd61137c579d806bcd2150fd5fecf6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 18 14:39:46 2017 -0400 bump to 0.2.9.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 45019bebb..76140cbd1 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]) +AC_INIT([tor],[0.2.9.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 eafedfa68..df657d38b 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.12" +!define VERSION "0.2.9.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 fc093daeb..47992c0d8 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.12" +#define VERSION "0.2.9.12-dev"

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 18 Sep '17

18 Sep '17

commit 42e12a3537fef04ab77defd6cb5581add439de43 Merge: a57f1ff7a 0a72d1c8f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 18 14:40:22 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" to avoid version bump.

1 0

[tor/master] bump to 0.3.0.11-dev
by nickm＠torproject.org 18 Sep '17

18 Sep '17

commit e78347fcc206dd8bf1838fb5f396c8a7eefc0325 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 18 14:39:55 2017 -0400 bump to 0.3.0.11-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 4dc42346a..3f36da739 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]) +AC_INIT([tor],[0.3.0.11-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 7824d02f1..48a4d8e75 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" +!define VERSION "0.3.0.11-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 e81bf0c9f..7399f8178 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" +#define VERSION "0.3.0.11-dev"

1 0

[tor/master] bump to 0.3.1.7-dev
by nickm＠torproject.org 18 Sep '17

18 Sep '17

commit 0e85b71066d6341e817529c6a697b3f95e113564 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 18 14:40:04 2017 -0400 bump to 0.3.1.7-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 9c6b14bf4..ecff48f85 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.1.7]) +AC_INIT([tor],[0.3.1.7-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 7357ec685..0373af313 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.1.7" +!define VERSION "0.3.1.7-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 895d867d3..e74d54a72 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.1.7" +#define VERSION "0.3.1.7-dev"

1 0

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

18 Sep '17

commit 23c5259a384b435c76b5cae40f68f07aec34d241 Merge: e78347fcc 42e12a353 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 18 14:40:36 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" 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 18 Sep '17

18 Sep '17

commit 9eaa66db0b2114401f3748c65222c373617e5c0e Merge: e25e98028 0a72d1c8f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 18 14:40:55 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