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

[tor/main] Merge branch 'maint-0.3.5' into maint-0.4.5
by dgoulet＠torproject.org 13 Aug '21

13 Aug '21

commit ca249131b050fbd6ca7496f98abdeaa3cd5720f9 Merge: 685b3e4383 041a0a362f Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Aug 13 09:44:53 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5

1 0

[tor/main] Update version to 0.3.5.16
by dgoulet＠torproject.org 13 Aug '21

13 Aug '21

commit 041a0a362fb9dc7946774fef736632da05ed8940 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Aug 13 09:43:44 2021 -0400 Update version to 0.3.5.16 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 89ccbc5807..e698bf8901 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.15-dev]) +AC_INIT([tor],[0.3.5.16-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 234971e178..013518457f 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.15-dev" +!define VERSION "0.3.5.16-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 c97889ce46..7d73fc4a10 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.15-dev" +#define VERSION "0.3.5.16-dev"

1 0

[tor/main] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 13 Aug '21

13 Aug '21

commit 70e249123a8b434406a48046e62b2d3b2ac7fb22 Merge: 07c417b207 ca249131b0 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Aug 13 09:46:31 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6

1 0

[tor/main] Merge branch 'maint-0.4.6'
by dgoulet＠torproject.org 13 Aug '21

13 Aug '21

commit 6260db5733582411d3fc2ee92dd58a95b16aeab7 Merge: 4252744788 70e249123a Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Aug 13 09:46:48 2021 -0400 Merge branch 'maint-0.4.6'

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5
by dgoulet＠torproject.org 13 Aug '21

13 Aug '21

commit ca249131b050fbd6ca7496f98abdeaa3cd5720f9 Merge: 685b3e4383 041a0a362f Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Aug 13 09:44:53 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5

1 0

[tor/maint-0.3.5] Update version to 0.3.5.16
by dgoulet＠torproject.org 13 Aug '21

13 Aug '21

commit 041a0a362fb9dc7946774fef736632da05ed8940 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Aug 13 09:43:44 2021 -0400 Update version to 0.3.5.16 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 89ccbc5807..e698bf8901 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.15-dev]) +AC_INIT([tor],[0.3.5.16-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 234971e178..013518457f 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.15-dev" +!define VERSION "0.3.5.16-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 c97889ce46..7d73fc4a10 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.15-dev" +#define VERSION "0.3.5.16-dev"

1 0

[tor/maint-0.4.5] Update version to 0.3.5.16
by dgoulet＠torproject.org 13 Aug '21

13 Aug '21

commit 041a0a362fb9dc7946774fef736632da05ed8940 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Aug 13 09:43:44 2021 -0400 Update version to 0.3.5.16 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 89ccbc5807..e698bf8901 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.15-dev]) +AC_INIT([tor],[0.3.5.16-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 234971e178..013518457f 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.15-dev" +!define VERSION "0.3.5.16-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 c97889ce46..7d73fc4a10 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.15-dev" +#define VERSION "0.3.5.16-dev"

1 0

[tor/maint-0.4.5] Update version to 0.4.5.10
by dgoulet＠torproject.org 13 Aug '21

13 Aug '21

commit 685b3e4383ce3a0f51aafa963d457cc4bffe15cb Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Aug 13 09:42:52 2021 -0400 Update version to 0.4.5.10 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- 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 49117922e0..cd38240a34 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.5.9-dev]) +AC_INIT([tor],[0.4.5.10-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, ["2021-06-14"], # for 0.4.5.9-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-08-13"], # for 0.4.5.10-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 7e7f0fdd19..9b9172fb90 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.9-dev" +!define VERSION "0.4.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 ffe7c65ba4..070d62c9b8 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.9-dev" +#define VERSION "0.4.5.10-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/maint-0.4.6] Update version to 0.3.5.16
by dgoulet＠torproject.org 13 Aug '21

13 Aug '21

commit 041a0a362fb9dc7946774fef736632da05ed8940 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Aug 13 09:43:44 2021 -0400 Update version to 0.3.5.16 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 89ccbc5807..e698bf8901 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.15-dev]) +AC_INIT([tor],[0.3.5.16-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 234971e178..013518457f 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.15-dev" +!define VERSION "0.3.5.16-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 c97889ce46..7d73fc4a10 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.15-dev" +#define VERSION "0.3.5.16-dev"

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 13 Aug '21

13 Aug '21

commit 70e249123a8b434406a48046e62b2d3b2ac7fb22 Merge: 07c417b207 ca249131b0 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Aug 13 09:46:31 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6

1 0