March 2018 - tor-commits - lists.torproject.org

[tor/master] rust: Fix typo in name of logged function.
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit 1f8bd93ecbb57eb47c5788f4a4d12f3bdee61b47 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 28 23:19:26 2018 +0000 rust: Fix typo in name of logged function. --- src/rust/tor_util/ffi.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rust/tor_util/ffi.rs b/src/rust/tor_util/ffi.rs index a803dae26..32779ed47 100644 --- a/src/rust/tor_util/ffi.rs +++ b/src/rust/tor_util/ffi.rs @@ -20,7 +20,7 @@ pub extern "C" fn rust_log_welcome_string() { tor_log_msg!( LogSeverity::Notice, LogDomain::General, - "rust_welcome_string", + "rust_log_welcome_string", "Tor is running with Rust integration. Please report \ any bugs you encounter." );

1 0

[tor/maint-0.3.3] tests: Fix HS test against max IP lifetime.
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit 66d3120634ad3daffc3394b05ad5f9ef9716c18a Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 19 19:01:17 2018 +0000 tests: Fix HS test against max IP lifetime. * FIXES part of #25450: https://bugs.torproject.org/25450 --- src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 4f5e8ba45..d040f10e0 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -419,8 +419,10 @@ test_service_intro_point(void *arg) * surprisingly slow... */ tt_u64_op(ip->time_to_expire, OP_GE, now + INTRO_POINT_LIFETIME_MIN_SECONDS - 500); + /* We add 500 seconds, because this time we're testing against the + * maximum allowed time. */ tt_u64_op(ip->time_to_expire, OP_LE, - now + INTRO_POINT_LIFETIME_MAX_SECONDS - 500); + now + INTRO_POINT_LIFETIME_MAX_SECONDS + 500); tt_assert(ip->replay_cache); tt_assert(ip->base.link_specifiers); /* By default, this is NOT a legacy object. */

1 0

[tor/maint-0.3.2] tests: Fix HS test against max IP lifetime.
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit 66d3120634ad3daffc3394b05ad5f9ef9716c18a Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 19 19:01:17 2018 +0000 tests: Fix HS test against max IP lifetime. * FIXES part of #25450: https://bugs.torproject.org/25450 --- src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 4f5e8ba45..d040f10e0 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -419,8 +419,10 @@ test_service_intro_point(void *arg) * surprisingly slow... */ tt_u64_op(ip->time_to_expire, OP_GE, now + INTRO_POINT_LIFETIME_MIN_SECONDS - 500); + /* We add 500 seconds, because this time we're testing against the + * maximum allowed time. */ tt_u64_op(ip->time_to_expire, OP_LE, - now + INTRO_POINT_LIFETIME_MAX_SECONDS - 500); + now + INTRO_POINT_LIFETIME_MAX_SECONDS + 500); tt_assert(ip->replay_cache); tt_assert(ip->base.link_specifiers); /* By default, this is NOT a legacy object. */

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit 910422e8fae173f061d016c72eecc2015a09537e Merge: 85719b79b 66d312063 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 19 16:59:49 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/master] tests: Fix HS test against max IP lifetime.
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit 66d3120634ad3daffc3394b05ad5f9ef9716c18a Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 19 19:01:17 2018 +0000 tests: Fix HS test against max IP lifetime. * FIXES part of #25450: https://bugs.torproject.org/25450 --- src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 4f5e8ba45..d040f10e0 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -419,8 +419,10 @@ test_service_intro_point(void *arg) * surprisingly slow... */ tt_u64_op(ip->time_to_expire, OP_GE, now + INTRO_POINT_LIFETIME_MIN_SECONDS - 500); + /* We add 500 seconds, because this time we're testing against the + * maximum allowed time. */ tt_u64_op(ip->time_to_expire, OP_LE, - now + INTRO_POINT_LIFETIME_MAX_SECONDS - 500); + now + INTRO_POINT_LIFETIME_MAX_SECONDS + 500); tt_assert(ip->replay_cache); tt_assert(ip->base.link_specifiers); /* By default, this is NOT a legacy object. */

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit 910422e8fae173f061d016c72eecc2015a09537e Merge: 85719b79b 66d312063 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 19 16:59:49 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit 109c555e9d70dca4c4106d6d9fa0dcebdf0ff7ad Merge: 36154c13f 66d312063 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 19 16:59:49 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit 3716611fea1c400e80ab3cfd19c588e32b1c005c Merge: bc5f79b95 910422e8f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 19 16:59:49 2018 -0400 Merge branch 'maint-0.3.3' src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] tests: Fix HS test against max IP lifetime.
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit 66d3120634ad3daffc3394b05ad5f9ef9716c18a Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 19 19:01:17 2018 +0000 tests: Fix HS test against max IP lifetime. * FIXES part of #25450: https://bugs.torproject.org/25450 --- src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 4f5e8ba45..d040f10e0 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -419,8 +419,10 @@ test_service_intro_point(void *arg) * surprisingly slow... */ tt_u64_op(ip->time_to_expire, OP_GE, now + INTRO_POINT_LIFETIME_MIN_SECONDS - 500); + /* We add 500 seconds, because this time we're testing against the + * maximum allowed time. */ tt_u64_op(ip->time_to_expire, OP_LE, - now + INTRO_POINT_LIFETIME_MAX_SECONDS - 500); + now + INTRO_POINT_LIFETIME_MAX_SECONDS + 500); tt_assert(ip->replay_cache); tt_assert(ip->base.link_specifiers); /* By default, this is NOT a legacy object. */

1 0

[tor/release-0.3.3] tests: Fix HS test against max IP lifetime.
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit 66d3120634ad3daffc3394b05ad5f9ef9716c18a Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 19 19:01:17 2018 +0000 tests: Fix HS test against max IP lifetime. * FIXES part of #25450: https://bugs.torproject.org/25450 --- src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 4f5e8ba45..d040f10e0 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -419,8 +419,10 @@ test_service_intro_point(void *arg) * surprisingly slow... */ tt_u64_op(ip->time_to_expire, OP_GE, now + INTRO_POINT_LIFETIME_MIN_SECONDS - 500); + /* We add 500 seconds, because this time we're testing against the + * maximum allowed time. */ tt_u64_op(ip->time_to_expire, OP_LE, - now + INTRO_POINT_LIFETIME_MAX_SECONDS - 500); + now + INTRO_POINT_LIFETIME_MAX_SECONDS + 500); tt_assert(ip->replay_cache); tt_assert(ip->base.link_specifiers); /* By default, this is NOT a legacy object. */

1 0