October 2021 - tor-commits - lists.torproject.org

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit e0a96cf2b6d2c21e0c8db0a285c0a86286e47821 Merge: e51b25c02d fa438b6cf0 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 09:42:43 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.5] version: Missing version update in couple files
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit fa438b6cf023df22e78dc2640bcd00da7d08846c Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 09:40:50 2021 -0400 version: Missing version update in couple files Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 7a6566a2c3..1815f65e98 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.17" +!define VERSION "0.3.5.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 f32c725b07..8170b1bcb4 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.17" +#define VERSION "0.3.5.17-dev"

1 0

[tor/release-0.4.5] version: Missing version update in couple files
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit 97c976778aa67f7bdb021904041bece17a8f58c5 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 09:41:13 2021 -0400 version: Missing version update in couple files Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- 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 c602d2c5c9..52ec019d01 100644 --- a/configure.ac +++ b/configure.ac @@ -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, ["2021-10-26"], # for 0.4.5.11 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-28"], # for 0.4.5.11-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 afcea51596..5e09f0045b 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.5.11" +!define VERSION "0.4.5.11-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 5b8c9a635e..3d3b6ba03e 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.5.11" +#define VERSION "0.4.5.11-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.6] version: Missing version update in couple files
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit fa438b6cf023df22e78dc2640bcd00da7d08846c Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 09:40:50 2021 -0400 version: Missing version update in couple files Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 7a6566a2c3..1815f65e98 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.17" +!define VERSION "0.3.5.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 f32c725b07..8170b1bcb4 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.17" +#define VERSION "0.3.5.17-dev"

1 0

[tor/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit 7c4fd150cd19ebdafe64b800282184014b43d9fb Merge: 97c976778a fa438b6cf0 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 09:42:25 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5

1 0

[tor/release-0.4.6] version: Missing version update in couple files
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit 97c976778aa67f7bdb021904041bece17a8f58c5 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 09:41:13 2021 -0400 version: Missing version update in couple files Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- 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 c602d2c5c9..52ec019d01 100644 --- a/configure.ac +++ b/configure.ac @@ -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, ["2021-10-26"], # for 0.4.5.11 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-28"], # for 0.4.5.11-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 afcea51596..5e09f0045b 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.5.11" +!define VERSION "0.4.5.11-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 5b8c9a635e..3d3b6ba03e 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.5.11" +#define VERSION "0.4.5.11-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit 7c4fd150cd19ebdafe64b800282184014b43d9fb Merge: 97c976778a fa438b6cf0 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 09:42:25 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit fa405ca27f1aa00d0319ce0bbc99aff99a96e093 Merge: 27caad6f5c 7c4fd150cd Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 09:42:32 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit fb2b8339cb6badc48b0956f1d93aeb818e21e52c Merge: 19b6196f67 7c4fd150cd Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 09:42:43 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.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.6] Merge branch 'maint-0.4.6' into release-0.4.6
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit d4f68f1c69cf53d3be71a6111c8a13049dae2a36 Merge: c8872ca88a fa405ca27f Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 09:42:43 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0