December 2019 - tor-commits - lists.torproject.org

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by nickm＠torproject.org 05 Dec '19

05 Dec '19

commit c3a3539da82177e41275dd8a2761b43b75fd7a9c Merge: 948e9bf6c e66533bef Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 5 13:33:04 2019 -0500 Merge branch 'maint-0.4.0' into release-0.4.0 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/master] bump version to 0.4.1.7
by nickm＠torproject.org 05 Dec '19

05 Dec '19

commit 8933c7908d9d894f50d46c7962457fa512190e1b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 5 13:31:46 2019 -0500 bump version to 0.4.1.7 --- 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 7bdd195e6..3725235e0 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.6-dev]) +AC_INIT([tor],[0.4.1.7]) 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, ["2019-09-19"], # for 0.4.1.6-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.1.7 [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 32f7692f1..c3c14186d 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.6-dev" +!define VERSION "0.4.1.7" !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 78370ae0a..cbf6217dd 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.6-dev" +#define VERSION "0.4.1.7"

1 0

[tor/release-0.4.1] Bump version to 0.3.5.9
by nickm＠torproject.org 05 Dec '19

05 Dec '19

commit c53567c36f2ea55e4b3be2ce5cff06e0eddde5e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 5 13:29:49 2019 -0500 Bump version to 0.3.5.9 --- 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 52cc877db..15b66eef6 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.8-dev]) +AC_INIT([tor],[0.3.5.9]) 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 9d82c5c3d..32d468e79 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.8-dev" +!define VERSION "0.3.5.9" !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 8512da128..6d1801f85 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.8-dev" +#define VERSION "0.3.5.9"

1 0

[tor/release-0.4.2] Bump version to 0.3.5.9
by nickm＠torproject.org 05 Dec '19

05 Dec '19

commit c53567c36f2ea55e4b3be2ce5cff06e0eddde5e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 5 13:29:49 2019 -0500 Bump version to 0.3.5.9 --- 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 52cc877db..15b66eef6 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.8-dev]) +AC_INIT([tor],[0.3.5.9]) 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 9d82c5c3d..32d468e79 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.8-dev" +!define VERSION "0.3.5.9" !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 8512da128..6d1801f85 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.8-dev" +#define VERSION "0.3.5.9"

1 0

[tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 05 Dec '19

05 Dec '19

commit 371d7dbc1a1c8e4cacd80641066d01ba54be197e Merge: 92fb09906 c53567c36 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 5 13:30:32 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 "ours" to avoid version bump.

1 0

[tor/release-0.4.2] bump version to 0.4.1.7
by nickm＠torproject.org 05 Dec '19

05 Dec '19

commit 8933c7908d9d894f50d46c7962457fa512190e1b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 5 13:31:46 2019 -0500 bump version to 0.4.1.7 --- 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 7bdd195e6..3725235e0 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.6-dev]) +AC_INIT([tor],[0.4.1.7]) 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, ["2019-09-19"], # for 0.4.1.6-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.1.7 [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 32f7692f1..c3c14186d 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.6-dev" +!define VERSION "0.4.1.7" !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 78370ae0a..cbf6217dd 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.6-dev" +#define VERSION "0.4.1.7"

1 0

[tor/release-0.4.1] Bump to 0.4.0.6
by nickm＠torproject.org 05 Dec '19

05 Dec '19

commit e66533befae9c61dad4a2905147c048c2ff17da0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 5 13:31:01 2019 -0500 Bump to 0.4.0.6 --- 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 4b69b3c89..d66dd6db0 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.0.5-dev]) +AC_INIT([tor],[0.4.0.6]) 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, ["2019-05-02"], # for 0.4.0.5-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.0.6 [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 7b3cf2116..29674dee4 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.0.5-dev" +!define VERSION "0.4.0.6" !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 adac42268..fa1bc6814 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.0.5-dev" +#define VERSION "0.4.0.6"

1 0

[tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 05 Dec '19

05 Dec '19

commit 371d7dbc1a1c8e4cacd80641066d01ba54be197e Merge: 92fb09906 c53567c36 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 5 13:30:32 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 "ours" to avoid version bump.

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
by nickm＠torproject.org 05 Dec '19

05 Dec '19

commit db1065403ddabacd7c67273bff30f027151fb142 Merge: cfa9cc34a e66533bef Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 5 13:31:17 2019 -0500 Merge branch 'maint-0.4.0' into maint-0.4.1 "ours" to avoid version bump.

1 0

[tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 05 Dec '19

05 Dec '19

commit 371d7dbc1a1c8e4cacd80641066d01ba54be197e Merge: 92fb09906 c53567c36 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 5 13:30:32 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 "ours" to avoid version bump.

1 0