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

[tor/master] Merge branch 'maint-0.4.4' into master
by nickm＠torproject.org 12 Nov '20

12 Nov '20

commit dde6b8906f9b26f594e24a4ebe75d38893a4fd76 Merge: 4806aa5da8 3f1544bbd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 12 08:13:26 2020 -0500 Merge branch 'maint-0.4.4' into master "ours" to avoid version bump.

1 0

[tor/release-0.3.5] Bump to 0.3.5.12-dev
by nickm＠torproject.org 12 Nov '20

12 Nov '20

commit 862c44e4ec4db4fba19468558c2e2a3c1ecbbb7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 12 08:11:01 2020 -0500 Bump to 0.3.5.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 e7b1bc4d94..642e4cf09c 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.12]) +AC_INIT([tor],[0.3.5.12-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 374a503698..37a0e1e93b 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.12" +!define VERSION "0.3.5.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 5d2d321caf..e67ff13b13 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.12" +#define VERSION "0.3.5.12-dev"

1 0

[tor/release-0.4.3] Bump to 0.3.5.12-dev
by nickm＠torproject.org 12 Nov '20

12 Nov '20

commit 862c44e4ec4db4fba19468558c2e2a3c1ecbbb7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 12 08:11:01 2020 -0500 Bump to 0.3.5.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 e7b1bc4d94..642e4cf09c 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.12]) +AC_INIT([tor],[0.3.5.12-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 374a503698..37a0e1e93b 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.12" +!define VERSION "0.3.5.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 5d2d321caf..e67ff13b13 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.12" +#define VERSION "0.3.5.12-dev"

1 0

[tor/release-0.4.4] Bump to 0.3.5.12-dev
by nickm＠torproject.org 12 Nov '20

12 Nov '20

commit 862c44e4ec4db4fba19468558c2e2a3c1ecbbb7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 12 08:11:01 2020 -0500 Bump to 0.3.5.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 e7b1bc4d94..642e4cf09c 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.12]) +AC_INIT([tor],[0.3.5.12-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 374a503698..37a0e1e93b 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.12" +!define VERSION "0.3.5.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 5d2d321caf..e67ff13b13 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.12" +#define VERSION "0.3.5.12-dev"

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 12 Nov '20

12 Nov '20

commit 1cd40f532efadf716f1ce63f21e22730d40614c8 Merge: a0b827eb5b 862c44e4ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 12 08:13:37 2020 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 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.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3
by nickm＠torproject.org 12 Nov '20

12 Nov '20

commit 1fa90a2077af46ba27c34cb45b962e5e48931284 Merge: 3d3dc08ed8 862c44e4ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 12 08:11:20 2020 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 "ours" to avoid version bump.

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 12 Nov '20

12 Nov '20

commit 09b4c73fe499c185bcdddb40e949185a51003d40 Merge: 494ced690d fd22fa183b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 12 08:12:20 2020 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 "ours" to avoid version bump.

1 0

[tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.3
by nickm＠torproject.org 12 Nov '20

12 Nov '20

commit 1fa90a2077af46ba27c34cb45b962e5e48931284 Merge: 3d3dc08ed8 862c44e4ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 12 08:11:20 2020 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 "ours" to avoid version bump.

1 0

[tor/release-0.4.4] Bump to 0.4.3.7-dev
by nickm＠torproject.org 12 Nov '20

12 Nov '20

commit fd22fa183befb2976aff042a4a2b052938c33b03 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 12 08:12:11 2020 -0500 Bump to 0.4.3.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 61cdaff8e6..921e2f197e 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.3.7]) +AC_INIT([tor],[0.4.3.7-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -16,7 +16,7 @@ configure_flags="$*" # 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-11-09"], # for 0.4.3.7 +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-11-12"], # for 0.4.3.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 9b66743ce7..e3f8be0b86 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.3.7" +!define VERSION "0.4.3.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 562d6e77c7..cfeffe581c 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.3.7" +#define VERSION "0.4.3.7-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.4] Bump to 0.4.4.6-dev
by nickm＠torproject.org 12 Nov '20

12 Nov '20

commit 3f1544bbd9e24e2a469c97568bcc6c1feb7e8f05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 12 08:13:07 2020 -0500 Bump to 0.4.4.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 660eed58b8..39d2470ee3 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.4.6]) +AC_INIT([tor],[0.4.4.6-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -16,7 +16,7 @@ configure_flags="$*" # 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-11-09"], # for 0.4.4.6 +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-11-12"], # for 0.4.4.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 b4de2f38fc..0c6cd5b2f9 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.4.6" +!define VERSION "0.4.4.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 1c2ed972a7..c2c67b9639 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.4.6" +#define VERSION "0.4.4.6-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0