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

[tor/maint-0.4.1] Bump to 0.4.1.8-dev
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit 7afb95d3e3021b78619e76a13ea261e68ecd3162 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 30 11:18:50 2020 -0500 Bump to 0.4.1.8-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 82e3f57f4..48f3dfc00 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.8]) +AC_INIT([tor],[0.4.1.8-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-01-30"], # for 0.4.1.8 +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-01-30"], # for 0.4.1.8-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 dfd8a1e0a..40783299c 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.8" +!define VERSION "0.4.1.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 50a588e31..c23dfe7bb 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.8" +#define VERSION "0.4.1.8-dev"

1 0

[tor/maint-0.4.2] bump to 0.4.2.6-dev
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit 49cffee6355ce9ab4b95ca60cc237d2a538f6d27 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 30 11:19:16 2020 -0500 bump to 0.4.2.6-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 509ebcf22..cc746407d 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.6]) +AC_INIT([tor],[0.4.2.6-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-01-30"], # for 0.4.2.6 +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-01-30"], # for 0.4.2.6-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 eeb44cf30..2ccb1632b 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.6" +!define VERSION "0.4.2.6-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 41826faad..556c8b805 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.6" +#define VERSION "0.4.2.6-dev"

1 0

[tor/maint-0.4.2] Bump to 0.4.1.8-dev
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit 7afb95d3e3021b78619e76a13ea261e68ecd3162 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 30 11:18:50 2020 -0500 Bump to 0.4.1.8-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 82e3f57f4..48f3dfc00 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.8]) +AC_INIT([tor],[0.4.1.8-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-01-30"], # for 0.4.1.8 +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-01-30"], # for 0.4.1.8-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 dfd8a1e0a..40783299c 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.8" +!define VERSION "0.4.1.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 50a588e31..c23dfe7bb 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.8" +#define VERSION "0.4.1.8-dev"

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit c5e610af05dc7112a9b3aa18feeb6ba63290ff5c Merge: 49cffee63 7afb95d3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 30 11:19:23 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 Using "ours" strategy to avoid version bump

1 0

[tor/master] Bump to 0.4.1.8-dev
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit 7afb95d3e3021b78619e76a13ea261e68ecd3162 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 30 11:18:50 2020 -0500 Bump to 0.4.1.8-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 82e3f57f4..48f3dfc00 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.8]) +AC_INIT([tor],[0.4.1.8-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-01-30"], # for 0.4.1.8 +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-01-30"], # for 0.4.1.8-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 dfd8a1e0a..40783299c 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.8" +!define VERSION "0.4.1.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 50a588e31..c23dfe7bb 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.8" +#define VERSION "0.4.1.8-dev"

1 0

[tor/master] Merge branch 'maint-0.4.2'
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit ee929eedbb4ca50fef3fbca9066908e8bc6e56fa Merge: 342ea3155 c5e610af0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 30 11:19:41 2020 -0500 Merge branch 'maint-0.4.2' Using "ours" strategy to avoid version bump.

1 0

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

30 Jan '20

commit c5e610af05dc7112a9b3aa18feeb6ba63290ff5c Merge: 49cffee63 7afb95d3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 30 11:19:23 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 Using "ours" strategy to avoid version bump

1 0

[tor/master] bump to 0.4.2.6-dev
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit 49cffee6355ce9ab4b95ca60cc237d2a538f6d27 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 30 11:19:16 2020 -0500 bump to 0.4.2.6-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 509ebcf22..cc746407d 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.6]) +AC_INIT([tor],[0.4.2.6-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-01-30"], # for 0.4.2.6 +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-01-30"], # for 0.4.2.6-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 eeb44cf30..2ccb1632b 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.6" +!define VERSION "0.4.2.6-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 41826faad..556c8b805 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.6" +#define VERSION "0.4.2.6-dev"

1 0

[tor/release-0.4.2] bump to 0.4.2.6-dev
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit 49cffee6355ce9ab4b95ca60cc237d2a538f6d27 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 30 11:19:16 2020 -0500 bump to 0.4.2.6-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 509ebcf22..cc746407d 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.6]) +AC_INIT([tor],[0.4.2.6-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-01-30"], # for 0.4.2.6 +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-01-30"], # for 0.4.2.6-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 eeb44cf30..2ccb1632b 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.6" +!define VERSION "0.4.2.6-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 41826faad..556c8b805 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.6" +#define VERSION "0.4.2.6-dev"

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 30 Jan '20

30 Jan '20

commit 06df2f51d793ada367a291a9770544b178db2239 Merge: de79264c1 7afb95d3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 30 11:19:55 2020 -0500 Merge branch 'maint-0.4.1' into release-0.4.1 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0