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

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit 078782e0d11e73775c7954671d573ac8eddf3015 Merge: 8f6513d54f 6a01c34bb8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 09:51:27 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 src/test/test_util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.5] Disable message checking for some 32-bit tests about timegm failure.
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit b2d6fed3e90346260efc598f6dcf5581a6f61a0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 09:46:56 2021 -0400 Disable message checking for some 32-bit tests about timegm failure. Since we merged 40383, we don't expect these to give the same warning on every platform. --- src/test/test_util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index ab63344806..fd0e6763e8 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -805,7 +805,7 @@ test_util_time(void *arg) #if SIZEOF_TIME_T == 4 setup_full_capture_of_logs(LOG_WARN); tt_int_op((time_t) -1,OP_EQ, tor_timegm(&a_time)); - expect_single_log_msg_containing("Result does not fit in tor_timegm"); + //expect_single_log_msg_containing("Result does not fit in tor_timegm"); teardown_capture_of_logs(); #elif SIZEOF_TIME_T == 8 t_res = 2178252895UL; @@ -1218,7 +1218,7 @@ test_util_time(void *arg) t_res = 0; CAPTURE(); i = parse_rfc1123_time(timestr, &t_res); - CHECK_TIMEGM_WARNING("does not fit in tor_timegm"); + // CHECK_TIMEGM_WARNING("does not fit in tor_timegm"); tt_int_op(-1,OP_EQ, i); #elif SIZEOF_TIME_T == 8 tt_str_op("Wed, 17 Feb 2038 06:13:20 GMT",OP_EQ, timestr); @@ -1297,7 +1297,7 @@ test_util_time(void *arg) CAPTURE(); i = parse_iso_time("2038-02-17 06:13:20", &t_res); tt_int_op(-1,OP_EQ, i); - CHECK_TIMEGM_WARNING("does not fit in tor_timegm"); + //CHECK_TIMEGM_WARNING("does not fit in tor_timegm"); #elif SIZEOF_TIME_T == 8 i = parse_iso_time("2038-02-17 06:13:20", &t_res); tt_int_op(0,OP_EQ, i); @@ -1480,7 +1480,7 @@ test_util_parse_http_time(void *arg) setup_full_capture_of_logs(LOG_WARN); tt_int_op(0,OP_EQ,parse_http_time("Wed, 17 Feb 2038 06:13:20 GMT", &a_time)); tt_int_op((time_t)-1,OP_EQ, tor_timegm(&a_time)); - expect_single_log_msg_containing("does not fit in tor_timegm"); + //expect_single_log_msg_containing("does not fit in tor_timegm"); teardown_capture_of_logs(); #elif SIZEOF_TIME_T == 8 tt_int_op(0,OP_EQ,parse_http_time("Wed, 17 Feb 2038 06:13:20 GMT", &a_time));

1 0

[tor/release-0.4.6] Disable message checking for some 32-bit tests about timegm failure.
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit b2d6fed3e90346260efc598f6dcf5581a6f61a0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 09:46:56 2021 -0400 Disable message checking for some 32-bit tests about timegm failure. Since we merged 40383, we don't expect these to give the same warning on every platform. --- src/test/test_util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index ab63344806..fd0e6763e8 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -805,7 +805,7 @@ test_util_time(void *arg) #if SIZEOF_TIME_T == 4 setup_full_capture_of_logs(LOG_WARN); tt_int_op((time_t) -1,OP_EQ, tor_timegm(&a_time)); - expect_single_log_msg_containing("Result does not fit in tor_timegm"); + //expect_single_log_msg_containing("Result does not fit in tor_timegm"); teardown_capture_of_logs(); #elif SIZEOF_TIME_T == 8 t_res = 2178252895UL; @@ -1218,7 +1218,7 @@ test_util_time(void *arg) t_res = 0; CAPTURE(); i = parse_rfc1123_time(timestr, &t_res); - CHECK_TIMEGM_WARNING("does not fit in tor_timegm"); + // CHECK_TIMEGM_WARNING("does not fit in tor_timegm"); tt_int_op(-1,OP_EQ, i); #elif SIZEOF_TIME_T == 8 tt_str_op("Wed, 17 Feb 2038 06:13:20 GMT",OP_EQ, timestr); @@ -1297,7 +1297,7 @@ test_util_time(void *arg) CAPTURE(); i = parse_iso_time("2038-02-17 06:13:20", &t_res); tt_int_op(-1,OP_EQ, i); - CHECK_TIMEGM_WARNING("does not fit in tor_timegm"); + //CHECK_TIMEGM_WARNING("does not fit in tor_timegm"); #elif SIZEOF_TIME_T == 8 i = parse_iso_time("2038-02-17 06:13:20", &t_res); tt_int_op(0,OP_EQ, i); @@ -1480,7 +1480,7 @@ test_util_parse_http_time(void *arg) setup_full_capture_of_logs(LOG_WARN); tt_int_op(0,OP_EQ,parse_http_time("Wed, 17 Feb 2038 06:13:20 GMT", &a_time)); tt_int_op((time_t)-1,OP_EQ, tor_timegm(&a_time)); - expect_single_log_msg_containing("does not fit in tor_timegm"); + //expect_single_log_msg_containing("does not fit in tor_timegm"); teardown_capture_of_logs(); #elif SIZEOF_TIME_T == 8 tt_int_op(0,OP_EQ,parse_http_time("Wed, 17 Feb 2038 06:13:20 GMT", &a_time));

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit 6a01c34bb87b8e29aaa884d71939b4536d6bb850 Merge: fd38609ae2 b2d6fed3e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 09:51:27 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 src/test/test_util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.5] Use the correct release date and backport version sources
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit c62d13fd8ff1f3dc6ea2d83f82911408b8de7ef5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 08:25:12 2021 -0400 Use the correct release date and backport version sources --- ChangeLog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd41d33a30..f4e7006ecc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.3.5.16 - 2021-08-13 +Changes in version 0.3.5.16 - 2021-08-16 This version fixes several bugs from earlier versions. o Minor feature (fallbackdir): @@ -8,11 +8,11 @@ Changes in version 0.3.5.16 - 2021-08-13 - Update the geoip files to match the IPFire Location Database, as retrieved on 2021/08/12. - o Minor bugfix (crypto): + o Minor bugfix (crypto, backport from 0.4.6.7): - Disable the unused batch verification feature of ed25519-donna. Fixes bug 40078; bugfix on 0.2.6.1-alpha. Found by Henry de Valence. - o Minor bugfixes (relay, backport from 0.4.6.x): + o Minor bugfixes (relay, backport from 0.4.6.7): - Reduce the compression level for data streaming from HIGH to LOW. Fixes bug 40301; bugfix on 0.3.5.1-alpha.

1 0

[tor/release-0.4.5] Use the correct release date and backport version sources.
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit b6285f5f33e51a1ce09a6ce84e5d47b3a0789f88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 08:25:05 2021 -0400 Use the correct release date and backport version sources. --- ChangeLog | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b0c20ad5c..82631e2673 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.4.5.10 - 2021-08-13 +Changes in version 0.4.5.10 - 2021-08-16 This version fixes several bugs from earlier versions. o Minor feature (fallbackdir): @@ -12,15 +12,15 @@ Changes in version 0.4.5.10 - 2021-08-13 - Enable the deterministic RNG for unit tests that covers the address set bloomfilter-based API's. Fixes bug 40419; bugfix on 0.3.3.2-alpha. - o Minor bugfix (crypto): + o Minor bugfix (crypto, backport from 0.4.6.7): - Disable the unused batch verification feature of ed25519-donna. Fixes bug 40078; bugfix on 0.2.6.1-alpha. Found by Henry de Valence. - o Minor bugfixes (relay, backport from 0.4.6.x): + o Minor bugfixes (relay, backport from 0.4.6.7): - Reduce the compression level for data streaming from HIGH to LOW. Fixes bug 40301; bugfix on 0.3.5.1-alpha. - o Minor bugfixes (timekeeping, backport from 0.4.6.x): + o Minor bugfixes (timekeeping, backport from 0.4.6.7): - Calculate the time of day correctly on systems where the time_t type includes leap seconds. (This is not the case on most operating systems, but on those where it occurs, our tor_timegm @@ -28,7 +28,7 @@ Changes in version 0.4.5.10 - 2021-08-13 which could result in assertion failures when calculating voting schedules.) Fixes bug 40383; bugfix on 0.2.0.3-alpha. - o Minor bugfixes (warnings, portability, backport from 0.4.6.x): + o Minor bugfixes (warnings, portability, backport from 0.4.6.6): - Suppress a strict-prototype warning when building with some versions of NSS. Fixes bug 40409; bugfix on 0.3.5.1-alpha.

1 0

[tor/release-0.4.6] Use the correct release date.
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit 8f6513d54f82fd31e097beec2cbef8a575438573 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 08:25:00 2021 -0400 Use the correct release date. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 431269180b..04dec5a0de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.4.6.7 - 2021-08-13 +Changes in version 0.4.6.7 - 2021-08-16 This version fixes several bugs from earlier versions. o Minor feature (fallbackdir):

1 0

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

16 Aug '21

commit 1667e122def480fac8033fb96057971969a446d5 Merge: ca249131b0 2984fba97a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 08:18:09 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5 "ours" to avoid version bump

1 0

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

16 Aug '21

commit df6a92dcc3e83cebaa9cfe98c52ae9eade218ff2 Merge: 70e249123a 1ec4c7b34a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 08:19:17 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 "ours" to avoid version bump

1 0

[tor/main] Make the version 0.3.6.16, not 0.3.6.16-dev.
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit 2984fba97a03506fb405bdf2c37481a0a7d6cf09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 08:17:59 2021 -0400 Make the version 0.3.6.16, not 0.3.6.16-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 e698bf8901..c45b76e5a6 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.16-dev]) +AC_INIT([tor],[0.3.5.16]) 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 013518457f..c8695bc86c 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.16-dev" +!define VERSION "0.3.5.16" !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 7d73fc4a10..273806fde3 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.16-dev" +#define VERSION "0.3.5.16"

1 0