tor-commits August 2013

tor-commits@lists.torproject.org

19 participants
1224 discussions

[tor/master] Rename get_circuit_nbuild_* to end with _ms
by nickm＠torproject.org 22 Aug '13

22 Aug '13

commit e1c9b43b8efbc76ab3a6decf47d6d1ef1967ef77 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 21 11:59:19 2013 -0400 Rename get_circuit_nbuild_* to end with _ms --- src/or/circuitbuild.c | 17 +++++++++-------- src/or/circuitstats.c | 4 ++-- src/or/circuitstats.h | 4 ++-- src/or/circuituse.c | 20 ++++++++++---------- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index c144f27..cb2f423 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -772,7 +772,8 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) * it off at, we probably had a suspend event along this codepath, * and we should discard the value. */ - if (timediff < 0 || timediff > 2*get_circuit_build_close_time()+1000) { + if (timediff < 0 || + timediff > 2*get_circuit_build_close_time_ms()+1000) { log_notice(LD_CIRC, "Strange value for circuit build time: %ldmsec. " "Assuming clock jump. Purpose %d (%s)", timediff, circ->base_.purpose, @@ -2276,7 +2277,7 @@ pathbias_measure_use_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(get_circuit_build_close_time()/1000)); + tor_lround(get_circuit_build_close_time_ms()/1000)); guard->path_bias_disabled = 1; guard->bad_since = approx_time(); entry_guards_changed(); @@ -2302,7 +2303,7 @@ pathbias_measure_use_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(get_circuit_build_close_time()/1000)); + tor_lround(get_circuit_build_close_time_ms()/1000)); } } else if (pathbias_get_use_success_count(guard)/guard->use_attempts < pathbias_get_notice_use_rate(options)) { @@ -2326,7 +2327,7 @@ pathbias_measure_use_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(get_circuit_build_close_time()/1000)); + tor_lround(get_circuit_build_close_time_ms()/1000)); } } } @@ -2382,7 +2383,7 @@ pathbias_measure_close_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(get_circuit_build_close_time()/1000)); + tor_lround(get_circuit_build_close_time_ms()/1000)); guard->path_bias_disabled = 1; guard->bad_since = approx_time(); entry_guards_changed(); @@ -2408,7 +2409,7 @@ pathbias_measure_close_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(get_circuit_build_close_time()/1000)); + tor_lround(get_circuit_build_close_time_ms()/1000)); } } else if (pathbias_get_close_success_count(guard)/guard->circ_attempts < pathbias_get_warn_rate(options)) { @@ -2433,7 +2434,7 @@ pathbias_measure_close_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(get_circuit_build_close_time()/1000)); + tor_lround(get_circuit_build_close_time_ms()/1000)); } } else if (pathbias_get_close_success_count(guard)/guard->circ_attempts < pathbias_get_notice_rate(options)) { @@ -2456,7 +2457,7 @@ pathbias_measure_close_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(get_circuit_build_close_time()/1000)); + tor_lround(get_circuit_build_close_time_ms()/1000)); } } } diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index 88ed350..25813de 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -43,13 +43,13 @@ get_circuit_build_times(void) } double -get_circuit_build_close_time(void) +get_circuit_build_close_time_ms(void) { return circ_times.close_ms; } double -get_circuit_build_timeout(void) +get_circuit_build_timeout_ms(void) { return circ_times.timeout_ms; } diff --git a/src/or/circuitstats.h b/src/or/circuitstats.h index 2381bf9..4115b68 100644 --- a/src/or/circuitstats.h +++ b/src/or/circuitstats.h @@ -13,8 +13,8 @@ #define TOR_CIRCUITSTATS_H circuit_build_times_t *get_circuit_build_times(void); -double get_circuit_build_close_time(void); -double get_circuit_build_timeout(void); +double get_circuit_build_close_time_ms(void); +double get_circuit_build_timeout_ms(void); int circuit_build_times_disabled(void); int circuit_build_times_enough_to_compute(circuit_build_times_t *cbt); diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 57079f0..919ca35 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -442,12 +442,12 @@ circuit_expire_building(void) * RTTs = 4a + 3b + 2c * RTTs = 9h */ - SET_CUTOFF(general_cutoff, get_circuit_build_timeout()); - SET_CUTOFF(begindir_cutoff, get_circuit_build_timeout()); + SET_CUTOFF(general_cutoff, get_circuit_build_timeout_ms()); + SET_CUTOFF(begindir_cutoff, get_circuit_build_timeout_ms()); /* > 3hop circs seem to have a 1.0 second delay on their cannibalized * 4th hop. */ - SET_CUTOFF(fourhop_cutoff, get_circuit_build_timeout() * (10/6.0) + 1000); + SET_CUTOFF(fourhop_cutoff, get_circuit_build_timeout_ms() * (10/6.0) + 1000); /* CIRCUIT_PURPOSE_C_ESTABLISH_REND behaves more like a RELAY cell. * Use the stream cutoff (more or less). */ @@ -456,20 +456,20 @@ circuit_expire_building(void) /* Be lenient with cannibalized circs. They already survived the official * CBT, and they're usually not performance-critical. */ SET_CUTOFF(cannibalized_cutoff, - MAX(get_circuit_build_close_time()*(4/6.0), + MAX(get_circuit_build_close_time_ms()*(4/6.0), options->CircuitStreamTimeout * 1000) + 1000); /* Intro circs have an extra round trip (and are also 4 hops long) */ - SET_CUTOFF(c_intro_cutoff, get_circuit_build_timeout() * (14/6.0) + 1000); + SET_CUTOFF(c_intro_cutoff, get_circuit_build_timeout_ms() * (14/6.0) + 1000); /* Server intro circs have an extra round trip */ - SET_CUTOFF(s_intro_cutoff, get_circuit_build_timeout() * (9/6.0) + 1000); + SET_CUTOFF(s_intro_cutoff, get_circuit_build_timeout_ms() * (9/6.0) + 1000); - SET_CUTOFF(close_cutoff, get_circuit_build_close_time()); - SET_CUTOFF(extremely_old_cutoff, get_circuit_build_close_time()*2 + 1000); + SET_CUTOFF(close_cutoff, get_circuit_build_close_time_ms()); + SET_CUTOFF(extremely_old_cutoff, get_circuit_build_close_time_ms()*2 + 1000); SET_CUTOFF(hs_extremely_old_cutoff, - MAX(get_circuit_build_close_time()*2 + 1000, + MAX(get_circuit_build_close_time_ms()*2 + 1000, options->SocksTimeout * 1000)); TOR_LIST_FOREACH(next_circ, circuit_get_global_list(), head) { @@ -552,7 +552,7 @@ circuit_expire_building(void) continue; } else { static ratelim_t relax_timeout_limit = RATELIM_INIT(3600); - const double build_close_ms = get_circuit_build_close_time(); + const double build_close_ms = get_circuit_build_close_time_ms(); log_fn_ratelim(&relax_timeout_limit, LOG_NOTICE, LD_CIRC, "No circuits are opened. Relaxed timeout for circuit %d " "(a %s %d-hop circuit in state %s with channel state %s) to "

1 0

[tor/master] Make circ_times static and add accessor functions.
by nickm＠torproject.org 22 Aug '13

22 Aug '13

commit 4834641dce809fbb6fd4a586a823446970d19c1d Author: vagrant <vagrant(a)precise32.(none)> Date: Wed Aug 21 11:44:28 2013 -0400 Make circ_times static and add accessor functions. Change the global circ_times to a static variable and use accessor functions throughout the code, instead of accessing it directly. --- src/or/channel.c | 2 +- src/or/circuitbuild.c | 27 +++++++++++++++------------ src/or/circuitlist.c | 2 +- src/or/circuitstats.c | 21 +++++++++++++++++++-- src/or/circuitstats.h | 4 +++- src/or/circuituse.c | 37 ++++++++++++++++++++----------------- src/or/connection_or.c | 8 ++++---- src/or/entrynodes.c | 2 +- src/or/networkstatus.c | 3 ++- src/or/statefile.c | 5 +++-- 10 files changed, 69 insertions(+), 42 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 48bbf79..8743437 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -2361,7 +2361,7 @@ channel_do_open_actions(channel_t *chan) started_here = channel_is_outgoing(chan); if (started_here) { - circuit_build_times_network_is_live(&circ_times); + circuit_build_times_network_is_live(get_circuit_build_times()); rep_hist_note_connect_succeeded(chan->identity_digest, now); if (entry_guard_register_connect_status( chan->identity_digest, 1, 0, now) < 0) { diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 21fc2ae..c144f27 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -772,20 +772,23 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) * it off at, we probably had a suspend event along this codepath, * and we should discard the value. */ - if (timediff < 0 || timediff > 2*circ_times.close_ms+1000) { + if (timediff < 0 || timediff > 2*get_circuit_build_close_time()+1000) { log_notice(LD_CIRC, "Strange value for circuit build time: %ldmsec. " "Assuming clock jump. Purpose %d (%s)", timediff, circ->base_.purpose, circuit_purpose_to_string(circ->base_.purpose)); } else if (!circuit_build_times_disabled()) { /* Only count circuit times if the network is live */ - if (circuit_build_times_network_check_live(&circ_times)) { - circuit_build_times_add_time(&circ_times, (build_time_t)timediff); - circuit_build_times_set_timeout(&circ_times); + if (circuit_build_times_network_check_live( + get_circuit_build_times())) { + circuit_build_times_add_time(get_circuit_build_times(), + (build_time_t)timediff); + circuit_build_times_set_timeout(get_circuit_build_times()); } if (circ->base_.purpose != CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT) { - circuit_build_times_network_circ_success(&circ_times); + circuit_build_times_network_circ_success( + get_circuit_build_times()); } } } @@ -2273,7 +2276,7 @@ pathbias_measure_use_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(circ_times.close_ms/1000)); + tor_lround(get_circuit_build_close_time()/1000)); guard->path_bias_disabled = 1; guard->bad_since = approx_time(); entry_guards_changed(); @@ -2299,7 +2302,7 @@ pathbias_measure_use_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(circ_times.close_ms/1000)); + tor_lround(get_circuit_build_close_time()/1000)); } } else if (pathbias_get_use_success_count(guard)/guard->use_attempts < pathbias_get_notice_use_rate(options)) { @@ -2323,7 +2326,7 @@ pathbias_measure_use_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(circ_times.close_ms/1000)); + tor_lround(get_circuit_build_close_time()/1000)); } } } @@ -2379,7 +2382,7 @@ pathbias_measure_close_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(circ_times.close_ms/1000)); + tor_lround(get_circuit_build_close_time()/1000)); guard->path_bias_disabled = 1; guard->bad_since = approx_time(); entry_guards_changed(); @@ -2405,7 +2408,7 @@ pathbias_measure_close_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(circ_times.close_ms/1000)); + tor_lround(get_circuit_build_close_time()/1000)); } } else if (pathbias_get_close_success_count(guard)/guard->circ_attempts < pathbias_get_warn_rate(options)) { @@ -2430,7 +2433,7 @@ pathbias_measure_close_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(circ_times.close_ms/1000)); + tor_lround(get_circuit_build_close_time()/1000)); } } else if (pathbias_get_close_success_count(guard)/guard->circ_attempts < pathbias_get_notice_rate(options)) { @@ -2453,7 +2456,7 @@ pathbias_measure_close_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(circ_times.close_ms/1000)); + tor_lround(get_circuit_build_close_time()/1000)); } } } diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 69c4c4b..1edea85 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -678,7 +678,7 @@ origin_circuit_new(void) init_circuit_base(TO_CIRCUIT(circ)); - circ_times.last_circ_at = approx_time(); + get_circuit_build_times()->last_circ_at = approx_time(); return circ; } diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index 95129f9..88ed350 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -26,8 +26,7 @@ // vary in their own latency. The downside of this is that guards // can change frequently, so we'd be building a lot more circuits // most likely. -/* XXXX024 Make this static; add accessor functions. */ -circuit_build_times_t circ_times; +static circuit_build_times_t circ_times; #ifdef TOR_UNIT_TESTS /** If set, we're running the unit tests: we should avoid clobbering @@ -37,6 +36,24 @@ static int unit_tests = 0; #define unit_tests 0 #endif +circuit_build_times_t * +get_circuit_build_times(void) +{ + return &circ_times; +} + +double +get_circuit_build_close_time(void) +{ + return circ_times.close_ms; +} + +double +get_circuit_build_timeout(void) +{ + return circ_times.timeout_ms; +} + /** * This function decides if CBT learning should be disabled. It returns * true if one or more of the following four conditions are met: diff --git a/src/or/circuitstats.h b/src/or/circuitstats.h index 53ba2b2..2381bf9 100644 --- a/src/or/circuitstats.h +++ b/src/or/circuitstats.h @@ -12,7 +12,9 @@ #ifndef TOR_CIRCUITSTATS_H #define TOR_CIRCUITSTATS_H -extern circuit_build_times_t circ_times; +circuit_build_times_t *get_circuit_build_times(void); +double get_circuit_build_close_time(void); +double get_circuit_build_timeout(void); int circuit_build_times_disabled(void); int circuit_build_times_enough_to_compute(circuit_build_times_t *cbt); diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 7beaa4e..57079f0 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -442,12 +442,12 @@ circuit_expire_building(void) * RTTs = 4a + 3b + 2c * RTTs = 9h */ - SET_CUTOFF(general_cutoff, circ_times.timeout_ms); - SET_CUTOFF(begindir_cutoff, circ_times.timeout_ms); + SET_CUTOFF(general_cutoff, get_circuit_build_timeout()); + SET_CUTOFF(begindir_cutoff, get_circuit_build_timeout()); /* > 3hop circs seem to have a 1.0 second delay on their cannibalized * 4th hop. */ - SET_CUTOFF(fourhop_cutoff, circ_times.timeout_ms * (10/6.0) + 1000); + SET_CUTOFF(fourhop_cutoff, get_circuit_build_timeout() * (10/6.0) + 1000); /* CIRCUIT_PURPOSE_C_ESTABLISH_REND behaves more like a RELAY cell. * Use the stream cutoff (more or less). */ @@ -456,20 +456,20 @@ circuit_expire_building(void) /* Be lenient with cannibalized circs. They already survived the official * CBT, and they're usually not performance-critical. */ SET_CUTOFF(cannibalized_cutoff, - MAX(circ_times.close_ms*(4/6.0), + MAX(get_circuit_build_close_time()*(4/6.0), options->CircuitStreamTimeout * 1000) + 1000); /* Intro circs have an extra round trip (and are also 4 hops long) */ - SET_CUTOFF(c_intro_cutoff, circ_times.timeout_ms * (14/6.0) + 1000); + SET_CUTOFF(c_intro_cutoff, get_circuit_build_timeout() * (14/6.0) + 1000); /* Server intro circs have an extra round trip */ - SET_CUTOFF(s_intro_cutoff, circ_times.timeout_ms * (9/6.0) + 1000); + SET_CUTOFF(s_intro_cutoff, get_circuit_build_timeout() * (9/6.0) + 1000); - SET_CUTOFF(close_cutoff, circ_times.close_ms); - SET_CUTOFF(extremely_old_cutoff, circ_times.close_ms*2 + 1000); + SET_CUTOFF(close_cutoff, get_circuit_build_close_time()); + SET_CUTOFF(extremely_old_cutoff, get_circuit_build_close_time()*2 + 1000); SET_CUTOFF(hs_extremely_old_cutoff, - MAX(circ_times.close_ms*2 + 1000, + MAX(get_circuit_build_close_time()*2 + 1000, options->SocksTimeout * 1000)); TOR_LIST_FOREACH(next_circ, circuit_get_global_list(), head) { @@ -545,12 +545,14 @@ circuit_expire_building(void) * was a timeout, and the timeout value needs to reset if we * see enough of them. Note this means we also need to avoid * double-counting below, too. */ - circuit_build_times_count_timeout(&circ_times, first_hop_succeeded); + circuit_build_times_count_timeout(get_circuit_build_times(), + first_hop_succeeded); TO_ORIGIN_CIRCUIT(victim)->relaxed_timeout = 1; } continue; } else { static ratelim_t relax_timeout_limit = RATELIM_INIT(3600); + const double build_close_ms = get_circuit_build_close_time(); log_fn_ratelim(&relax_timeout_limit, LOG_NOTICE, LD_CIRC, "No circuits are opened. Relaxed timeout for circuit %d " "(a %s %d-hop circuit in state %s with channel state %s) to " @@ -561,7 +563,8 @@ circuit_expire_building(void) TO_ORIGIN_CIRCUIT(victim)->build_state->desired_path_len, circuit_state_to_string(victim->state), channel_state_to_string(victim->n_chan->state), - (long)circ_times.close_ms, num_live_entry_guards(0)); + (long)build_close_ms, + num_live_entry_guards(0)); } } @@ -641,7 +644,7 @@ circuit_expire_building(void) } if (circuit_timeout_want_to_count_circ(TO_ORIGIN_CIRCUIT(victim)) && - circuit_build_times_enough_to_compute(&circ_times)) { + circuit_build_times_enough_to_compute(get_circuit_build_times())) { /* Circuits are allowed to last longer for measurement. * Switch their purpose and wait. */ if (victim->purpose != CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT) { @@ -655,7 +658,7 @@ circuit_expire_building(void) * have a timeout. We also want to avoid double-counting * already "relaxed" circuits, which are counted above. */ if (!TO_ORIGIN_CIRCUIT(victim)->relaxed_timeout) { - circuit_build_times_count_timeout(&circ_times, + circuit_build_times_count_timeout(get_circuit_build_times(), first_hop_succeeded); } continue; @@ -673,10 +676,10 @@ circuit_expire_building(void) (long)(now.tv_sec - victim->timestamp_began.tv_sec), victim->purpose, circuit_purpose_to_string(victim->purpose)); - } else if (circuit_build_times_count_close(&circ_times, + } else if (circuit_build_times_count_close(get_circuit_build_times(), first_hop_succeeded, victim->timestamp_created.tv_sec)) { - circuit_build_times_set_timeout(&circ_times); + circuit_build_times_set_timeout(get_circuit_build_times()); } } } @@ -939,7 +942,7 @@ circuit_predict_and_launch_new(void) * we can still build circuits preemptively as needed. */ if (num < MAX_UNUSED_OPEN_CIRCUITS-2 && get_options()->LearnCircuitBuildTimeout && - circuit_build_times_needs_circuits_now(&circ_times)) { + circuit_build_times_needs_circuits_now(get_circuit_build_times())) { flags = CIRCLAUNCH_NEED_CAPACITY; log_info(LD_CIRC, "Have %d clean circs need another buildtime test circ.", num); @@ -1075,7 +1078,7 @@ circuit_expire_old_circuits_clientside(void) cutoff = now; if (get_options()->LearnCircuitBuildTimeout && - circuit_build_times_needs_circuits(&circ_times)) { + circuit_build_times_needs_circuits(get_circuit_build_times())) { /* Circuits should be shorter lived if we need more of them * for learning a good build timeout */ cutoff.tv_sec -= IDLE_TIMEOUT_WHILE_LEARNING; diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 31fd6d6..b7e72fd 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1749,7 +1749,7 @@ connection_tls_finish_handshake(or_connection_t *conn) digest_rcvd) < 0) return -1; - circuit_build_times_network_is_live(&circ_times); + circuit_build_times_network_is_live(get_circuit_build_times()); if (tor_tls_used_v1_handshake(conn->tls)) { conn->link_proto = 1; @@ -1783,7 +1783,7 @@ connection_or_launch_v3_or_handshake(or_connection_t *conn) tor_assert(connection_or_nonopen_was_started_here(conn)); tor_assert(tor_tls_received_v3_certificate(conn->tls)); - circuit_build_times_network_is_live(&circ_times); + circuit_build_times_network_is_live(get_circuit_build_times()); connection_or_change_state(conn, OR_CONN_STATE_OR_HANDSHAKING_V3); if (connection_init_or_handshake_state(conn, 1) < 0) @@ -2016,7 +2016,7 @@ connection_or_process_cells_from_inbuf(or_connection_t *conn) if (conn->chan) channel_timestamp_active(TLS_CHAN_TO_BASE(conn->chan)); - circuit_build_times_network_is_live(&circ_times); + circuit_build_times_network_is_live(get_circuit_build_times()); channel_tls_handle_var_cell(var_cell, conn); var_cell_free(var_cell); } else { @@ -2032,7 +2032,7 @@ connection_or_process_cells_from_inbuf(or_connection_t *conn) if (conn->chan) channel_timestamp_active(TLS_CHAN_TO_BASE(conn->chan)); - circuit_build_times_network_is_live(&circ_times); + circuit_build_times_network_is_live(get_circuit_build_times()); connection_fetch_from_buf(buf, cell_network_size, TO_CONN(conn)); /* retrieve cell info from buf (create the host-order struct from the diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index cadc70e..b3764a9 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -2279,6 +2279,6 @@ entry_guards_free_all(void) clear_bridge_list(); smartlist_free(bridge_list); bridge_list = NULL; - circuit_build_times_free_timeouts(&circ_times); + circuit_build_times_free_timeouts(get_circuit_build_times()); } diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 3f995a9..8b4a791 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1822,7 +1822,8 @@ networkstatus_set_current_consensus(const char *consensus, * current consensus really alter our view of any OR's rate limits? */ connection_or_update_token_buckets(get_connection_array(), options); - circuit_build_times_new_consensus_params(&circ_times, current_consensus); + circuit_build_times_new_consensus_params(get_circuit_build_times(), + current_consensus); } if (directory_caches_dir_info(options)) { diff --git a/src/or/statefile.c b/src/or/statefile.c index 8736c35..4b61fde 100644 --- a/src/or/statefile.c +++ b/src/or/statefile.c @@ -238,7 +238,8 @@ or_state_set(or_state_t *new_state) tor_free(err); ret = -1; } - if (circuit_build_times_parse_state(&circ_times, global_state) < 0) { + if (circuit_build_times_parse_state( + get_circuit_build_times(),global_state) < 0) { ret = -1; } return ret; @@ -405,7 +406,7 @@ or_state_save(time_t now) * to avoid redundant writes. */ entry_guards_update_state(global_state); rep_hist_update_state(global_state); - circuit_build_times_update_state(&circ_times, global_state); + circuit_build_times_update_state(get_circuit_build_times(), global_state); if (accounting_is_enabled(get_options())) accounting_run_housekeeping(now);

1 0

[tor/master] Merge branch 'bug6153_squashed'
by nickm＠torproject.org 22 Aug '13

22 Aug '13

commit eb79dd42e7de31dff636f67e94da055d94558401 Merge: 7121e7b 8920fc5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 22 10:16:07 2013 -0400 Merge branch 'bug6153_squashed' changes/6153_circuittime_accessor | 4 ++ src/or/channel.c | 2 +- src/or/circuitbuild.c | 28 ++++++----- src/or/circuitlist.c | 2 +- src/or/circuitstats.c | 99 ++++++++++++++++++++++++++++++++----- src/or/circuitstats.h | 44 ++++++++++++++--- src/or/circuituse.c | 41 ++++++++------- src/or/connection_or.c | 8 +-- src/or/control.c | 21 ++------ src/or/control.h | 4 +- src/or/entrynodes.c | 2 +- src/or/networkstatus.c | 3 +- src/or/or.h | 25 +--------- src/or/statefile.c | 5 +- 14 files changed, 187 insertions(+), 101 deletions(-)

1 0

[tor/master] Hide the contents of the circuit_build_times structure.
by nickm＠torproject.org 22 Aug '13

22 Aug '13

commit 8920fc545738393fc8320b61bac897f67a66e6c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 21 12:37:35 2013 -0400 Hide the contents of the circuit_build_times structure. There were only two functions outside of circuitstats that actually wanted to know what was inside this. Making the structure itself hidden should help isolation and prevent us from spaghettifying the thing more. --- src/or/circuitlist.c | 2 +- src/or/circuitstats.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++--- src/or/circuitstats.h | 29 ++++++++++++++++++++++++++++ src/or/control.c | 21 ++++---------------- src/or/control.h | 4 ++-- src/or/or.h | 25 +----------------------- 6 files changed, 85 insertions(+), 47 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 50caf37..bb74594 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -678,7 +678,7 @@ origin_circuit_new(void) init_circuit_base(TO_CIRCUIT(circ)); - get_circuit_build_times_mutable()->last_circ_at = approx_time(); + circuit_build_times_update_last_circ(get_circuit_build_times_mutable()); return circ; } diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index e7b4b36..8fdef58 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -18,6 +18,10 @@ #undef log #include <math.h> +static void cbt_control_event_buildtimeout_set( + const circuit_build_times_t *cbt, + buildtimeout_set_event_t type); + #define CBT_BIN_TO_MS(bin) ((bin)*CBT_BIN_WIDTH + (CBT_BIN_WIDTH/2)) /** Global list of circuit build times */ @@ -505,7 +509,7 @@ circuit_build_times_init(circuit_build_times_t *cbt) cbt->liveness.timeouts_after_firsthop = NULL; } cbt->close_ms = cbt->timeout_ms = circuit_build_times_get_initial_timeout(); - control_event_buildtimeout_set(cbt, BUILDTIMEOUT_SET_EVENT_RESET); + cbt_control_event_buildtimeout_set(cbt, BUILDTIMEOUT_SET_EVENT_RESET); } /** @@ -1369,7 +1373,7 @@ circuit_build_times_network_check_changed(circuit_build_times_t *cbt) = circuit_build_times_get_initial_timeout(); } - control_event_buildtimeout_set(cbt, BUILDTIMEOUT_SET_EVENT_RESET); + cbt_control_event_buildtimeout_set(cbt, BUILDTIMEOUT_SET_EVENT_RESET); log_notice(LD_CIRC, "Your network connection speed appears to have changed. Resetting " @@ -1551,7 +1555,7 @@ circuit_build_times_set_timeout(circuit_build_times_t *cbt) } } - control_event_buildtimeout_set(cbt, BUILDTIMEOUT_SET_EVENT_COMPUTED); + cbt_control_event_buildtimeout_set(cbt, BUILDTIMEOUT_SET_EVENT_COMPUTED); timeout_rate = circuit_build_times_timeout_rate(cbt); @@ -1597,3 +1601,44 @@ circuitbuild_running_unit_tests(void) } #endif +void +circuit_build_times_update_last_circ(circuit_build_times_t *cbt) +{ + cbt->last_circ_at = approx_time(); +} + +static void +cbt_control_event_buildtimeout_set(const circuit_build_times_t *cbt, + buildtimeout_set_event_t type) +{ + char *args = NULL; + double qnt; + + switch(type) { + case BUILDTIMEOUT_SET_EVENT_RESET: + case BUILDTIMEOUT_SET_EVENT_SUSPENDED: + case BUILDTIMEOUT_SET_EVENT_DISCARD: + qnt = 1.0; + break; + case BUILDTIMEOUT_SET_EVENT_COMPUTED: + case BUILDTIMEOUT_SET_EVENT_RESUME: + default: + qnt = circuit_build_times_quantile_cutoff(); + break; + } + + tor_asprintf(&args, "TOTAL_TIMES=%lu " + "TIMEOUT_MS=%lu XM=%lu ALPHA=%f CUTOFF_QUANTILE=%f " + "TIMEOUT_RATE=%f CLOSE_MS=%lu CLOSE_RATE=%f", + (unsigned long)cbt->total_build_times, + (unsigned long)cbt->timeout_ms, + (unsigned long)cbt->Xm, cbt->alpha, qnt, + circuit_build_times_timeout_rate(cbt), + (unsigned long)cbt->close_ms, + circuit_build_times_close_rate(cbt)); + + control_event_buildtimeout_set(type, args); + + tor_free(args); + +} diff --git a/src/or/circuitstats.h b/src/or/circuitstats.h index 196af3f..38a7e4e 100644 --- a/src/or/circuitstats.h +++ b/src/or/circuitstats.h @@ -40,6 +40,8 @@ void circuit_build_times_new_consensus_params(circuit_build_times_t *cbt, double circuit_build_times_timeout_rate(const circuit_build_times_t *cbt); double circuit_build_times_close_rate(const circuit_build_times_t *cbt); +void circuit_build_times_update_last_circ(circuit_build_times_t *cbt); + #ifdef CIRCUITSTATS_PRIVATE STATIC double circuit_build_times_calculate_timeout(circuit_build_times_t *cbt, double quantile); @@ -65,5 +67,32 @@ void circuit_build_times_network_is_live(circuit_build_times_t *cbt); int circuit_build_times_network_check_live(const circuit_build_times_t *cbt); void circuit_build_times_network_circ_success(circuit_build_times_t *cbt); +#ifdef CIRCUITSTATS_PRIVATE +/** Structure for circuit build times history */ +struct circuit_build_times_s{ + /** The circular array of recorded build times in milliseconds */ + build_time_t circuit_build_times[CBT_NCIRCUITS_TO_OBSERVE]; + /** Current index in the circuit_build_times circular array */ + int build_times_idx; + /** Total number of build times accumulated. Max CBT_NCIRCUITS_TO_OBSERVE */ + int total_build_times; + /** Information about the state of our local network connection */ + network_liveness_t liveness; + /** Last time we built a circuit. Used to decide to build new test circs */ + time_t last_circ_at; + /** "Minimum" value of our pareto distribution (actually mode) */ + build_time_t Xm; + /** alpha exponent for pareto dist. */ + double alpha; + /** Have we computed a timeout? */ + int have_computed_timeout; + /** The exact value for that timeout in milliseconds. Stored as a double + * to maintain precision from calculations to and from quantile value. */ + double timeout_ms; + /** How long we wait before actually closing the circuit. */ + double close_ms; +}; +#endif + #endif diff --git a/src/or/control.c b/src/or/control.c index 81df00c..fc4809b 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4163,32 +4163,26 @@ control_event_newconsensus(const networkstatus_t *consensus) /** Called when we compute a new circuitbuildtimeout */ int -control_event_buildtimeout_set(const circuit_build_times_t *cbt, - buildtimeout_set_event_t type) +control_event_buildtimeout_set(buildtimeout_set_event_t type, + const char *args) { const char *type_string = NULL; - double qnt; if (!control_event_is_interesting(EVENT_BUILDTIMEOUT_SET)) return 0; - qnt = circuit_build_times_quantile_cutoff(); - switch (type) { case BUILDTIMEOUT_SET_EVENT_COMPUTED: type_string = "COMPUTED"; break; case BUILDTIMEOUT_SET_EVENT_RESET: type_string = "RESET"; - qnt = 1.0; break; case BUILDTIMEOUT_SET_EVENT_SUSPENDED: type_string = "SUSPENDED"; - qnt = 1.0; break; case BUILDTIMEOUT_SET_EVENT_DISCARD: type_string = "DISCARD"; - qnt = 1.0; break; case BUILDTIMEOUT_SET_EVENT_RESUME: type_string = "RESUME"; @@ -4199,15 +4193,8 @@ control_event_buildtimeout_set(const circuit_build_times_t *cbt, } send_control_event(EVENT_BUILDTIMEOUT_SET, ALL_FORMATS, - "650 BUILDTIMEOUT_SET %s TOTAL_TIMES=%lu " - "TIMEOUT_MS=%lu XM=%lu ALPHA=%f CUTOFF_QUANTILE=%f " - "TIMEOUT_RATE=%f CLOSE_MS=%lu CLOSE_RATE=%f\r\n", - type_string, (unsigned long)cbt->total_build_times, - (unsigned long)cbt->timeout_ms, - (unsigned long)cbt->Xm, cbt->alpha, qnt, - circuit_build_times_timeout_rate(cbt), - (unsigned long)cbt->close_ms, - circuit_build_times_close_rate(cbt)); + "650 BUILDTIMEOUT_SET %s %s\r\n", + type_string, args); return 0; } diff --git a/src/or/control.h b/src/or/control.h index be9476e..1a44768 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -73,8 +73,8 @@ int control_event_server_status(int severity, const char *format, ...) int control_event_guard(const char *nickname, const char *digest, const char *status); int control_event_conf_changed(const smartlist_t *elements); -int control_event_buildtimeout_set(const circuit_build_times_t *cbt, - buildtimeout_set_event_t type); +int control_event_buildtimeout_set(buildtimeout_set_event_t type, + const char *args); int control_event_signal(uintptr_t signal); int init_control_cookie_authentication(int enabled); diff --git a/src/or/or.h b/src/or/or.h index 2daf12b..041421e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4471,30 +4471,7 @@ typedef struct { int after_firsthop_idx; } network_liveness_t; -/** Structure for circuit build times history */ -typedef struct { - /** The circular array of recorded build times in milliseconds */ - build_time_t circuit_build_times[CBT_NCIRCUITS_TO_OBSERVE]; - /** Current index in the circuit_build_times circular array */ - int build_times_idx; - /** Total number of build times accumulated. Max CBT_NCIRCUITS_TO_OBSERVE */ - int total_build_times; - /** Information about the state of our local network connection */ - network_liveness_t liveness; - /** Last time we built a circuit. Used to decide to build new test circs */ - time_t last_circ_at; - /** "Minimum" value of our pareto distribution (actually mode) */ - build_time_t Xm; - /** alpha exponent for pareto dist. */ - double alpha; - /** Have we computed a timeout? */ - int have_computed_timeout; - /** The exact value for that timeout in milliseconds. Stored as a double - * to maintain precision from calculations to and from quantile value. */ - double timeout_ms; - /** How long we wait before actually closing the circuit. */ - double close_ms; -} circuit_build_times_t; +typedef struct circuit_build_times_s circuit_build_times_t; /********************************* config.c ***************************/

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 22 Aug '13

22 Aug '13

commit 4e0b5160a6c9fd04a48b15f8b9c615a34a66fd8b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 22 09:16:41 2013 +0000 Update translations for torbirdy_completed --- ja/torbirdy.dtd | 7 +++---- ja/torbirdy.properties | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ja/torbirdy.dtd b/ja/torbirdy.dtd index bf13c22..013d8a5 100644 --- a/ja/torbirdy.dtd +++ b/ja/torbirdy.dtd @@ -12,9 +12,9 @@ <!ENTITY torbirdy.prefs.save.button "保存"> <!ENTITY torbirdy.prefs.save.key "s"> <!ENTITY torbirdy.prefs.cancel.button "キャンセル"> -<!ENTITY torbirdy.prefs.extra1.button "問題の解決"> -<!ENTITY torbirdy.prefs.extra1.key "o"> -<!ENTITY torbirdy.prefs.extra2.button "設定をテストする"> +<!ENTITY torbirdy.prefs.extra1.button "デフォルトに戻す"> +<!ENTITY torbirdy.prefs.extra1.key "d"> +<!ENTITY torbirdy.prefs.extra2.button "プロキシ設定をテストする"> <!ENTITY torbirdy.prefs.extra2.key "n"> <!ENTITY torbirdy.prefs.proxy.label "プロクシ設定"> <!ENTITY torbirdy.prefs.privacy.label "プライバシー設定"> @@ -59,4 +59,3 @@ <!ENTITY torbirdy.panel.preferences.label "TorBirdyの設定を開く"> <!ENTITY torbirdy.firstrun.title "TorBirdy First-Run"> -<!ENTITY torbirdy.troubleshoot.title "問題の解決"> diff --git a/ja/torbirdy.properties b/ja/torbirdy.properties index 478e0ca..81d8689 100644 --- a/ja/torbirdy.properties +++ b/ja/torbirdy.properties @@ -13,7 +13,7 @@ torbirdy.email.advanced=TorBirdyの高度な設定を変更することは推奨 torbirdy.email.advanced.nextwarning=次回もこの警告を表示 torbirdy.email.advanced.title=TorBirdyの高度な設定 -torbirdy.restart=効果的なタイムゾーンの設定のために、Thunderbirdを閉じて、もう一度開き直してください。 +torbirdy.restart=タイムゾーンの選択はThunderbird を再起動後有効になります。 torbirdy.firstrun=現在TorBirdy起動中です。\n\n匿名性の保護を助けるために、TorBirdyは設定したThunderbirdの設定を強制し、あなたか、どんなアドオンによってもそれらが変更されないようにします。変更できる設定もあり、これらはTorBirdyの初期設定ダイアログを通しアクセスされます。 TorBirdyがアンインストールされたか、無効になった時、変更したすべての設定がデフォルトの値 (TorBirdyのインストールの前の値)にリセットされます。\n\nあなたが新しいユーザーである場合、私達がTorBirdyでユーザーのために成し遂げようとしていることを理解していただくために、TorBirdyのウェブサイトを一読することが推奨されます。 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 22 Aug '13

22 Aug '13

commit b213eb08ae967bfe59b7252cd20db8cf740b1783 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 22 09:16:32 2013 +0000 Update translations for torbirdy --- ja/torbirdy.dtd | 2 +- ja/torbirdy.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ja/torbirdy.dtd b/ja/torbirdy.dtd index 0800f0e..013d8a5 100644 --- a/ja/torbirdy.dtd +++ b/ja/torbirdy.dtd @@ -14,7 +14,7 @@ <!ENTITY torbirdy.prefs.cancel.button "キャンセル"> <!ENTITY torbirdy.prefs.extra1.button "デフォルトに戻す"> <!ENTITY torbirdy.prefs.extra1.key "d"> -<!ENTITY torbirdy.prefs.extra2.button ""> +<!ENTITY torbirdy.prefs.extra2.button "プロキシ設定をテストする"> <!ENTITY torbirdy.prefs.extra2.key "n"> <!ENTITY torbirdy.prefs.proxy.label "プロクシ設定"> <!ENTITY torbirdy.prefs.privacy.label "プライバシー設定"> diff --git a/ja/torbirdy.properties b/ja/torbirdy.properties index 53ce4fc..81d8689 100644 --- a/ja/torbirdy.properties +++ b/ja/torbirdy.properties @@ -13,7 +13,7 @@ torbirdy.email.advanced=TorBirdyの高度な設定を変更することは推奨 torbirdy.email.advanced.nextwarning=次回もこの警告を表示 torbirdy.email.advanced.title=TorBirdyの高度な設定 -# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect. +torbirdy.restart=タイムゾーンの選択はThunderbird を再起動後有効になります。 torbirdy.firstrun=現在TorBirdy起動中です。\n\n匿名性の保護を助けるために、TorBirdyは設定したThunderbirdの設定を強制し、あなたか、どんなアドオンによってもそれらが変更されないようにします。変更できる設定もあり、これらはTorBirdyの初期設定ダイアログを通しアクセスされます。 TorBirdyがアンインストールされたか、無効になった時、変更したすべての設定がデフォルトの値 (TorBirdyのインストールの前の値)にリセットされます。\n\nあなたが新しいユーザーである場合、私達がTorBirdyでユーザーのために成し遂げようとしていることを理解していただくために、TorBirdyのウェブサイトを一読することが推奨されます。 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

r26313: {website} yet another place to clarify bits vs bytes (website/trunk/getinvolved/en)
by Roger Dingledine 22 Aug '13

22 Aug '13

Author: arma Date: 2013-08-22 03:50:47 +0000 (Thu, 22 Aug 2013) New Revision: 26313 Modified: website/trunk/getinvolved/en/tshirt.wml Log: yet another place to clarify bits vs bytes Modified: website/trunk/getinvolved/en/tshirt.wml =================================================================== --- website/trunk/getinvolved/en/tshirt.wml 2013-08-21 12:22:52 UTC (rev 26312) +++ website/trunk/getinvolved/en/tshirt.wml 2013-08-22 03:50:47 UTC (rev 26313) @@ -21,8 +21,8 @@ donate/donate>">donation</a> to the Tor Project.</li> <li>Operate a fast <a href="<page docs/tor-doc-relay>">Tor relay</a> that's been running for the past two months: you are eligible if you - allow exits to port 80 and you average 100 KB/s traffic, or if you're - not an exit but you average 500 KB/s traffic.</li> + allow exits to port 80 and you average 100 KBytes/s traffic, or if you're + not an exit but you average 500 KBytes/s traffic.</li> <li>Help out in <a href="<page getinvolved/volunteer>">other ways</a>. <a href="<page getinvolved/translation>">Maintain a translation</a>. Write a

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 22 Aug '13

22 Aug '13

commit f8b4e69f7523b93f02e9d47c5c23319b3e2a3e24 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 22 00:46:46 2013 +0000 Update translations for tor-launcher-network-settings --- id/network-settings.dtd | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/id/network-settings.dtd b/id/network-settings.dtd index 52cdce6..9cd4d28 100644 --- a/id/network-settings.dtd +++ b/id/network-settings.dtd @@ -2,27 +2,27 @@  -<!ENTITY torsettings.prompt ""> +<!ENTITY torsettings.prompt "Sebelum Tor Browser Bundle mencoba menghubingi network Tor, anda harus menyediakan informasi tentang koneksi internet komputer ini."> <!ENTITY torSettings.yes "Ya"> <!ENTITY torSettings.no "Tidak"> -<!ENTITY torSettings.firstQuestion ""> +<!ENTITY torSettings.firstQuestion "Yang mana dari di bawah ini cocok dengan situasi anda?"> <!ENTITY torSettings.configurePrompt1 ""> -<!ENTITY torSettings.configurePrompt2 ""> -<!ENTITY torSettings.configure ""> +<!ENTITY torSettings.configurePrompt2 "Saya perlu menyesuaikan pengaturan network."> +<!ENTITY torSettings.configure "Konfigur"> <!ENTITY torSettings.connectPrompt1 ""> <!ENTITY torSettings.connectPrompt2 ""> -<!ENTITY torSettings.connect ""> +<!ENTITY torSettings.connect "Hubungi"> -<!ENTITY torSettings.proxyQuestion ""> +<!ENTITY torSettings.proxyQuestion "Apakah komputer ini perlu menggunakan proxy untuk mengakses internet?">  -<!ENTITY torSettings.proxyHelp ""> -<!ENTITY torSettings.enterProxy ""> -<!ENTITY torSettings.firewallQuestion ""> -<!ENTITY torSettings.firewallHelp ""> -<!ENTITY torSettings.enterFirewall ""> -<!ENTITY torSettings.bridgeQuestion ""> +<!ENTITY torSettings.proxyHelp "Kalau anda tidak yakin bagaimana menjawab pertanyaan ini, periksalah pengaturan Internet di browser lain untuk melihat apakah dia diatur untuk menggunakan proxy."> +<!ENTITY torSettings.enterProxy "Masukkan pengaturan proxy."> +<!ENTITY torSettings.firewallQuestion "Apakah koneksi Internet komputer ini melalui firewall yang hanya memperbolehkan koneksi ke port-port tertentu?"> +<!ENTITY torSettings.firewallHelp "Jika anda tidak yakin atas jawaban pertanyaan ini, pilih Tidak. Jika anda mendapatkan masalah dalam menghubungi network Tor, ubah pengaturan ini."> +<!ENTITY torSettings.enterFirewall "Masukkan port-port (pisahkan dengan koma) yang diperbolehkan oleh firewall."> +<!ENTITY torSettings.bridgeQuestion "Jika koneksi Internet komputer ini disensor, anda perlu mengumpulkan dan menggunakan bridge relays.&#160; Jika tidak, klik Hubungkan.">  @@ -30,8 +30,8 @@ <!ENTITY torsettings.optional "Opsional"> -<!ENTITY torsettings.useProxy.checkbox ""> -<!ENTITY torsettings.useProxy.type ""> +<!ENTITY torsettings.useProxy.checkbox "Komputer ini perlu menggunakan proxy untuk mengakses Internet."> +<!ENTITY torsettings.useProxy.type "Tipe Proxy:"> <!ENTITY torsettings.useProxy.address "Alamat:"> <!ENTITY torsettings.useProxy.address.placeholder "alamat IP atau nama host"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -44,11 +44,11 @@ <!ENTITY torsettings.firewall.allowedPorts "Port yang diizinkan:"> <!ENTITY torsettings.useBridges.checkbox "Internet Service Provider (ISP) saya memblokir koneksi ke jaringan Tor"> <!ENTITY torsettings.useBridges.label "Masukkan satu atau lebih estafet jembatan diformulir address:port."> -<!ENTITY torsettings.useBridges.placeholder ""> +<!ENTITY torsettings.useBridges.placeholder "address:port"> -<!ENTITY torsettings.copyLog ""> +<!ENTITY torsettings.copyLog "Salin Log Tor Ke Clipboard"> <!ENTITY torsettings.bridgeHelpTitle ""> <!ENTITY torsettings.bridgeHelp1 ""> -<!ENTITY torsettings.bridgeHelp2 ""> +<!ENTITY torsettings.bridgeHelp2 "Untuk mengumpulkan bridge relays, gunakan web browser untuk mengunjungi halaman ini: https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3 ""> <!ENTITY torsettings.bridgeHelp4 "">

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 22 Aug '13

22 Aug '13

commit be930ce7b21e94a8e460baaf3f1262466838c996 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 22 00:46:37 2013 +0000 Update translations for tor-launcher-properties --- id/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/torlauncher.properties b/id/torlauncher.properties index 8cbe03a..48605cd 100644 --- a/id/torlauncher.properties +++ b/id/torlauncher.properties @@ -22,7 +22,7 @@ torlauncher.error_proxy_addr_missing=Anda harus menentukan baik alamat IP atau n torlauncher.error_proxy_type_missing=Anda harus memilih jenis proxy. torlauncher.error_bridges_missing=Anda harus menspesifikan satu bridge atau lebih. -# torlauncher.connect=Connect +torlauncher.connect=Hubungi torlauncher.quit=Berhenti torlauncher.quit_win=Keluar # torlauncher.done=Done

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 21 Aug '13

21 Aug '13

commit 973bddfcf80f3d7db192a293ef6230f12cf1b456 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 21 22:46:50 2013 +0000 Update translations for tails-misc_completed --- pt_BR.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index ca94ecf..485cc29 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Communia <ameaneantie(a)riseup.net>, 2013 # eduardolvt, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-07-30 19:08+0200\n" -"PO-Revision-Date: 2013-08-09 09:38+0000\n" -"Last-Translator: eduardolvt\n" +"POT-Creation-Date: 2013-08-07 14:06+0200\n" +"PO-Revision-Date: 2013-08-21 22:40+0000\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +35,7 @@ msgid "" "<p>Anyone who can see this reply will probably infer you are\n" "a Tails user. Time to wonder how much you trust your\n" "Internet and mailbox providers?</p>\n" -msgstr "<h1>Ajude-nos a consertar seu bug!</h1>\n<p>Leia <a href=\"%s\">nossas instruções para reportar bug</a>.</p>\n<p><strong>Não inclua mais informações pessoais do que o necessário!</strong></p>\n<h2>Sobre dar-nos um endereço de e-mail</h2>\n<p>Se você não se importa em abrir um pouco da sua identidade\naos desenvolvedores Tails, você pode prover um email para contar-nos\nmais detalhes sobre o bug. Adicionalmente, entrando uma chave PGP\npública, nos permite encriptar futuras comunicações via e-mail.</p>\n<p>Qualquer um que puder ver esta resposta provavelmente deduzirá\nque você é um usuário Tails. Tempo para pensar o quanto você confia\nna sua internet e no seu provedor de e-mail?</p>\n" +msgstr "<h1>Ajude-nos a consertar seu bug!</h1>\n<p>Leia <a href=\"%s\">nossas instruções para de relatorio de bug</a>.</p>\n<p><strong>Não inclua mais informações pessoais do que o necessário!</strong></p>\n<h2>Sobre dar-nos um endereço de e-mail</h2>\n<p>Se você não se importar em abrir um pouco da sua identidade\naos desenvolvedores Tails, envie-nos um e-mail para contar\nmais detalhes sobre o bug. Além disso, introduzir uma chave PGP\npública, nos permite criptografar futuras comunicações relativas ao bug.</p>\n<p>Qualquer um que puder vir esta resposta provavelmente deduzirá\nque você é um usuário Tails. Tempo para pensar o quanto você confia\nna sua internet e no seu provedor de e-mail?</p>\n" #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet"

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2013