- tor-commits - lists.torproject.org

[tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 15 May '20

15 May '20

commit bcaf480aee37daf624e9e93077ae1274581a029e Merge: c0dd2a6e3 e75583e71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 10:25:27 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] bump to 0.4.3.5-dev
by nickm＠torproject.org 15 May '20

15 May '20

commit c0dd2a6e398c647ed7e219a9577a9864f48aba1a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 09:02:12 2020 -0400 bump to 0.4.3.5-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 1ac4db84d..cb552ea94 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.5]) +AC_INIT([tor],[0.4.3.5-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-05-14"], # for 0.4.3.5 +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-05-15"], # for 0.4.3.5-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 53dbbe90f..efb64327f 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.5" +!define VERSION "0.4.3.5-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 ee5c48b44..9e18ee9fa 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.5" +#define VERSION "0.4.3.5-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/master] Merge branch 'maint-0.4.3'
by nickm＠torproject.org 15 May '20

15 May '20

commit 8d59897e58ab5c79cf7b981d05b8244a68eaf9ac Merge: 85cfd04c0 c0dd2a6e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 09:02:30 2020 -0400 Merge branch 'maint-0.4.3' "ours" to avoid version bump

1 0

[tor/master] Fix use of non-portable == in configure.ac.
by nickm＠torproject.org 15 May '20

15 May '20

commit a59d54756f9b369fefdc7ca84c432d8873264f42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 09:58:49 2020 -0400 Fix use of non-portable == in configure.ac. Fixes bug 34233. (This has bug has been backported to 0.3.5, but only released in 0.4.3, so it only needs a changes file there.) --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a441162f4..5f66d8c37 100644 --- a/configure.ac +++ b/configure.ac @@ -368,7 +368,7 @@ AC_CACHE_CHECK([for __attribute__((fallthrough))], [tor_cv_c_attr_fallthrough=no] )]) CFLAGS="$saved_CFLAGS" -if test "$tor_cv_c_attr_fallthrough" == "yes"; then +if test "$tor_cv_c_attr_fallthrough" = "yes"; then AC_DEFINE(HAVE_ATTR_FALLTHROUGH, [1], [defined if we have the fallthrough attribute.]) fi

1 0

[tor/maint-0.3.5] Fix use of non-portable == in configure.ac.
by nickm＠torproject.org 15 May '20

15 May '20

commit a59d54756f9b369fefdc7ca84c432d8873264f42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 09:58:49 2020 -0400 Fix use of non-portable == in configure.ac. Fixes bug 34233. (This has bug has been backported to 0.3.5, but only released in 0.4.3, so it only needs a changes file there.) --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a441162f4..5f66d8c37 100644 --- a/configure.ac +++ b/configure.ac @@ -368,7 +368,7 @@ AC_CACHE_CHECK([for __attribute__((fallthrough))], [tor_cv_c_attr_fallthrough=no] )]) CFLAGS="$saved_CFLAGS" -if test "$tor_cv_c_attr_fallthrough" == "yes"; then +if test "$tor_cv_c_attr_fallthrough" = "yes"; then AC_DEFINE(HAVE_ATTR_FALLTHROUGH, [1], [defined if we have the fallthrough attribute.]) fi

1 0

[tor/maint-0.4.3] Add a changes file for 34233.
by nickm＠torproject.org 15 May '20

15 May '20

commit 6f2b6ede1b6b70301cfd033060f999d561f57364 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 10:27:49 2020 -0400 Add a changes file for 34233. This bug was merged back to 0.3.5 with our #34078 fix, but only released in 0.4.3.5, so the changes file goes here. --- changes/bug34233 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug34233 b/changes/bug34233 new file mode 100644 index 000000000..24c786978 --- /dev/null +++ b/changes/bug34233 @@ -0,0 +1,4 @@ + o Minor bugfixes (portability): + - Fix a portability error in the configure script, where we + were using "==" instead of "=". Fixes bug 34233; bugfix on + 0.4.3.5.

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 15 May '20

15 May '20

commit e75583e71bf87ce6d40a801396cf3def39a60c45 Merge: b8bff426f 768ffb8f4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 10:25:27 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.1
by nickm＠torproject.org 15 May '20

15 May '20

commit 768ffb8f43575baac0970659b01e0a484d6bd6de Merge: 72312cdbb a59d54756 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 10:25:27 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.4.3] Fix use of non-portable == in configure.ac.
by nickm＠torproject.org 15 May '20

15 May '20

commit a59d54756f9b369fefdc7ca84c432d8873264f42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 09:58:49 2020 -0400 Fix use of non-portable == in configure.ac. Fixes bug 34233. (This has bug has been backported to 0.3.5, but only released in 0.4.3, so it only needs a changes file there.) --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a441162f4..5f66d8c37 100644 --- a/configure.ac +++ b/configure.ac @@ -368,7 +368,7 @@ AC_CACHE_CHECK([for __attribute__((fallthrough))], [tor_cv_c_attr_fallthrough=no] )]) CFLAGS="$saved_CFLAGS" -if test "$tor_cv_c_attr_fallthrough" == "yes"; then +if test "$tor_cv_c_attr_fallthrough" = "yes"; then AC_DEFINE(HAVE_ATTR_FALLTHROUGH, [1], [defined if we have the fallthrough attribute.]) fi

1 0

[tor/maint-0.4.3] bump to 0.4.3.5-dev
by nickm＠torproject.org 15 May '20

15 May '20

commit c0dd2a6e398c647ed7e219a9577a9864f48aba1a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 09:02:12 2020 -0400 bump to 0.4.3.5-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 1ac4db84d..cb552ea94 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.5]) +AC_INIT([tor],[0.4.3.5-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-05-14"], # for 0.4.3.5 +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-05-15"], # for 0.4.3.5-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 53dbbe90f..efb64327f 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.5" +!define VERSION "0.4.3.5-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 ee5c48b44..9e18ee9fa 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.5" +#define VERSION "0.4.3.5-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0