April 2019 - tor-commits - lists.torproject.org

[tor/release-0.4.0] Bug #29500: Fix monotime mocking in circpad unittests.
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit b733044f7a41d65b6f3937056e9499613218ab0b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Apr 5 00:21:07 2019 +0000 Bug #29500: Fix monotime mocking in circpad unittests. Our monotime mocking forces us to call monotime_init() *before* we set the mocked time value. monotime_init() thus stores the first ratchet value at whatever the platform is at, and then we set fake mocked time to some later value. If monotime_init() gets a value from the host that is greater than what we choose to mock time at for our unittests, all subsequent monotime_abosolute() calls return zero, which breaks all unittests that depend on time moving forward by updating mocked monotime values. So, we need to adjust our mocked time to take the weird monotime_init() time into account, when we set fake time. --- src/test/test_circuitpadding.c | 62 ++++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 21 deletions(-) diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c index cd150b064..6272c0c2a 100644 --- a/src/test/test_circuitpadding.c +++ b/src/test/test_circuitpadding.c @@ -31,6 +31,12 @@ #include "core/or/or_circuit_st.h" #include "core/or/origin_circuit_st.h" +/* Start our monotime mocking at 1 second past whatever monotime_init() + * thought the actual wall clock time was, for platforms with bad resolution + * and weird timevalues during monotime_init() before mocking. */ +#define MONOTIME_MOCK_START (monotime_absolute_nsec()+\ + TOR_NSEC_PER_USEC*TOR_USEC_PER_SEC) + extern smartlist_t *connection_array; circid_t get_unique_circ_id_by_chan(channel_t *chan); @@ -287,6 +293,7 @@ test_circuitpadding_rtt(void *arg) * 3. Test client side circuit and non-application of RTT.. */ circpad_delay_t rtt_estimate; + int64_t actual_mocked_monotime_start; (void)arg; MOCK(circuitmux_attach_circuit, circuitmux_attach_circuit_mock); @@ -300,9 +307,10 @@ test_circuitpadding_rtt(void *arg) monotime_init(); monotime_enable_test_mocking(); - monotime_set_mock_time_nsec(1000*TOR_NSEC_PER_USEC); - monotime_coarse_set_mock_time_nsec(1000*TOR_NSEC_PER_USEC); - curr_mocked_time = 1000*TOR_NSEC_PER_USEC; + actual_mocked_monotime_start = MONOTIME_MOCK_START; + monotime_set_mock_time_nsec(actual_mocked_monotime_start); + monotime_coarse_set_mock_time_nsec(actual_mocked_monotime_start); + curr_mocked_time = actual_mocked_monotime_start; timers_initialize(); circpad_machines_init(); @@ -963,6 +971,7 @@ test_circuitpadding_tokens(void *arg) { const circpad_state_t *state; circpad_machine_state_t *mi; + int64_t actual_mocked_monotime_start; (void)arg; /** Test plan: @@ -990,9 +999,10 @@ test_circuitpadding_tokens(void *arg) monotime_init(); monotime_enable_test_mocking(); - monotime_set_mock_time_nsec(1000*TOR_NSEC_PER_USEC); - monotime_coarse_set_mock_time_nsec(1000*TOR_NSEC_PER_USEC); - curr_mocked_time = 1000*TOR_NSEC_PER_USEC; + actual_mocked_monotime_start = MONOTIME_MOCK_START; + monotime_set_mock_time_nsec(actual_mocked_monotime_start); + monotime_coarse_set_mock_time_nsec(actual_mocked_monotime_start); + curr_mocked_time = actual_mocked_monotime_start; timers_initialize(); @@ -1235,6 +1245,7 @@ test_circuitpadding_wronghop(void *arg) cell_t cell; signed_error_t ret; origin_circuit_t *orig_client; + int64_t actual_mocked_monotime_start; MOCK(circuitmux_attach_circuit, circuitmux_attach_circuit_mock); @@ -1254,9 +1265,10 @@ test_circuitpadding_wronghop(void *arg) monotime_init(); monotime_enable_test_mocking(); - monotime_set_mock_time_nsec(1000*TOR_NSEC_PER_USEC); - monotime_coarse_set_mock_time_nsec(1000*TOR_NSEC_PER_USEC); - curr_mocked_time = 1000*TOR_NSEC_PER_USEC; + actual_mocked_monotime_start = MONOTIME_MOCK_START; + monotime_set_mock_time_nsec(actual_mocked_monotime_start); + monotime_coarse_set_mock_time_nsec(actual_mocked_monotime_start); + curr_mocked_time = actual_mocked_monotime_start; timers_initialize(); circpad_machines_init(); @@ -1427,6 +1439,7 @@ test_circuitpadding_negotiation(void *arg) * a. Make sure padding negotiation is not sent * 3. Test failure to negotiate a machine due to desync. */ + int64_t actual_mocked_monotime_start; (void)arg; MOCK(circuitmux_attach_circuit, circuitmux_attach_circuit_mock); @@ -1441,9 +1454,10 @@ test_circuitpadding_negotiation(void *arg) monotime_init(); monotime_enable_test_mocking(); - monotime_set_mock_time_nsec(1000*TOR_NSEC_PER_USEC); - monotime_coarse_set_mock_time_nsec(1000*TOR_NSEC_PER_USEC); - curr_mocked_time = 1000*TOR_NSEC_PER_USEC; + actual_mocked_monotime_start = MONOTIME_MOCK_START; + monotime_set_mock_time_nsec(actual_mocked_monotime_start); + monotime_coarse_set_mock_time_nsec(actual_mocked_monotime_start); + curr_mocked_time = actual_mocked_monotime_start; timers_initialize(); circpad_machines_init(); @@ -1703,6 +1717,7 @@ test_circuitpadding_conditions(void *arg) * 2. Test marking a circuit before padding callback fires * 3. Test freeing a circuit before padding callback fires */ + int64_t actual_mocked_monotime_start; (void)arg; MOCK(circuitmux_attach_circuit, circuitmux_attach_circuit_mock); @@ -1716,9 +1731,10 @@ test_circuitpadding_conditions(void *arg) monotime_init(); monotime_enable_test_mocking(); - monotime_set_mock_time_nsec(1000*TOR_NSEC_PER_USEC); - monotime_coarse_set_mock_time_nsec(1000*TOR_NSEC_PER_USEC); - curr_mocked_time = 1000*TOR_NSEC_PER_USEC; + actual_mocked_monotime_start = MONOTIME_MOCK_START; + monotime_set_mock_time_nsec(actual_mocked_monotime_start); + monotime_coarse_set_mock_time_nsec(actual_mocked_monotime_start); + curr_mocked_time = actual_mocked_monotime_start; timers_initialize(); helper_create_conditional_machines(); @@ -1813,6 +1829,7 @@ test_circuitpadding_conditions(void *arg) void test_circuitpadding_circuitsetup_machine(void *arg) { + int64_t actual_mocked_monotime_start; /** * Test case plan: * @@ -1838,9 +1855,10 @@ test_circuitpadding_circuitsetup_machine(void *arg) monotime_init(); monotime_enable_test_mocking(); - monotime_set_mock_time_nsec(1*TOR_NSEC_PER_USEC); - monotime_coarse_set_mock_time_nsec(1*TOR_NSEC_PER_USEC); - curr_mocked_time = 1*TOR_NSEC_PER_USEC; + actual_mocked_monotime_start = MONOTIME_MOCK_START; + monotime_set_mock_time_nsec(actual_mocked_monotime_start); + monotime_coarse_set_mock_time_nsec(actual_mocked_monotime_start); + curr_mocked_time = actual_mocked_monotime_start; timers_initialize(); circpad_machines_init(); @@ -2250,6 +2268,7 @@ test_circuitpadding_global_rate_limiting(void *arg) bool retval; circpad_machine_state_t *mi; int i; + int64_t actual_mocked_monotime_start; /* Ignore machine transitions for the purposes of this function, we only * really care about padding counts */ @@ -2261,9 +2280,10 @@ test_circuitpadding_global_rate_limiting(void *arg) monotime_init(); monotime_enable_test_mocking(); - monotime_set_mock_time_nsec(1000*TOR_NSEC_PER_USEC); - monotime_coarse_set_mock_time_nsec(1000*TOR_NSEC_PER_USEC); - curr_mocked_time = 1000*TOR_NSEC_PER_USEC; + actual_mocked_monotime_start = MONOTIME_MOCK_START; + monotime_set_mock_time_nsec(actual_mocked_monotime_start); + monotime_coarse_set_mock_time_nsec(actual_mocked_monotime_start); + curr_mocked_time = actual_mocked_monotime_start; timers_initialize(); client_side = (circuit_t *)origin_circuit_new();

1 0

[tor/release-0.4.0] Merge branch 'tor-github/pr/906' into maint-0.4.0
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit 071a000d67577a950b6a4404c3cf35bd90de3654 Merge: 2cc3c98bc da678213e Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Apr 5 16:44:59 2019 +0300 Merge branch 'tor-github/pr/906' into maint-0.4.0 changes/bug29500 | 3 + src/core/or/circuitpadding.c | 3 +- src/test/test_circuitpadding.c | 313 ++++++----------------------------------- 3 files changed, 45 insertions(+), 274 deletions(-)

1 0

[tor/release-0.4.0] circuitpadding: comment fixes
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit da678213e00cfe54ccc80286bed2b36603bba115 Author: teor <teor(a)torproject.org> Date: Wed Apr 3 13:40:06 2019 +1000 circuitpadding: comment fixes --- src/core/or/circuitpadding.c | 3 ++- src/test/test_circuitpadding.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index ba6bfe1f5..0e3dc502c 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -1466,7 +1466,8 @@ circpad_estimate_circ_rtt_on_send(circuit_t *circ, /* If the old RTT estimate is lower than this one, use this one, because * the circuit is getting longer. If this estimate is somehow - * faster than the previous, then maybe that was network jitter. + * faster than the previous, then maybe that was network jitter, or a + * bad monotonic clock source (so our ratchet returned a zero delta). * In that case, average them. */ if (mi->rtt_estimate_usec < (circpad_delay_t)rtt_time) { mi->rtt_estimate_usec = (circpad_delay_t)rtt_time; diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c index ed048ab96..09a4c9a0c 100644 --- a/src/test/test_circuitpadding.c +++ b/src/test/test_circuitpadding.c @@ -576,7 +576,7 @@ test_circuitpadding_token_removal_higher(void *arg) } } - /* Check that all lowe bins are not touched */ + /* Check that all lower bins are not touched */ for (i=0; i < 4 ; i++) { tt_int_op(mi->histogram[i], OP_EQ, 2); }

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit 8a158b82ba8a36ab32508a3d941270fd32e6939b Merge: 0ba45b297 071a000d6 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Apr 5 16:45:36 2019 +0300 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug29500 | 3 + src/core/or/circuitpadding.c | 3 +- src/test/test_circuitpadding.c | 313 ++++++----------------------------------- 3 files changed, 45 insertions(+), 274 deletions(-)

1 0

[tor/release-0.4.0] test/circuitpadding: Delete circuitpadding_circuitsetup_machine()
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit 387d9448de4c5044800706b4ed21b48b4426cb7e Author: teor <teor(a)torproject.org> Date: Tue Apr 2 19:56:38 2019 +1000 test/circuitpadding: Delete circuitpadding_circuitsetup_machine() This test was disabled in 0.4.0 and later, but the fix in #29298 was only merged to 0.4.1. So this test will never be re-enabled in 0.4.0. Part of 29500. --- src/test/test_circuitpadding.c | 253 ----------------------------------------- 1 file changed, 253 deletions(-) diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c index 6272c0c2a..ed048ab96 100644 --- a/src/test/test_circuitpadding.c +++ b/src/test/test_circuitpadding.c @@ -1824,257 +1824,6 @@ test_circuitpadding_conditions(void *arg) return; } -/** Disabled unstable test until #29298 is implemented (see #29122) */ -#if 0 -void -test_circuitpadding_circuitsetup_machine(void *arg) -{ - int64_t actual_mocked_monotime_start; - /** - * Test case plan: - * - * 1. Simulate a normal circuit setup pattern - * a. Application traffic - * - * FIXME: This should focus more on exercising the machine - * features rather than actual traffic patterns. For example, - * test cancellation and bins empty/refill - */ - (void)arg; - - MOCK(circuitmux_attach_circuit, circuitmux_attach_circuit_mock); - - dummy_channel.cmux = circuitmux_alloc(); - client_side = TO_CIRCUIT(origin_circuit_new()); - relay_side = TO_CIRCUIT(new_fake_orcirc(&dummy_channel, &dummy_channel)); - - relay_side->purpose = CIRCUIT_PURPOSE_OR; - client_side->purpose = CIRCUIT_PURPOSE_C_GENERAL; - - nodes_init(); - - monotime_init(); - monotime_enable_test_mocking(); - actual_mocked_monotime_start = MONOTIME_MOCK_START; - monotime_set_mock_time_nsec(actual_mocked_monotime_start); - monotime_coarse_set_mock_time_nsec(actual_mocked_monotime_start); - curr_mocked_time = actual_mocked_monotime_start; - - timers_initialize(); - circpad_machines_init(); - - MOCK(circuit_package_relay_cell, - circuit_package_relay_cell_mock); - MOCK(node_get_by_id, - node_get_by_id_mock); - - /* Test case #1: Build a 3 hop circuit, then wait and let pad */ - simulate_single_hop_extend(client_side, relay_side, 1); - simulate_single_hop_extend(client_side, relay_side, 1); - simulate_single_hop_extend(client_side, relay_side, 1); - - tt_int_op(n_client_cells, OP_EQ, 1); - tt_int_op(n_relay_cells, OP_EQ, 1); - tt_int_op(client_side->padding_info[0]->current_state, OP_EQ, - CIRCPAD_STATE_BURST); - tt_int_op(relay_side->padding_info[0]->current_state, OP_EQ, - CIRCPAD_STATE_BURST); - - tt_u64_op(client_side->padding_info[0]->padding_scheduled_at_usec, - OP_NE, 0); - tt_int_op(relay_side->padding_info[0]->is_padding_timer_scheduled, - OP_EQ, 0); - timers_advance_and_run(2000); - tt_int_op(n_client_cells, OP_EQ, 2); - tt_int_op(n_relay_cells, OP_EQ, 1); - - tt_int_op(relay_side->padding_info[0]->current_state, OP_EQ, - CIRCPAD_STATE_GAP); - - tt_u64_op(client_side->padding_info[0]->padding_scheduled_at_usec, - OP_EQ, 0); - tt_u64_op(relay_side->padding_info[0]->padding_scheduled_at_usec, - OP_NE, 0); - timers_advance_and_run(5000); - tt_int_op(n_client_cells, OP_EQ, 2); - tt_int_op(n_relay_cells, OP_EQ, 2); - - tt_u64_op(client_side->padding_info[0]->padding_scheduled_at_usec, - OP_NE, 0); - tt_u64_op(relay_side->padding_info[0]->padding_scheduled_at_usec, - OP_EQ, 0); - timers_advance_and_run(2000); - tt_int_op(n_client_cells, OP_EQ, 3); - tt_int_op(n_relay_cells, OP_EQ, 2); - - tt_u64_op(client_side->padding_info[0]->padding_scheduled_at_usec, - OP_EQ, 0); - tt_u64_op(relay_side->padding_info[0]->padding_scheduled_at_usec, - OP_NE, 0); - timers_advance_and_run(5000); - tt_int_op(n_client_cells, OP_EQ, 3); - tt_int_op(n_relay_cells, OP_EQ, 3); - - tt_u64_op(client_side->padding_info[0]->padding_scheduled_at_usec, - OP_NE, 0); - tt_u64_op(relay_side->padding_info[0]->padding_scheduled_at_usec, - OP_EQ, 0); - timers_advance_and_run(2000); - tt_int_op(n_client_cells, OP_EQ, 4); - tt_int_op(n_relay_cells, OP_EQ, 3); - - tt_u64_op(client_side->padding_info[0]->padding_scheduled_at_usec, - OP_EQ, 0); - tt_u64_op(relay_side->padding_info[0]->padding_scheduled_at_usec, - OP_NE, 0); - timers_advance_and_run(5000); - tt_int_op(n_client_cells, OP_EQ, 4); - tt_int_op(n_relay_cells, OP_EQ, 4); - - tt_u64_op(client_side->padding_info[0]->padding_scheduled_at_usec, - OP_NE, 0); - tt_u64_op(relay_side->padding_info[0]->padding_scheduled_at_usec, - OP_EQ, 0); - timers_advance_and_run(2000); - tt_int_op(n_client_cells, OP_EQ, 5); - tt_int_op(n_relay_cells, OP_EQ, 4); - - tt_u64_op(client_side->padding_info[0]->padding_scheduled_at_usec, - OP_EQ, 0); - tt_u64_op(relay_side->padding_info[0]->padding_scheduled_at_usec, - OP_NE, 0); - timers_advance_and_run(5000); - tt_int_op(n_client_cells, OP_EQ, 5); - tt_int_op(n_relay_cells, OP_EQ, 5); - - tt_u64_op(client_side->padding_info[0]->padding_scheduled_at_usec, - OP_NE, 0); - tt_u64_op(relay_side->padding_info[0]->padding_scheduled_at_usec, - OP_EQ, 0); - timers_advance_and_run(2000); - tt_int_op(n_client_cells, OP_EQ, 6); - tt_int_op(n_relay_cells, OP_EQ, 5); - - tt_u64_op(client_side->padding_info[0]->padding_scheduled_at_usec, - OP_EQ, 0); - tt_u64_op(relay_side->padding_info[0]->padding_scheduled_at_usec, - OP_NE, 0); - timers_advance_and_run(5000); - tt_int_op(n_client_cells, OP_EQ, 6); - tt_int_op(n_relay_cells, OP_EQ, 6); - - tt_int_op(client_side->padding_info[0]->current_state, - OP_EQ, CIRCPAD_STATE_END); - tt_u64_op(client_side->padding_info[0]->padding_scheduled_at_usec, - OP_EQ, 0); - tt_int_op(relay_side->padding_info[0]->current_state, - OP_EQ, CIRCPAD_STATE_GAP); - tt_u64_op(relay_side->padding_info[0]->padding_scheduled_at_usec, - OP_EQ, 0); - - /* Verify we can't schedule padding in END state */ - circpad_decision_t ret = - circpad_machine_schedule_padding(client_side->padding_info[0]); - tt_int_op(ret, OP_EQ, CIRCPAD_STATE_UNCHANGED); - - /* Simulate application traffic */ - circpad_cell_event_nonpadding_sent(client_side); - circpad_deliver_unrecognized_cell_events(relay_side, CELL_DIRECTION_OUT); - circpad_deliver_unrecognized_cell_events(relay_side, CELL_DIRECTION_IN); - circpad_deliver_recognized_relay_cell_events(client_side, RELAY_COMMAND_DATA, - TO_ORIGIN_CIRCUIT(client_side)->cpath->next); - - tt_ptr_op(client_side->padding_info[0], OP_EQ, NULL); - tt_ptr_op(client_side->padding_machine[0], OP_EQ, NULL); - - tt_ptr_op(relay_side->padding_info[0], OP_EQ, NULL); - tt_ptr_op(relay_side->padding_machine[0], OP_EQ, NULL); - tt_int_op(n_client_cells, OP_EQ, 6); - tt_int_op(n_relay_cells, OP_EQ, 7); - - // Test timer cancellation - simulate_single_hop_extend(client_side, relay_side, 1); - simulate_single_hop_extend(client_side, relay_side, 1); - timers_advance_and_run(5000); - circpad_cell_event_padding_received(client_side); - - tt_int_op(client_side->padding_info[0]->current_state, OP_EQ, - CIRCPAD_STATE_BURST); - tt_int_op(relay_side->padding_info[0]->current_state, OP_EQ, - CIRCPAD_STATE_GAP); - - tt_int_op(n_client_cells, OP_EQ, 8); - tt_int_op(n_relay_cells, OP_EQ, 8); - tt_u64_op(client_side->padding_info[0]->padding_scheduled_at_usec, - OP_NE, 0); - tt_u64_op(relay_side->padding_info[0]->padding_scheduled_at_usec, - OP_NE, 0); - - /* Test timer cancel due to state rules */ - circpad_cell_event_nonpadding_sent(client_side); - tt_u64_op(client_side->padding_info[0]->padding_scheduled_at_usec, - OP_EQ, 0); - circpad_cell_event_padding_received(client_side); - tt_u64_op(client_side->padding_info[0]->padding_scheduled_at_usec, - OP_NE, 0); - - /* Simulate application traffic to cancel timer */ - circpad_cell_event_nonpadding_sent(client_side); - circpad_deliver_unrecognized_cell_events(relay_side, CELL_DIRECTION_OUT); - circpad_deliver_unrecognized_cell_events(relay_side, CELL_DIRECTION_IN); - circpad_deliver_recognized_relay_cell_events(client_side, RELAY_COMMAND_DATA, - TO_ORIGIN_CIRCUIT(client_side)->cpath->next); - - tt_ptr_op(client_side->padding_info[0], OP_EQ, NULL); - tt_ptr_op(client_side->padding_machine[0], OP_EQ, NULL); - - tt_ptr_op(relay_side->padding_info[0], OP_EQ, NULL); - tt_ptr_op(relay_side->padding_machine[0], OP_EQ, NULL); - - /* No cells sent, except negotiate end from relay */ - tt_int_op(n_client_cells, OP_EQ, 8); - tt_int_op(n_relay_cells, OP_EQ, 9); - - /* Test mark for close and free */ - simulate_single_hop_extend(client_side, relay_side, 1); - simulate_single_hop_extend(client_side, relay_side, 1); - timers_advance_and_run(5000); - circpad_cell_event_padding_received(client_side); - - tt_int_op(n_client_cells, OP_EQ, 10); - tt_int_op(n_relay_cells, OP_EQ, 10); - - tt_int_op(client_side->padding_info[0]->current_state, OP_EQ, - CIRCPAD_STATE_BURST); - tt_int_op(relay_side->padding_info[0]->current_state, OP_EQ, - CIRCPAD_STATE_GAP); - - tt_u64_op(client_side->padding_info[0]->padding_scheduled_at_usec, - OP_NE, 0); - tt_u64_op(relay_side->padding_info[0]->padding_scheduled_at_usec, - OP_NE, 0); - circuit_mark_for_close(client_side, END_CIRC_REASON_FLAG_REMOTE); - free_fake_orcirc(relay_side); - timers_advance_and_run(5000); - - /* No cells sent */ - tt_int_op(n_client_cells, OP_EQ, 10); - tt_int_op(n_relay_cells, OP_EQ, 10); - - done: - free_fake_origin_circuit(TO_ORIGIN_CIRCUIT(client_side)); - - circuitmux_detach_all_circuits(dummy_channel.cmux, NULL); - circuitmux_free(dummy_channel.cmux); - timers_shutdown(); - monotime_disable_test_mocking(); - UNMOCK(circuit_package_relay_cell); - UNMOCK(circuitmux_attach_circuit); - - return; -} -#endif - /** Helper function: Initializes a padding machine where every state uses the * uniform probability distribution. */ static void @@ -2365,8 +2114,6 @@ struct testcase_t circuitpadding_tests[] = { TEST_CIRCUITPADDING(circuitpadding_tokens, TT_FORK), TEST_CIRCUITPADDING(circuitpadding_negotiation, TT_FORK), TEST_CIRCUITPADDING(circuitpadding_wronghop, TT_FORK), - /** Disabled unstable test until #29298 is implemented (see #29122) */ - // TEST_CIRCUITPADDING(circuitpadding_circuitsetup_machine, TT_FORK), TEST_CIRCUITPADDING(circuitpadding_conditions, TT_FORK), TEST_CIRCUITPADDING(circuitpadding_rtt, TT_FORK), TEST_CIRCUITPADDING(circuitpadding_sample_distribution, TT_FORK),

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 05 Apr '19

05 Apr '19

commit 2f48a0ee523cf6e987f574440dd48526f5c04e47 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 5 12:20:53 2019 +0000 Update translations for support-portal --- contents+it.po | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/contents+it.po b/contents+it.po index 17785194a..81f2c607d 100644 --- a/contents+it.po +++ b/contents+it.po @@ -6,8 +6,8 @@ # Kravenor <baldelli.simone(a)gmail.com>, 2019 # erinm, 2019 # Emma Peel, 2019 -# VaiTon86 <eyadlorenzo(a)gmail.com>, 2019 # Davide Sant <spuuu(a)outlook.it>, 2019 +# VaiTon86 <eyadlorenzo(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-03-29 11:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Davide Sant <spuuu(a)outlook.it>, 2019\n" +"Last-Translator: VaiTon86 <eyadlorenzo(a)gmail.com>, 2019\n" "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -308,7 +308,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.title) msgid "How can I verify Tor Browser's signature?" -msgstr "" +msgstr "Come posso verificare la firma del Browser Tor?" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -385,7 +385,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "### Windows" -msgstr "" +msgstr "### Windows" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -397,13 +397,15 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "Download it from https://gpg4win.org/download.html." -msgstr "" +msgstr "Scaricalo da https://gpg4win.org/download.html." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "Once it's installed, use GnuPG to import the key that signed your package." msgstr "" +"Una volta installato, usa GnuPG per importare la chiave che ha firmato il " +"tuo pacchetto." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -411,33 +413,39 @@ msgid "" "In order to verify the signature you will need to type a few commands in " "windows command-line, cmd.exe." msgstr "" +"Per verificare la firma avrai bisogno di scrivere alcuni comandi sul prompt " +"dei comandi di windows, cmd.exe" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "The Tor Browser team signs Tor Browser releases." -msgstr "" +msgstr "Il team Tor Browser firma le versioni del Tor Browser." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "Import its key (0x4E2C6E8793298290) by starting cmd.exe and typing:" msgstr "" +"Importa la sua chiave (0x4E2C6E8793298290) avviando cmd.exe e scrivendo:" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "gpg.exe --keyserver pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290" msgstr "" +"gpg.exe --keyserver pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "After importing the key, you can verify that the fingerprint is correct:" msgstr "" +"Dopo aver importato la chiave puoi verificare che la fingerprint sia " +"corretta:" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "gpg.exe --fingerprint 0x4E2C6E8793298290" -msgstr "" +msgstr "gpg.exe --fingerprint 0x4E2C6E8793298290" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -500,7 +508,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "The output should say \"Good signature\":" -msgstr "" +msgstr "L'output dovrebbe mostrare \"Good signature\":" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -630,7 +638,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### For Mac OS X users:" -msgstr "" +msgstr "#### Per utenti Mac OS X" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -640,7 +648,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### For Linux users (change 64 to 32 if you have the 32-bit package):" -msgstr "" +msgstr "#### Per utenti Linux (cambia 64 a 32 se hai il pacchetto a 32-bit)" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -2453,7 +2461,7 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) msgid "How do I download Tor Browser if the torproject.org is blocked?" -msgstr "" +msgstr "Come scarico il Browser Tor se il sito torproject.org è bloccato?" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description)

1 0

[translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed
by translation＠torproject.org 05 Apr '19

05 Apr '19

commit 997f2eb31e4ba193fdf4485b144a07bfa2b752f3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 5 12:19:39 2019 +0000 Update translations for torbutton-browseronboardingproperties_completed --- it/browserOnboarding.properties | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/it/browserOnboarding.properties b/it/browserOnboarding.properties index 20ee29a87..cfc402c14 100644 --- a/it/browserOnboarding.properties +++ b/it/browserOnboarding.properties @@ -41,6 +41,18 @@ onboarding.tour-tor-onion-services.description=I servizi onion sono siti che ter onboarding.tour-tor-onion-services.button=Visita una Cipolla onboarding.tour-tor-onion-services.next-button=Fatto +onboarding.overlay-icon-tooltip-updated2=Guarda cosa c'è di nuovo\nnella %S +onboarding.tour-tor-update.prefix-new=Nuovo +onboarding.tour-tor-update.prefix-updated=Aggiornato + +onboarding.tour-tor-toolbar=Barra degli strumenti +onboarding.tour-tor-toolbar-update-8.5.title=Disposizione brarra degli strumenti +onboarding.tour-tor-toolbar-update-8.5.description=We improved the browser toolbar layout. We moved the Torbutton icon after the URL bar, and we added a security level icon next to it. +onboarding.tour-tor-toolbar-update-8.5.next-button=Vai in Sicurezza + +onboarding.tour-tor-security-update-8.5.title=Esperienza livello di sicurezza +onboarding.tour-tor-security-update-8.5.description=Abbiamo migliorato come visualizzi ed imposti il tuo livello di sicurezza. Abbiamo rimpiazzato la slider di sicurezza con un icona nella barra degli strumenti che rende visibile sempre il tuo livello di sicurezza. Cliccala per visualizzare i dettagli sul tuo attuale livello o per cambiare le tue impostazioni di sicurezza. + # Circuit Display onboarding. onboarding.tor-circuit-display.next=Successivo onboarding.tor-circuit-display.done=Fatto

1 0

[translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
by translation＠torproject.org 05 Apr '19

05 Apr '19

commit 7a8681bbd71c8c32268681b87c383775156e232f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 5 12:19:32 2019 +0000 Update translations for torbutton-browseronboardingproperties --- it/browserOnboarding.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/it/browserOnboarding.properties b/it/browserOnboarding.properties index 2575f786e..cfc402c14 100644 --- a/it/browserOnboarding.properties +++ b/it/browserOnboarding.properties @@ -45,13 +45,13 @@ onboarding.overlay-icon-tooltip-updated2=Guarda cosa c'è di nuovo\nnella %S onboarding.tour-tor-update.prefix-new=Nuovo onboarding.tour-tor-update.prefix-updated=Aggiornato -onboarding.tour-tor-toolbar=Toolbar -onboarding.tour-tor-toolbar-update-8.5.title=Toolbar layout +onboarding.tour-tor-toolbar=Barra degli strumenti +onboarding.tour-tor-toolbar-update-8.5.title=Disposizione brarra degli strumenti onboarding.tour-tor-toolbar-update-8.5.description=We improved the browser toolbar layout. We moved the Torbutton icon after the URL bar, and we added a security level icon next to it. onboarding.tour-tor-toolbar-update-8.5.next-button=Vai in Sicurezza -onboarding.tour-tor-security-update-8.5.title=Security level experience -onboarding.tour-tor-security-update-8.5.description=We improved how you see and set your security level. We replaced the security slider with a toolbar icon that makes your current level visible at all times. Click it to view details about your current level or to change your security settings. +onboarding.tour-tor-security-update-8.5.title=Esperienza livello di sicurezza +onboarding.tour-tor-security-update-8.5.description=Abbiamo migliorato come visualizzi ed imposti il tuo livello di sicurezza. Abbiamo rimpiazzato la slider di sicurezza con un icona nella barra degli strumenti che rende visibile sempre il tuo livello di sicurezza. Cliccala per visualizzare i dettagli sul tuo attuale livello o per cambiare le tue impostazioni di sicurezza. # Circuit Display onboarding. onboarding.tor-circuit-display.next=Successivo

1 0

[tor/maint-0.4.0] Merge branch 'bug30011_035' into bug30011_040
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit ef06ef217a828e3c34358bc53da41932bc129017 Merge: 9242f3288 3fa42d599 Author: teor <teor(a)torproject.org> Date: Thu Apr 4 13:23:26 2019 +1000 Merge branch 'bug30011_035' into bug30011_040 Merge bug30011 new package timelimit with 0.4.0 new package shellcheck. Move shellcheck into the correct category. .travis.yml | 13 ++++++++++--- changes/bug30011 | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --cc .travis.yml index 474f6867f,e70344ee2..498069d82 --- a/.travis.yml +++ b/.travis.yml @@@ -125,6 -125,6 +125,7 @@@ addons - libseccomp-dev ## zstd doesn't exist in Ubuntu Trusty #- libzstd ++ - shellcheck ## Conditional build dependencies ## Always installed, so we don't need sudo - asciidoc @@@ -151,6 -153,6 +154,7 @@@ - pkg-config ## Optional build dependencies - ccache ++ - shellcheck ## Conditional build dependencies ## Always installed, because manual brew installs are hard to get right - asciidoc

1 0

[tor/maint-0.4.0] Merge branch 'tor-github/pr/901' into maint-0.4.0
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit 2cc3c98bc4fbdbb1cd11bae2d98f3f26164d1799 Merge: 7fe169a50 ef06ef217 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Apr 5 14:56:52 2019 +0300 Merge branch 'tor-github/pr/901' into maint-0.4.0 .travis.yml | 13 ++++++++++--- changes/bug30011 | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --cc .travis.yml index d7db65bed,498069d82..bda1f323e --- a/.travis.yml +++ b/.travis.yml @@@ -209,10 -213,9 +215,11 @@@ script - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi - - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi + ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes + - if [[ "$TEST_STEM" != "" ]]; then timelimit -p -t 540 -T 30 make src/app/tor test-stem; fi - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi + ## If this build was one that produced coverage, upload it. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi after_failure: ## configure will leave a log file with more details of config failures.

1 0