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

[tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 10 Sep '18

10 Sep '18

commit 8408331b3e965dfad3c79fadc51f0b01eed366fe Merge: ec4a7641f b203dedaf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 09:41:39 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 "ours" to avoid version bump.

1 0

[tor/release-0.3.4] Bump to 0.3.2.12-dev
by nickm＠torproject.org 10 Sep '18

10 Sep '18

commit ec4a7641f10a7f799d686f289a94679176cdc761 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 09:41:34 2018 -0400 Bump to 0.3.2.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 5b541d7c9..67265c5ba 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.2.12]) +AC_INIT([tor],[0.3.2.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 8c84e3659..de2cf59c0 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.2.12" +!define VERSION "0.3.2.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 fcdc090d4..442371a86 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.2.12" +#define VERSION "0.3.2.12-dev"

1 0

[tor/release-0.3.4] Bump to 0.3.3.10-dev.
by nickm＠torproject.org 10 Sep '18

10 Sep '18

commit 05f5f6500647b43dfadd516f8344c5d0ff788a93 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 09:42:12 2018 -0400 Bump to 0.3.3.10-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 47dd53034..bd084c9d3 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.3.10]) +AC_INIT([tor],[0.3.3.10-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 5ecf20835..fbf7e9afe 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.3.10" +!define VERSION "0.3.3.10-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 08f0048cb..72489d702 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.3.10" +#define VERSION "0.3.3.10-dev"

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 10 Sep '18

10 Sep '18

commit fe0c42631750aa40f66e34f829a04ddfce83fe10 Merge: da95b9135 96601a680 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 09:42:57 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 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.3] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 10 Sep '18

10 Sep '18

commit 8408331b3e965dfad3c79fadc51f0b01eed366fe Merge: ec4a7641f b203dedaf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 09:41:39 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 "ours" to avoid version bump.

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 10 Sep '18

10 Sep '18

commit c6b8f7843a2dc5434bd105749d6a8d679913b4c9 Merge: 2e94df92c 05f5f6500 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 09:42:57 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 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.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 10 Sep '18

10 Sep '18

commit 8cfca28be28f36eec93195f8818ab7adc20426d1 Merge: cff7cb858 8408331b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 09:41:55 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 "ours" to avoid version bump.

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 10 Sep '18

10 Sep '18

commit 7a343ecec55b47f5ff6dcf5ee61ad6d3e1796475 Merge: 0d5aaef46 05f5f6500 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 09:42:22 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 "ours" to avoid version bump.

1 0

[tor/release-0.3.4] Bump to 0.3.4.8-dev
by nickm＠torproject.org 10 Sep '18

10 Sep '18

commit 96601a68051e755e131ee7644091f46cae83794a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 09:42:40 2018 -0400 Bump to 0.3.4.8-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 4fc1ee13d..579c34947 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.4.8]) +AC_INIT([tor],[0.3.4.8-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 0e79e2abf..3ebd6a359 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.4.8" +!define VERSION "0.3.4.8-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 4c7176dae..b4a2f667a 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.4.8" +#define VERSION "0.3.4.8-dev"

1 0

[tor/maint-0.2.9] Bump to 0.2.9.17-dev
by nickm＠torproject.org 10 Sep '18

10 Sep '18

commit b203dedaf574f5607adbf97558d85475e6a4c727 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 09:41:22 2018 -0400 Bump to 0.2.9.17-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 61a0c3238..772ae432a 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.17]) +AC_INIT([tor],[0.2.9.17-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 0484641f9..452720516 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.17" +!define VERSION "0.2.9.17-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 457c7469c..f6d0e7d68 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.17" +#define VERSION "0.2.9.17-dev"

1 0