March 2020 - tor-commits - lists.torproject.org

[tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 18 Mar '20

18 Mar '20

commit d925d2995c6b11e4fea3a0637544c23b0b90ff95 Merge: 84f57b69f 190cda0e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 18 12:17:20 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 "ours" to avoid version bump.

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.1
by nickm＠torproject.org 18 Mar '20

18 Mar '20

commit cb69a5a1184e1b02523308c6d51b0f8f715f064e Merge: efdbf4243 3150c3035 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 18 12:16:59 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 "ours" to avoid version bump.

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 18 Mar '20

18 Mar '20

commit 190cda0e2ba2faa300758f4899a6c28de6886bfc Merge: a17f4b11b cb69a5a11 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 18 12:17:11 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" to avoid version bump.

1 0

[tor/master] Bump version to 0.3.5.10-dev
by nickm＠torproject.org 18 Mar '20

18 Mar '20

commit 3150c3035150924cc10a3edf9b1b44cc1aafa257 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 18 12:15:32 2020 -0400 Bump version to 0.3.5.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 da158eb23..bc434ed83 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.5.10]) +AC_INIT([tor],[0.3.5.10-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 8f5f38963..7252e7eb7 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.5.10" +!define VERSION "0.3.5.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 42e3e1a4c..2b21abe88 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.5.10" +#define VERSION "0.3.5.10-dev"

1 0

[tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 18 Mar '20

18 Mar '20

commit 190cda0e2ba2faa300758f4899a6c28de6886bfc Merge: a17f4b11b cb69a5a11 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 18 12:17:11 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" to avoid version bump.

1 0

[tor/master] Bump version to 0.4.2.7-dev
by nickm＠torproject.org 18 Mar '20

18 Mar '20

commit a17f4b11b48c619c4cafc030b237f4b3cada79a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 18 12:16:11 2020 -0400 Bump version to 0.4.2.7-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 5c8b49b79..21b55d79c 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.2.7]) +AC_INIT([tor],[0.4.2.7-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-13"], # for 0.4.2.7 +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-18"], # for 0.4.2.7-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 4aabd72e2..7bd274f09 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.4.2.7" +!define VERSION "0.4.2.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 41dec20b9..f5f704675 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.4.2.7" +#define VERSION "0.4.2.7-dev"

1 0

[tor/master] Bump version to 0.4.1.9-dev
by nickm＠torproject.org 18 Mar '20

18 Mar '20

commit efdbf42432b325ef5638a1f005cd77c6b4645d20 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 18 12:15:53 2020 -0400 Bump version to 0.4.1.9-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 1d6b8ee15..628811e53 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.1.9]) +AC_INIT([tor],[0.4.1.9-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-13"], # for 0.4.1.9 +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-18"], # for 0.4.1.9-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 01f5a5740..0de3d0954 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.4.1.9" +!define VERSION "0.4.1.9-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 9e5d1d47c..efd898681 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.4.1.9" +#define VERSION "0.4.1.9-dev"

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.1
by nickm＠torproject.org 18 Mar '20

18 Mar '20

commit cb69a5a1184e1b02523308c6d51b0f8f715f064e Merge: efdbf4243 3150c3035 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 18 12:16:59 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 "ours" to avoid version bump.

1 0

[tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 18 Mar '20

18 Mar '20

commit d925d2995c6b11e4fea3a0637544c23b0b90ff95 Merge: 84f57b69f 190cda0e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 18 12:17:20 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 "ours" to avoid version bump.

1 0

[tor/master] Merge branch 'maint-0.4.3'
by nickm＠torproject.org 18 Mar '20

18 Mar '20

commit 9b307664512ed695108a3bf890ec3d14baa86b1f Merge: 7793ccdee d925d2995 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 18 12:17:32 2020 -0400 Merge branch 'maint-0.4.3' "ours" to avoid version bump.

1 0