- tor-commits - lists.torproject.org

[tor/master] Use timevals, not time_t, when expiring circuits.
by nickm＠torproject.org 30 Mar '11

30 Mar '11

commit aa950e6c48471f00ff9497fa4e9fad1c71e75868 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 26 01:34:42 2011 -0400 Use timevals, not time_t, when expiring circuits. We've got millisecond timers now, we might as well use them. This change won't actually make circuits get expiered with microsecond precision, since we only call the expiry functions once per second. Still, it should avoid the situation where we have a circuit get expired too early because of rounding. A couple of the expiry functions now call tor_gettimeofday: this should be cheap since we're only doing it once per second. If it gets to be called more often, though, we should onsider having the current time be an argument again. --- changes/cbt_hi_res | 7 ++++ src/or/circuitbuild.c | 2 +- src/or/circuitlist.c | 8 ++-- src/or/circuituse.c | 81 ++++++++++++++++++++++++++++++------------------- src/or/circuituse.h | 2 +- src/or/main.c | 4 ++- src/or/or.h | 3 +- src/or/rephist.c | 4 +- 8 files changed, 69 insertions(+), 42 deletions(-) diff --git a/changes/cbt_hi_res b/changes/cbt_hi_res new file mode 100644 index 0000000..c0df118 --- /dev/null +++ b/changes/cbt_hi_res @@ -0,0 +1,7 @@ + o Minor features + - When expiring circuits, use microsecond timers rather than one-second + timers. This can avoid an unpleasant situation where a circuit is + launched near the end of one second and expired right near the + beginning of the next, and prevent fluctuations in circuit timeout + values. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 83ac7a5..37b761f 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2041,7 +2041,7 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) struct timeval end; long timediff; tor_gettimeofday(&end); - timediff = tv_mdiff(&circ->_base.highres_created, &end); + timediff = tv_mdiff(&circ->_base.timestamp_created, &end); /* * If the circuit build time is much greater than we would have cut diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index b4f5f45..d1fea37 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -398,8 +398,7 @@ circuit_initial_package_window(void) static void init_circuit_base(circuit_t *circ) { - circ->timestamp_created = time(NULL); - tor_gettimeofday(&circ->highres_created); + tor_gettimeofday(&circ->timestamp_created); circ->package_window = circuit_initial_package_window(); circ->deliver_window = CIRCWINDOW_START; @@ -609,9 +608,10 @@ circuit_dump_details(int severity, circuit_t *circ, int conn_array_index, const char *type, int this_circid, int other_circid) { log(severity, LD_CIRC, "Conn %d has %s circuit: circID %d (other side %d), " - "state %d (%s), born %d:", + "state %d (%s), born %ld:", conn_array_index, type, this_circid, other_circid, circ->state, - circuit_state_to_string(circ->state), (int)circ->timestamp_created); + circuit_state_to_string(circ->state), + (long)circ->timestamp_created.tv_sec); if (CIRCUIT_IS_ORIGIN(circ)) { /* circ starts at this node */ circuit_log_path(severity, LD_CIRC, TO_ORIGIN_CIRCUIT(circ)); } diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 8d9d115..ac4bba5 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -31,7 +31,7 @@ extern circuit_t *global_circuitlist; /* from circuitlist.c */ /********* END VARIABLES ************/ -static void circuit_expire_old_circuits_clientside(time_t now); +static void circuit_expire_old_circuits_clientside(void); static void circuit_increment_failure_count(void); /** Return 1 if <b>circ</b> could be returned by circuit_get_best(). @@ -162,7 +162,7 @@ circuit_is_better(circuit_t *a, circuit_t *b, uint8_t purpose) return 1; } else { if (a->timestamp_dirty || - a->timestamp_created > b->timestamp_created) + timercmp(&a->timestamp_created, &b->timestamp_created, >)) return 1; if (CIRCUIT_IS_ORIGIN(b) && TO_ORIGIN_CIRCUIT(b)->build_state->is_internal) @@ -223,7 +223,7 @@ circuit_get_best(edge_connection_t *conn, int must_be_open, uint8_t purpose, #define REND_PARALLEL_INTRO_DELAY 15 if (purpose == CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT && !must_be_open && circ->state != CIRCUIT_STATE_OPEN && - circ->timestamp_created + REND_PARALLEL_INTRO_DELAY < now) { + circ->timestamp_created.tv_sec + REND_PARALLEL_INTRO_DELAY < now) { intro_going_on_but_too_old = 1; continue; } @@ -275,22 +275,38 @@ circuit_conforms_to_options(const origin_circuit_t *circ, * at least CircuitBuildTimeout seconds ago. */ void -circuit_expire_building(time_t now) +circuit_expire_building(void) { circuit_t *victim, *next_circ = global_circuitlist; /* circ_times.timeout_ms and circ_times.close_ms are from * circuit_build_times_get_initial_timeout() if we haven't computed * custom timeouts yet */ - time_t general_cutoff = now - tor_lround(circ_times.timeout_ms/1000); - time_t begindir_cutoff = now - tor_lround(circ_times.timeout_ms/2000); - time_t fourhop_cutoff = now - tor_lround(4*circ_times.timeout_ms/3000); - time_t cannibalize_cutoff = now - tor_lround(circ_times.timeout_ms/2000); - time_t close_cutoff = now - tor_lround(circ_times.close_ms/1000); - time_t introcirc_cutoff = begindir_cutoff; + struct timeval general_cutoff, begindir_cutoff, fourhop_cutoff, + cannibalize_cutoff, close_cutoff, extremely_old_cutoff; + struct timeval now; + struct timeval introcirc_cutoff; cpath_build_state_t *build_state; + tor_gettimeofday(&now); +#define SET_CUTOFF(target, msec) do { \ + long ms = tor_lround(msec); \ + struct timeval diff; \ + diff.tv_sec = ms / 1000; \ + diff.tv_usec = (ms % 1000) * 1000; \ + timersub(&now, &diff, &target); \ + } while (0) + + SET_CUTOFF(general_cutoff, circ_times.timeout_ms); + SET_CUTOFF(begindir_cutoff, circ_times.timeout_ms / 2.0); + SET_CUTOFF(fourhop_cutoff, circ_times.timeout_ms * (4/3.0)); + SET_CUTOFF(cannibalize_cutoff, circ_times.timeout_ms / 2.0); + SET_CUTOFF(close_cutoff, circ_times.close_ms); + SET_CUTOFF(extremely_old_cutoff, circ_times.close_ms*2 + 1000); + + introcirc_cutoff = begindir_cutoff; + while (next_circ) { - time_t cutoff; + struct timeval cutoff; victim = next_circ; next_circ = next_circ->next; if (!CIRCUIT_IS_ORIGIN(victim) || /* didn't originate here */ @@ -312,7 +328,7 @@ circuit_expire_building(time_t now) else cutoff = general_cutoff; - if (victim->timestamp_created > cutoff) + if (timercmp(&victim->timestamp_created, &cutoff, >)) continue; /* it's still young, leave it alone */ #if 0 @@ -358,7 +374,7 @@ circuit_expire_building(time_t now) * because that's set when they switch purposes */ if (TO_ORIGIN_CIRCUIT(victim)->rend_data || - victim->timestamp_dirty > cutoff) + victim->timestamp_dirty > cutoff.tv_sec) continue; break; case CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED: @@ -367,7 +383,7 @@ circuit_expire_building(time_t now) * make an introduction attempt. so timestamp_dirty * will reflect the time since the last attempt. */ - if (victim->timestamp_dirty > cutoff) + if (victim->timestamp_dirty > cutoff.tv_sec) continue; break; } @@ -407,15 +423,15 @@ circuit_expire_building(time_t now) * it off at, we probably had a suspend event along this codepath, * and we should discard the value. */ - if (now - victim->timestamp_created > 2*circ_times.close_ms/1000+1) { + if (timercmp(&victim->timestamp_created, &extremely_old_cutoff, <)) { log_notice(LD_CIRC, "Extremely large value for circuit build timeout: %lds. " "Assuming clock jump. Purpose %d", - (long)(now - victim->timestamp_created), + (long)(now.tv_sec - victim->timestamp_created.tv_sec), victim->purpose); } else if (circuit_build_times_count_close(&circ_times, first_hop_succeeded, - victim->timestamp_created)) { + victim->timestamp_created.tv_sec)) { circuit_build_times_set_timeout(&circ_times); } } @@ -636,7 +652,7 @@ circuit_build_needed_circs(time_t now) time_to_new_circuit = now + options->NewCircuitPeriod; if (proxy_mode(get_options())) addressmap_clean(now); - circuit_expire_old_circuits_clientside(now); + circuit_expire_old_circuits_clientside(); #if 0 /* disable for now, until predict-and-launch-new can cull leftovers */ circ = circuit_get_youngest_clean_open(CIRCUIT_PURPOSE_C_GENERAL); @@ -725,17 +741,20 @@ circuit_detach_stream(circuit_t *circ, edge_connection_t *conn) * for too long and has no streams on it: mark it for close. */ static void -circuit_expire_old_circuits_clientside(time_t now) +circuit_expire_old_circuits_clientside(void) { circuit_t *circ; - time_t cutoff; + struct timeval cutoff, now; + + tor_gettimeofday(&now); + cutoff = now; if (circuit_build_times_needs_circuits(&circ_times)) { /* Circuits should be shorter lived if we need more of them * for learning a good build timeout */ - cutoff = now - IDLE_TIMEOUT_WHILE_LEARNING; + cutoff.tv_sec -= IDLE_TIMEOUT_WHILE_LEARNING; } else { - cutoff = now - get_options()->CircuitIdleTimeout; + cutoff.tv_sec -= get_options()->CircuitIdleTimeout; } for (circ = global_circuitlist; circ; circ = circ->next) { @@ -745,15 +764,15 @@ circuit_expire_old_circuits_clientside(time_t now) * on it, mark it for close. */ if (circ->timestamp_dirty && - circ->timestamp_dirty + get_options()->MaxCircuitDirtiness < now && + circ->timestamp_dirty + get_options()->MaxCircuitDirtiness < now.tv_sec && !TO_ORIGIN_CIRCUIT(circ)->p_streams /* nothing attached */ ) { - log_debug(LD_CIRC, "Closing n_circ_id %d (dirty %d secs ago, " + log_debug(LD_CIRC, "Closing n_circ_id %d (dirty %ld sec ago, " "purpose %d)", - circ->n_circ_id, (int)(now - circ->timestamp_dirty), + circ->n_circ_id, (long)(now.tv_sec - circ->timestamp_dirty), circ->purpose); circuit_mark_for_close(circ, END_CIRC_REASON_FINISHED); } else if (!circ->timestamp_dirty && circ->state == CIRCUIT_STATE_OPEN) { - if (circ->timestamp_created < cutoff) { + if (timercmp(&circ->timestamp_created, &cutoff, <)) { if (circ->purpose == CIRCUIT_PURPOSE_C_GENERAL || circ->purpose == CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT || circ->purpose == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO || @@ -762,8 +781,8 @@ circuit_expire_old_circuits_clientside(time_t now) circ->purpose <= CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED) || circ->purpose == CIRCUIT_PURPOSE_S_CONNECT_REND) { log_debug(LD_CIRC, - "Closing circuit that has been unused for %ld seconds.", - (long)(now - circ->timestamp_created)); + "Closing circuit that has been unused for %ld msec.", + tv_mdiff(&circ->timestamp_created, &now)); circuit_mark_for_close(circ, END_CIRC_REASON_FINISHED); } else if (!TO_ORIGIN_CIRCUIT(circ)->is_ancient) { /* Server-side rend joined circuits can end up really old, because @@ -775,9 +794,9 @@ circuit_expire_old_circuits_clientside(time_t now) circ->purpose != CIRCUIT_PURPOSE_S_INTRO) { log_notice(LD_CIRC, "Ancient non-dirty circuit %d is still around after " - "%ld seconds. Purpose: %d", + "%ld milliseconds. Purpose: %d", TO_ORIGIN_CIRCUIT(circ)->global_identifier, - (long)(now - circ->timestamp_created), + tv_mdiff(&circ->timestamp_created, &now), circ->purpose); /* FFFF implement a new circuit_purpose_to_string() so we don't * just print out a number for circ->purpose */ @@ -1123,7 +1142,7 @@ circuit_launch_by_extend_info(uint8_t purpose, /* reset the birth date of this circ, else expire_building * will see it and think it's been trying to build since it * began. */ - circ->_base.timestamp_created = time(NULL); + tor_gettimeofday(&circ->_base.timestamp_created); switch (purpose) { case CIRCUIT_PURPOSE_C_ESTABLISH_REND: case CIRCUIT_PURPOSE_S_ESTABLISH_INTRO: diff --git a/src/or/circuituse.h b/src/or/circuituse.h index 1a604b4..a121099 100644 --- a/src/or/circuituse.h +++ b/src/or/circuituse.h @@ -12,7 +12,7 @@ #ifndef _TOR_CIRCUITUSE_H #define _TOR_CIRCUITUSE_H -void circuit_expire_building(time_t now); +void circuit_expire_building(void); void circuit_remove_handled_ports(smartlist_t *needed_ports); int circuit_stream_is_being_handled(edge_connection_t *conn, uint16_t port, int min); diff --git a/src/or/main.c b/src/or/main.c index 214a4fa..83d1e1e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1150,7 +1150,9 @@ run_scheduled_events(time_t now) * We do this before step 4, so it can try building more if * it's not comfortable with the number of available circuits. */ - circuit_expire_building(now); + /* XXXX022 If our circuit build timeout is much lower than a second, maybe + we should do this more often? */ + circuit_expire_building(); /** 3b. Also look at pending streams and prune the ones that 'began' * a long time ago but haven't gotten a 'connected' yet. diff --git a/src/or/or.h b/src/or/or.h index e3e01cf..3cadd31 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2126,10 +2126,9 @@ typedef struct circuit_t { * length ONIONSKIN_CHALLENGE_LEN. */ char *n_conn_onionskin; - time_t timestamp_created; /**< When was this circuit created? */ + struct timeval timestamp_created; /**< When was the circuit created? */ time_t timestamp_dirty; /**< When the circuit was first used, or 0 if the * circuit is clean. */ - struct timeval highres_created; /**< When exactly was the circuit created? */ uint16_t marked_for_close; /**< Should we close this circuit at the end of * the main loop? (If true, holds the line number diff --git a/src/or/rephist.c b/src/or/rephist.c index 58e8ff0..06704cf 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2356,9 +2356,9 @@ rep_hist_buffer_stats_add_circ(circuit_t *circ, time_t end_of_interval) return; if (!circuits_for_buffer_stats) circuits_for_buffer_stats = smartlist_create(); - start_of_interval = circ->timestamp_created > + start_of_interval = circ->timestamp_created.tv_sec > start_of_buffer_stats_interval ? - circ->timestamp_created : + circ->timestamp_created.tv_sec : start_of_buffer_stats_interval; interval_length = (int) (end_of_interval - start_of_interval); stat = tor_malloc_zero(sizeof(circ_buffer_stats_t));

1 0

[tor/maint-0.2.2] Use timevals, not time_t, when expiring circuits.
by nickm＠torproject.org 30 Mar '11

30 Mar '11

commit aa950e6c48471f00ff9497fa4e9fad1c71e75868 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 26 01:34:42 2011 -0400 Use timevals, not time_t, when expiring circuits. We've got millisecond timers now, we might as well use them. This change won't actually make circuits get expiered with microsecond precision, since we only call the expiry functions once per second. Still, it should avoid the situation where we have a circuit get expired too early because of rounding. A couple of the expiry functions now call tor_gettimeofday: this should be cheap since we're only doing it once per second. If it gets to be called more often, though, we should onsider having the current time be an argument again. --- changes/cbt_hi_res | 7 ++++ src/or/circuitbuild.c | 2 +- src/or/circuitlist.c | 8 ++-- src/or/circuituse.c | 81 ++++++++++++++++++++++++++++++------------------- src/or/circuituse.h | 2 +- src/or/main.c | 4 ++- src/or/or.h | 3 +- src/or/rephist.c | 4 +- 8 files changed, 69 insertions(+), 42 deletions(-) diff --git a/changes/cbt_hi_res b/changes/cbt_hi_res new file mode 100644 index 0000000..c0df118 --- /dev/null +++ b/changes/cbt_hi_res @@ -0,0 +1,7 @@ + o Minor features + - When expiring circuits, use microsecond timers rather than one-second + timers. This can avoid an unpleasant situation where a circuit is + launched near the end of one second and expired right near the + beginning of the next, and prevent fluctuations in circuit timeout + values. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 83ac7a5..37b761f 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2041,7 +2041,7 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) struct timeval end; long timediff; tor_gettimeofday(&end); - timediff = tv_mdiff(&circ->_base.highres_created, &end); + timediff = tv_mdiff(&circ->_base.timestamp_created, &end); /* * If the circuit build time is much greater than we would have cut diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index b4f5f45..d1fea37 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -398,8 +398,7 @@ circuit_initial_package_window(void) static void init_circuit_base(circuit_t *circ) { - circ->timestamp_created = time(NULL); - tor_gettimeofday(&circ->highres_created); + tor_gettimeofday(&circ->timestamp_created); circ->package_window = circuit_initial_package_window(); circ->deliver_window = CIRCWINDOW_START; @@ -609,9 +608,10 @@ circuit_dump_details(int severity, circuit_t *circ, int conn_array_index, const char *type, int this_circid, int other_circid) { log(severity, LD_CIRC, "Conn %d has %s circuit: circID %d (other side %d), " - "state %d (%s), born %d:", + "state %d (%s), born %ld:", conn_array_index, type, this_circid, other_circid, circ->state, - circuit_state_to_string(circ->state), (int)circ->timestamp_created); + circuit_state_to_string(circ->state), + (long)circ->timestamp_created.tv_sec); if (CIRCUIT_IS_ORIGIN(circ)) { /* circ starts at this node */ circuit_log_path(severity, LD_CIRC, TO_ORIGIN_CIRCUIT(circ)); } diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 8d9d115..ac4bba5 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -31,7 +31,7 @@ extern circuit_t *global_circuitlist; /* from circuitlist.c */ /********* END VARIABLES ************/ -static void circuit_expire_old_circuits_clientside(time_t now); +static void circuit_expire_old_circuits_clientside(void); static void circuit_increment_failure_count(void); /** Return 1 if <b>circ</b> could be returned by circuit_get_best(). @@ -162,7 +162,7 @@ circuit_is_better(circuit_t *a, circuit_t *b, uint8_t purpose) return 1; } else { if (a->timestamp_dirty || - a->timestamp_created > b->timestamp_created) + timercmp(&a->timestamp_created, &b->timestamp_created, >)) return 1; if (CIRCUIT_IS_ORIGIN(b) && TO_ORIGIN_CIRCUIT(b)->build_state->is_internal) @@ -223,7 +223,7 @@ circuit_get_best(edge_connection_t *conn, int must_be_open, uint8_t purpose, #define REND_PARALLEL_INTRO_DELAY 15 if (purpose == CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT && !must_be_open && circ->state != CIRCUIT_STATE_OPEN && - circ->timestamp_created + REND_PARALLEL_INTRO_DELAY < now) { + circ->timestamp_created.tv_sec + REND_PARALLEL_INTRO_DELAY < now) { intro_going_on_but_too_old = 1; continue; } @@ -275,22 +275,38 @@ circuit_conforms_to_options(const origin_circuit_t *circ, * at least CircuitBuildTimeout seconds ago. */ void -circuit_expire_building(time_t now) +circuit_expire_building(void) { circuit_t *victim, *next_circ = global_circuitlist; /* circ_times.timeout_ms and circ_times.close_ms are from * circuit_build_times_get_initial_timeout() if we haven't computed * custom timeouts yet */ - time_t general_cutoff = now - tor_lround(circ_times.timeout_ms/1000); - time_t begindir_cutoff = now - tor_lround(circ_times.timeout_ms/2000); - time_t fourhop_cutoff = now - tor_lround(4*circ_times.timeout_ms/3000); - time_t cannibalize_cutoff = now - tor_lround(circ_times.timeout_ms/2000); - time_t close_cutoff = now - tor_lround(circ_times.close_ms/1000); - time_t introcirc_cutoff = begindir_cutoff; + struct timeval general_cutoff, begindir_cutoff, fourhop_cutoff, + cannibalize_cutoff, close_cutoff, extremely_old_cutoff; + struct timeval now; + struct timeval introcirc_cutoff; cpath_build_state_t *build_state; + tor_gettimeofday(&now); +#define SET_CUTOFF(target, msec) do { \ + long ms = tor_lround(msec); \ + struct timeval diff; \ + diff.tv_sec = ms / 1000; \ + diff.tv_usec = (ms % 1000) * 1000; \ + timersub(&now, &diff, &target); \ + } while (0) + + SET_CUTOFF(general_cutoff, circ_times.timeout_ms); + SET_CUTOFF(begindir_cutoff, circ_times.timeout_ms / 2.0); + SET_CUTOFF(fourhop_cutoff, circ_times.timeout_ms * (4/3.0)); + SET_CUTOFF(cannibalize_cutoff, circ_times.timeout_ms / 2.0); + SET_CUTOFF(close_cutoff, circ_times.close_ms); + SET_CUTOFF(extremely_old_cutoff, circ_times.close_ms*2 + 1000); + + introcirc_cutoff = begindir_cutoff; + while (next_circ) { - time_t cutoff; + struct timeval cutoff; victim = next_circ; next_circ = next_circ->next; if (!CIRCUIT_IS_ORIGIN(victim) || /* didn't originate here */ @@ -312,7 +328,7 @@ circuit_expire_building(time_t now) else cutoff = general_cutoff; - if (victim->timestamp_created > cutoff) + if (timercmp(&victim->timestamp_created, &cutoff, >)) continue; /* it's still young, leave it alone */ #if 0 @@ -358,7 +374,7 @@ circuit_expire_building(time_t now) * because that's set when they switch purposes */ if (TO_ORIGIN_CIRCUIT(victim)->rend_data || - victim->timestamp_dirty > cutoff) + victim->timestamp_dirty > cutoff.tv_sec) continue; break; case CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED: @@ -367,7 +383,7 @@ circuit_expire_building(time_t now) * make an introduction attempt. so timestamp_dirty * will reflect the time since the last attempt. */ - if (victim->timestamp_dirty > cutoff) + if (victim->timestamp_dirty > cutoff.tv_sec) continue; break; } @@ -407,15 +423,15 @@ circuit_expire_building(time_t now) * it off at, we probably had a suspend event along this codepath, * and we should discard the value. */ - if (now - victim->timestamp_created > 2*circ_times.close_ms/1000+1) { + if (timercmp(&victim->timestamp_created, &extremely_old_cutoff, <)) { log_notice(LD_CIRC, "Extremely large value for circuit build timeout: %lds. " "Assuming clock jump. Purpose %d", - (long)(now - victim->timestamp_created), + (long)(now.tv_sec - victim->timestamp_created.tv_sec), victim->purpose); } else if (circuit_build_times_count_close(&circ_times, first_hop_succeeded, - victim->timestamp_created)) { + victim->timestamp_created.tv_sec)) { circuit_build_times_set_timeout(&circ_times); } } @@ -636,7 +652,7 @@ circuit_build_needed_circs(time_t now) time_to_new_circuit = now + options->NewCircuitPeriod; if (proxy_mode(get_options())) addressmap_clean(now); - circuit_expire_old_circuits_clientside(now); + circuit_expire_old_circuits_clientside(); #if 0 /* disable for now, until predict-and-launch-new can cull leftovers */ circ = circuit_get_youngest_clean_open(CIRCUIT_PURPOSE_C_GENERAL); @@ -725,17 +741,20 @@ circuit_detach_stream(circuit_t *circ, edge_connection_t *conn) * for too long and has no streams on it: mark it for close. */ static void -circuit_expire_old_circuits_clientside(time_t now) +circuit_expire_old_circuits_clientside(void) { circuit_t *circ; - time_t cutoff; + struct timeval cutoff, now; + + tor_gettimeofday(&now); + cutoff = now; if (circuit_build_times_needs_circuits(&circ_times)) { /* Circuits should be shorter lived if we need more of them * for learning a good build timeout */ - cutoff = now - IDLE_TIMEOUT_WHILE_LEARNING; + cutoff.tv_sec -= IDLE_TIMEOUT_WHILE_LEARNING; } else { - cutoff = now - get_options()->CircuitIdleTimeout; + cutoff.tv_sec -= get_options()->CircuitIdleTimeout; } for (circ = global_circuitlist; circ; circ = circ->next) { @@ -745,15 +764,15 @@ circuit_expire_old_circuits_clientside(time_t now) * on it, mark it for close. */ if (circ->timestamp_dirty && - circ->timestamp_dirty + get_options()->MaxCircuitDirtiness < now && + circ->timestamp_dirty + get_options()->MaxCircuitDirtiness < now.tv_sec && !TO_ORIGIN_CIRCUIT(circ)->p_streams /* nothing attached */ ) { - log_debug(LD_CIRC, "Closing n_circ_id %d (dirty %d secs ago, " + log_debug(LD_CIRC, "Closing n_circ_id %d (dirty %ld sec ago, " "purpose %d)", - circ->n_circ_id, (int)(now - circ->timestamp_dirty), + circ->n_circ_id, (long)(now.tv_sec - circ->timestamp_dirty), circ->purpose); circuit_mark_for_close(circ, END_CIRC_REASON_FINISHED); } else if (!circ->timestamp_dirty && circ->state == CIRCUIT_STATE_OPEN) { - if (circ->timestamp_created < cutoff) { + if (timercmp(&circ->timestamp_created, &cutoff, <)) { if (circ->purpose == CIRCUIT_PURPOSE_C_GENERAL || circ->purpose == CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT || circ->purpose == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO || @@ -762,8 +781,8 @@ circuit_expire_old_circuits_clientside(time_t now) circ->purpose <= CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED) || circ->purpose == CIRCUIT_PURPOSE_S_CONNECT_REND) { log_debug(LD_CIRC, - "Closing circuit that has been unused for %ld seconds.", - (long)(now - circ->timestamp_created)); + "Closing circuit that has been unused for %ld msec.", + tv_mdiff(&circ->timestamp_created, &now)); circuit_mark_for_close(circ, END_CIRC_REASON_FINISHED); } else if (!TO_ORIGIN_CIRCUIT(circ)->is_ancient) { /* Server-side rend joined circuits can end up really old, because @@ -775,9 +794,9 @@ circuit_expire_old_circuits_clientside(time_t now) circ->purpose != CIRCUIT_PURPOSE_S_INTRO) { log_notice(LD_CIRC, "Ancient non-dirty circuit %d is still around after " - "%ld seconds. Purpose: %d", + "%ld milliseconds. Purpose: %d", TO_ORIGIN_CIRCUIT(circ)->global_identifier, - (long)(now - circ->timestamp_created), + tv_mdiff(&circ->timestamp_created, &now), circ->purpose); /* FFFF implement a new circuit_purpose_to_string() so we don't * just print out a number for circ->purpose */ @@ -1123,7 +1142,7 @@ circuit_launch_by_extend_info(uint8_t purpose, /* reset the birth date of this circ, else expire_building * will see it and think it's been trying to build since it * began. */ - circ->_base.timestamp_created = time(NULL); + tor_gettimeofday(&circ->_base.timestamp_created); switch (purpose) { case CIRCUIT_PURPOSE_C_ESTABLISH_REND: case CIRCUIT_PURPOSE_S_ESTABLISH_INTRO: diff --git a/src/or/circuituse.h b/src/or/circuituse.h index 1a604b4..a121099 100644 --- a/src/or/circuituse.h +++ b/src/or/circuituse.h @@ -12,7 +12,7 @@ #ifndef _TOR_CIRCUITUSE_H #define _TOR_CIRCUITUSE_H -void circuit_expire_building(time_t now); +void circuit_expire_building(void); void circuit_remove_handled_ports(smartlist_t *needed_ports); int circuit_stream_is_being_handled(edge_connection_t *conn, uint16_t port, int min); diff --git a/src/or/main.c b/src/or/main.c index 214a4fa..83d1e1e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1150,7 +1150,9 @@ run_scheduled_events(time_t now) * We do this before step 4, so it can try building more if * it's not comfortable with the number of available circuits. */ - circuit_expire_building(now); + /* XXXX022 If our circuit build timeout is much lower than a second, maybe + we should do this more often? */ + circuit_expire_building(); /** 3b. Also look at pending streams and prune the ones that 'began' * a long time ago but haven't gotten a 'connected' yet. diff --git a/src/or/or.h b/src/or/or.h index e3e01cf..3cadd31 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2126,10 +2126,9 @@ typedef struct circuit_t { * length ONIONSKIN_CHALLENGE_LEN. */ char *n_conn_onionskin; - time_t timestamp_created; /**< When was this circuit created? */ + struct timeval timestamp_created; /**< When was the circuit created? */ time_t timestamp_dirty; /**< When the circuit was first used, or 0 if the * circuit is clean. */ - struct timeval highres_created; /**< When exactly was the circuit created? */ uint16_t marked_for_close; /**< Should we close this circuit at the end of * the main loop? (If true, holds the line number diff --git a/src/or/rephist.c b/src/or/rephist.c index 58e8ff0..06704cf 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2356,9 +2356,9 @@ rep_hist_buffer_stats_add_circ(circuit_t *circ, time_t end_of_interval) return; if (!circuits_for_buffer_stats) circuits_for_buffer_stats = smartlist_create(); - start_of_interval = circ->timestamp_created > + start_of_interval = circ->timestamp_created.tv_sec > start_of_buffer_stats_interval ? - circ->timestamp_created : + circ->timestamp_created.tv_sec : start_of_buffer_stats_interval; interval_length = (int) (end_of_interval - start_of_interval); stat = tor_malloc_zero(sizeof(circ_buffer_stats_t));

1 0

[tor/maint-0.2.2] Use cbt to tell when to launch parallel intro circuit
by nickm＠torproject.org 30 Mar '11

30 Mar '11

commit 65eb0e41ac05fd65bf8bef87426886fec45f7ca4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 26 01:39:11 2011 -0400 Use cbt to tell when to launch parallel intro circuit Implement feature from trac #2799 --- changes/cbt_parallel_intro | 4 ++++ src/or/circuituse.c | 13 ++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/changes/cbt_parallel_intro b/changes/cbt_parallel_intro new file mode 100644 index 0000000..44e377f --- /dev/null +++ b/changes/cbt_parallel_intro @@ -0,0 +1,4 @@ + o Minor features + - Use computed circuit-build timeouts to decide when to launch + parallel introdution circuits. (Previously, we would retry + after 15 seconds.) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index ac4bba5..447ec84 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -204,7 +204,7 @@ circuit_get_best(edge_connection_t *conn, int must_be_open, uint8_t purpose, int need_uptime, int need_internal) { circuit_t *circ, *best=NULL; - time_t now = time(NULL); + struct timeval now; int intro_going_on_but_too_old = 0; tor_assert(conn); @@ -213,17 +213,16 @@ circuit_get_best(edge_connection_t *conn, int must_be_open, uint8_t purpose, purpose == CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT || purpose == CIRCUIT_PURPOSE_C_REND_JOINED); + tor_gettimeofday(&now); + for (circ=global_circuitlist;circ;circ = circ->next) { if (!circuit_is_acceptable(circ,conn,must_be_open,purpose, - need_uptime,need_internal,now)) + need_uptime,need_internal,now.tv_sec)) continue; -/* XXX022 make this 15 be a function of circuit finishing times we've - * seen lately, a la Fallon Chen's GSoC work -RD */ -#define REND_PARALLEL_INTRO_DELAY 15 if (purpose == CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT && - !must_be_open && circ->state != CIRCUIT_STATE_OPEN && - circ->timestamp_created.tv_sec + REND_PARALLEL_INTRO_DELAY < now) { + !must_be_open && circ->state != CIRCUIT_STATE_OPEN && + tv_mdiff(&now, &circ->timestamp_created) > circ_times.timeout_ms) { intro_going_on_but_too_old = 1; continue; }

1 0

[tor/maint-0.2.2] Implement replacements for timer(add, cmp, sub) on platforms lacking them.
by nickm＠torproject.org 30 Mar '11

30 Mar '11

commit 5eaba5ac2128eebf095441e23b6b7516ce35dd5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 30 14:29:57 2011 -0400 Implement replacements for timer(add,cmp,sub) on platforms lacking them. --- src/common/compat.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index 35829e1..550c08b 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -333,6 +333,48 @@ struct tm *tor_localtime_r(const time_t *timep, struct tm *result); struct tm *tor_gmtime_r(const time_t *timep, struct tm *result); #endif +#ifndef timeradd +/** Replacement for timeradd on platforms that do not have it: sets tvout to + * the sum of tv1 and tv2. */ +#define timeradd(tv1,tv2,tvout) \ + do { \ + (tvout)->tv_sec = (tv1)->tv_sec + (tv2)->tv_sec; \ + (tvout)->tv_usec = (tv2)->tv_usec + (tv2)->tv_usec; \ + if ((tvout)->tv_usec >= 1000000) { \ + (tvout)->tv_usec -= 1000000; \ + (tvout)->tv_sec++; \ + } \ + } while (0) +#endif + +#ifndef timersub +/** Replacement for timersub on platforms that do not have it: sets tvout to + * tv1 minus tv2. */ +#define timersub(tv1,tv2,tvout) \ + do { \ + (tvout)->tv_sec = (tv1)->tv_sec - (tv2)->tv_sec; \ + (tvout)->tv_usec = (tv2)->tv_usec - (tv2)->tv_usec; \ + if ((tvout)->tv_usec < 0) { \ + (tvout)->tv_usec += 1000000; \ + (tvout)->tv_sec--; \ + } \ + } while (0) +#endif + +#ifndef timercmp +/** Replacement for timersub on platforms that do not have it: returns true + * iff the relational operator "op" makes the expression tv1 op tv2 true. + * + * Note that while this definition should work for all boolean opeators, some + * platforms' native timercmp definitions do not support >=, <=, or ==. So + * don't use those. + */ +#define timercmp(tv1,tv2,op) \ + (((tv1)->tv_sec == (tv2)->tv_sec) ? \ + ((tv1)->tv_usec op (tv2)->tv_usec) : \ + ((tv1)->tv_sec op (tv2)->tv_sec)) +#endif + /* ===== File compatibility */ int replace_file(const char *from, const char *to); int touch_file(const char *fname);

1 0

r24513: {website} fixed a tag in polish translation of info.wmi (website/trunk/donate/pl)
by Runa Sandvik 30 Mar '11

30 Mar '11

Author: runa Date: 2011-03-30 15:06:36 +0000 (Wed, 30 Mar 2011) New Revision: 24513 Modified: website/trunk/donate/pl/info.wmi Log: fixed a tag in polish translation of info.wmi Modified: website/trunk/donate/pl/info.wmi =================================================================== --- website/trunk/donate/pl/info.wmi 2011-03-30 14:08:39 UTC (rev 24512) +++ website/trunk/donate/pl/info.wmi 2011-03-30 15:06:36 UTC (rev 24513) @@ -7,7 +7,7 @@ <h2>Co dzieje się z moimi dotacjami?</h2> <p>Jeśli właśnie złożyłeś/aś dotację, dziękujemy Ci za nią. Twoje dary są deponowane w naszym funduszu ogólnym. Dołączasz do tysięcy innych - indywidualnych <a href=\"<page sponsors>\">sponsorów</a>, + indywidualnych <a href="<page about/sponsors>">sponsorów</a>, fundując przyszłość Tora i anonimowości on-line. </p> <p>Nasze <a href="<page about/financials>">dokumenty finansowe</a> są dostępne do Twojego przeglądu.</p>

1 0

r24512: {website} update po2wml to include Polish *.wmi for Polish *.wml (website/trunk)
by Runa Sandvik 30 Mar '11

30 Mar '11

Author: runa Date: 2011-03-30 14:08:39 +0000 (Wed, 30 Mar 2011) New Revision: 24512 Modified: website/trunk/po2wml.sh Log: update po2wml to include Polish *.wmi for Polish *.wml Modified: website/trunk/po2wml.sh =================================================================== --- website/trunk/po2wml.sh 2011-03-30 13:47:46 UTC (rev 24511) +++ website/trunk/po2wml.sh 2011-03-30 14:08:39 UTC (rev 24512) @@ -117,38 +117,21 @@ sed -i 's/PO4ASHARPEND-->//' "$wmldir/$subdir/$wmlfile" fi - # If the file is an Arabic translation, include - # the right header, css, menu files and footer - if [ $subdir = "ar" ] + # Include the English footer for most of the + # translations + if [[ $subdir != "ar" && $subdir != "pl" ]] then - # Head - orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"` - temp_head=`echo $orig_head | sed s@head.wmi@ar/head.wmi@` - new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.css"'` - sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$wmlfile" + echo '#include "foot.wmi"' >> "$wmldir/$subdir/$wmlfile" + fi - # Side (not all files include this) - orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$wmlfile"` - if [ -n "$orig_side" ] - then - new_side=`echo '#include "ar/side.wmi"'` - sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$wmlfile" - fi + # If the directory does not include sidenav.wmi, + # copy it from the English directory (only if + # the English directory has this file) + if [[ ! -e "$wmldir/$subdir/sidenav.wmi" && -e "$wmldir/en/sidenav.wmi" ]] + then + cp "$wmldir/en/sidenav.wmi" "$wmldir/$subdir" + fi - # Info (not all files include this) - orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$wmlfile"` - if [ -n "$orig_info" ] - then - new_info=`echo '#include "ar/info.wmi"'` - sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$wmlfile" - fi - - # Footer - echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" - else - # Include the English footer - echo '#include "foot.wmi"' >> "$wmldir/$subdir/$wmlfile" - fi fi } @@ -174,38 +157,20 @@ sed -i "s/$translator_comment//" "$wmldir/$subdir/$lang/$wmlfile" fi - # If the file is an Arabic translation, include the - # right header, css, menu files and footer - if [ $lang = "ar" ] + # Include the English footer for most of the + # translations + if [[ $lang != "ar" && $lang != "pl" ]] then - # Head - orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` - temp_head=`echo $orig_head | sed s@head.wmi@ar/head.wmi@` - new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.css"'` - sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$lang/$wmlfile" - - # Side (not all files include this) - orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` - if [ -n "$orig_side" ] - then - new_side=`echo '#include "ar/side.wmi"'` - sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$lang/$wmlfile" - fi - - # Info (not all files include this) - orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` - if [ -n "$orig_info" ] - then - new_info=`echo '#include "ar/info.wmi"'` - sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$lang/$wmlfile" - fi - - # Footer - echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" - else - # Include the English footer echo '#include "foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" fi + + # If the directory does not include sidenav.wmi, + # copy it from the English directory (only if + # the English directory has this file) + if [[ ! -e "$wmldir/$subdir/$lang/sidenav.wmi" && -e "$wmldir/$subdir/en/sidenav.wmi" ]] + then + cp "$wmldir/$subdir/en/sidenav.wmi" "$wmldir/$subdir/$lang/" + fi fi } @@ -239,10 +204,76 @@ then subdir="pl" nosubdir + + # If the file was written, include the right + # header, menu files and footer + if [ -e "$wmldir/$subdir/$wmlfile" ] + then + # Head + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"` + new_head=`echo $orig_head | sed s@head.wmi@pl/head.wmi@` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "pl/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "pl/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$wmlfile" + fi + + # Footer + echo '#include "pl/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" + fi fi + # If the file is an Arabic translation, include + # the right header, css, menu files and footer + if [ $subdir = "ar" ] + then + # Convert the file first + nosubdir + + # If it was written, do the following + if [ -e "$wmldir/$subdir/$wmlfile" ] + then + # Head + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"` + temp_head=`echo $orig_head | sed s@head.wmi@ar/head.wmi@` + new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.css"'` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "ar/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "ar/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$wmlfile" + fi + + # Footer + echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" + fi + fi + # Convert everything else - if [[ $subdir != "en" && $subdir != "zh_CN" && $subdir != "nb" && $subdir != "sv" ]] + if [[ $subdir != "en" && $subdir != "zh_CN" && $subdir != "nb" && $subdir != "sv" && $subdir != "ar" ]] then nosubdir fi @@ -273,10 +304,77 @@ then lang="pl" subdir + + # If the file was written, include the right + # header, menu files and footer + if [ -e "$wmldir/$subdir/$lang/$wmlfile" ] + then + # Head + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + new_head=`echo $orig_head | sed s@head.wmi@pl/head.wmi@` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$lang/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "pl/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "pl/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Footer + echo '#include "pl/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" + fi + fi + # If the file is an Arabic translation, include the + # right header, css, menu files and footer + if [ $lang = "ar" ] + then + # Convert the file first + subdir + + # If it was written, do the following + if [ -e "$wmldir/$subdir/$lang/$wmlfile" ] + then + # Head + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + temp_head=`echo $orig_head | sed s@head.wmi@ar/head.wmi@` + new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.css"'` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$lang/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "ar/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "ar/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Footer + echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" + fi + fi + # Convert everything else - if [[ $lang != "en" && $lang != "zh_CN" && $lang != "nb" && $lang != "sv" ]] + if [[ $lang != "en" && $lang != "zh_CN" && $lang != "nb" && $lang != "sv" && $lang != "ar" ]] then subdir fi

1 0

r24511: {website} include *.wmi files translated into Polish by Bogdan (in website/trunk: . about/pl docs/pl donate/pl getinvolved/pl include include/pl pl press/pl projects/pl torbutton/pl)
by Runa Sandvik 30 Mar '11

30 Mar '11

Author: runa Date: 2011-03-30 13:47:46 +0000 (Wed, 30 Mar 2011) New Revision: 24511 Added: website/trunk/include/pl/ website/trunk/include/pl/foot.wmi website/trunk/include/pl/info.wmi website/trunk/include/pl/navigation.wmi Modified: website/trunk/Makefile website/trunk/about/pl/sidenav.wmi website/trunk/docs/pl/sidenav.wmi website/trunk/donate/pl/info.wmi website/trunk/donate/pl/sidenav.wmi website/trunk/getinvolved/pl/sidenav.wmi website/trunk/pl/navigation.wmi website/trunk/press/pl/info.wmi website/trunk/press/pl/sidenav.wmi website/trunk/projects/pl/sidenav.wmi website/trunk/torbutton/pl/sidenav.wmi Log: include *.wmi files translated into Polish by Bogdan Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/Makefile 2011-03-30 13:47:46 UTC (rev 24511) @@ -10,7 +10,7 @@ # 4. make # 5. ./publish -export TORGIT=/home/phobos/onionrouter/onionrouter/tor.git/.git +export TORGIT=/home/runa/test/tor/.git export STABLETAG=tor-0.2.2.23-alpha export DEVTAG=tor-0.2.2.23-alpha Modified: website/trunk/about/pl/sidenav.wmi =================================================================== --- website/trunk/about/pl/sidenav.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/about/pl/sidenav.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,5 +1,5 @@ ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision$ # Translation-Priority: 2-medium # this structure defines the side nav bar for the /about pages @@ -9,7 +9,7 @@ # # url - the path to the wml page, as used the the <page> tag. This tag ensures # that links will point to the current language if supported, and alternately -# the english version +# the english version # # txt - the link text to be displayed. Different translations will # need to supply alternate txt @@ -18,39 +18,39 @@ my $sidenav; $sidenav = [ {'url' => 'about/overview', - 'txt' => 'Tor Overview', + 'txt' => 'Wprowadzenie do Tora', }, {'url' => 'about/torusers', - 'txt' => 'Users of Tor', + 'txt' => 'Użytkownicy Tora', }, {'url' => 'about/corepeople', - 'txt' => 'Tor People', + 'txt' => 'Ludzie Tora', 'subelements' => [ {'url' => 'about/board', - 'txt' => 'Board of Directors', - }, + 'txt' => 'Rada Dyrektorów', + }, {'url' => 'about/translators', - 'txt' => 'Translators', - }, + 'txt' => 'Tłumacze', + }, {'url' => 'about/volunteers', - 'txt' => 'Volunteers', - }, + 'txt' => 'Ochotnicy', + }, {'url' => 'about/contributors', - 'txt' => 'Past Contributors', + 'txt' => 'Dawni uczestnicy', }] }, {'url' => 'about/sponsors', - 'txt' => 'Sponsors', + 'txt' => 'Sponsorzy', }, {'url' => 'about/financials', - 'txt' => 'Financial Reports', + 'txt' => 'Raporty Finansowe', }, {'url' => 'projects/projects', - 'txt' => 'Projects', - }, + 'txt' => 'Projekty', + }, {'url' => 'docs/documentation', - 'txt' => 'Documentation', - }, + 'txt' => 'Dokumentacja', + }, ]; :> Modified: website/trunk/docs/pl/sidenav.wmi =================================================================== --- website/trunk/docs/pl/sidenav.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/docs/pl/sidenav.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,97 +1,97 @@ ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision$ # Translation-Priority: 2-medium -# this structure defines the side nav bar for the /about pages +# this structure defines the side nav bar for the /docs pages # and is the input for include/side.wmi # fields: # # url - the path to the wml page, as used the the <page> tag. This tag ensures # that links will point to the current language if supported, and alternately -# the english version +# the english version # # txt - the link text to be displayed. Different translations will -# need to supply alternate txt +# need to supply alternate txt <: my $sidenav; $sidenav = [ {'url' => 'docs/documentation', - 'txt' => 'Documentation Overview', - }, + 'txt' => 'Przegląd dokumentacji', + }, { 'url' => 'docs/installguide', - 'txt' => 'Installation Guides', + 'txt' => 'Przewodniki instalacji', 'subelements' => [ {'url' => 'docs/tor-doc-windows', - 'txt' => 'Installing on Windows', + 'txt' => 'Instalacja na Windows', }, {'url' => 'docs/tor-doc-unix', - 'txt' => 'Installing on Linux/BSD/Unix', + 'txt' => 'nstalacja na Linux/BSD/Unix', }, {'url' => 'docs/tor-doc-osx', - 'txt' => 'Installing on Mac OS X', + 'txt' => 'nstalacja na Mac OS X', }, {'url' => 'docs/android', - 'txt' => 'Installing on Android', + 'txt' => 'nstalacja na Androidzie', }, {'url' => 'docs/N900', - 'txt' => 'Installing on Maemo/N900', + 'txt' => 'nstalacja na Maemo/N900', }, {'url' => 'docs/verifying-signatures', - 'txt' => 'Verify our GPG signatures', + 'txt' => 'Weryfikacja naszych podpisów GPG', }, {'url' => 'docs/tor-doc-web', - 'txt' => 'Configuring your browser to use Tor', + 'txt' => 'Konfiguracja przegladarki, by używała Tora', }], }, {'url' => 'docs/manual', - 'txt' => 'Manuals', + 'txt' => 'Podręczniki', 'subelements' => [ {'url' => 'docs/tor-doc-relay', - 'txt' => 'Configuring a Relay', + 'txt' => 'Konfiguracja przekaźnika', }, {'url' => 'docs/tor-hidden-service', - 'txt' => 'Configuring a Hidden Service', - }, + 'txt' => 'Konfiguracja Usługi Ukrytej', + }, {'url' => 'docs/bridges', - 'txt' => 'Configuring a Bridge Relay', - }, + 'txt' => 'Konfiguracja przekaźnika mostkowego', + }, {'url' => 'docs/running-a-mirror', - 'txt' => 'Configuring a Mirror', + 'txt' => 'Konfiguracja mirrora', }, {'url' => 'docs/tor-manual', - 'txt' => 'Tor -stable Manual', + 'txt' => 'Podręcznik wersji stabilnej Tora', }, {'url' => 'docs/tor-manual-dev', - 'txt' => 'Tor -alpha Manual', + 'txt' => 'Podręcznik wersji alfa Tora', }, {'url' => 'docs/proxychain', - 'txt' => 'Configuring Tor to use a Proxy Server', + 'txt' => 'Konfiguracja Tora do używania proxy', }], }, { 'url' => '<wiki>', - 'txt' => 'Tor Wiki', - }, + 'txt' => 'Wiki Tora', + }, {'url' => 'docs/faq', - 'txt' => 'General FAQ', + 'txt' => 'Ogólne FAQ', }, {'url' => 'torbutton/torbutton-faq', - 'txt' => 'Torbutton FAQ', + 'txt' => 'FAQ Torbuttona', }, {'url' => 'docs/faq-abuse', - 'txt' => 'Abuse FAQ', + 'txt' => 'FAQ o nadużyciach', }, {'url' => 'docs/trademark-faq', - 'txt' => 'Trademark FAQ', + 'txt' => 'FAQ o znaku handlowym', }, {'url' => 'eff/tor-legal-faq', - 'txt' => 'Tor Legal FAQ', + 'txt' => 'Prawne FAQ Tora', }, {'url' => 'eff/tor-dmca-response', - 'txt' => 'Tor DMCA Response', - }, + 'txt' => 'Odpowiedź Tora na DMCA', + }, ]; :> Modified: website/trunk/donate/pl/info.wmi =================================================================== --- website/trunk/donate/pl/info.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/donate/pl/info.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,16 +1,16 @@ ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision$ # Translation-Priority: 2-medium <div class="img-shadow"> <div class="important-infoblock"> - <h2>What happens to my donation?</h2> - <p>If you've just donated, thank you for your donation. Your funds - are deposited into our general fund. You join thousands of other - individual <a href="<page about/sponsors>">sponsors</a> in funding - the future of Tor and online anonymity. </p> - <p>Our <a href="<page about/financials>">financial documents</a> - are available for your review.</p> + <h2>Co dzieje się z moimi dotacjami?</h2> + <p>Jeśli właśnie złożyłeś/aś dotację, dziękujemy Ci za nią. Twoje dary są + deponowane w naszym funduszu ogólnym. Dołączasz do tysięcy innych + indywidualnych <a href=\"<page sponsors>\">sponsorów</a>, + fundując przyszłość Tora i anonimowości on-line. </p> + <p>Nasze <a href="<page about/financials>">dokumenty finansowe</a> + są dostępne do Twojego przeglądu.</p> </div> </div> - + Modified: website/trunk/donate/pl/sidenav.wmi =================================================================== --- website/trunk/donate/pl/sidenav.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/donate/pl/sidenav.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,38 +1,38 @@ #!/usr/bin/wml ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision$ # Translation-Priority: 2-medium -# this structure defines the side nav bar for the /about pages +# this structure defines the side nav bar for the /donate pages # and is the input for include/side.wmi # fields: # # url - the path to the wml page, as used the the <page> tag. This tag ensures # that links will point to the current language if supported, and alternately -# the english version +# the english version # # txt - the link text to be displayed. Different translations will -# need to supply alternate txt +# need to supply alternate txt <: my $sidenav; $sidenav = [ {'url' => 'donate/donate', - 'txt' => 'Monetary Donations', + 'txt' => 'Dotacje pieniężne', }, {'url' => 'donate/donate-hardware', - 'txt' => 'Hardware Donations', + 'txt' => 'Dotacje sprzętu', }, {'url' => 'donate/donate-service', - 'txt' => 'Service Donations', - }, + 'txt' => 'Dotacje usług', + }, {'url' => 'donate/matching-program', - 'txt' => 'Matching Program', - }, + 'txt' => 'Program partnerski', + }, {'url' => 'donate/become-sponsor', - 'txt' => 'Become a Sponsor', - }, + 'txt' => 'Zostań Sponsorem', + }, ]; :> Modified: website/trunk/getinvolved/pl/sidenav.wmi =================================================================== --- website/trunk/getinvolved/pl/sidenav.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/getinvolved/pl/sidenav.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,32 +1,32 @@ #!/usr/bin/wml ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision$ # Translation-Priority: 2-medium -# this structure defines the side nav bar for the /about pages +# this structure defines the side nav bar for the /getinvolved pages # and is the input for include/side.wmi # fields: # # url - the path to the wml page, as used the the <page> tag. This tag ensures # that links will point to the current language if supported, and alternately -# the english version +# the english version # # txt - the link text to be displayed. Different translations will -# need to supply alternate txt +# need to supply alternate txt <: my $sidenav; $sidenav = [ {'url' => 'getinvolved/volunteer', - 'txt' => 'Get Involved', + 'txt' => 'Weź udział', }, {'url' => 'getinvolved/research', - 'txt' => 'Research', + 'txt' => 'Badania', }, {'url' => 'donate/donate', - 'txt' => 'Donate', + 'txt' => 'Dotacje', }, ]; :> Added: website/trunk/include/pl/foot.wmi =================================================================== --- website/trunk/include/pl/foot.wmi (rev 0) +++ website/trunk/include/pl/foot.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -0,0 +1,130 @@ +#!/usr/bin/env wml +#use "functions.wmi" + + <div id="footer"> + <div class="onion"><img src="$(IMGROOT)/onion.jpg" alt="Tor"></div> + <div class="about"> + <p>"Tor" i "Onion Logo" (logo cebuli) są zarejestrowanymi znakami handlowymi <a href="<page + docs/trademark-faq>">The Tor Project, Inc.</a> + Zawartość tej strony jest pod licencją + <a href="http://creativecommons.org/licenses/by/3.0/us/">Creative Commons Attribution + 3.0 United States License</a>, chyba że napisano inaczej.</p> + + </div> +  +  + <div class="col first"> + <h4>About Tor</h4> + <ul> + <li><a href="<page about/overview>">Co robi Tor</a></li> + <li><a href="<page about/torusers>">Użytkownicy Tora</a></li> + <li><a href="<page about/corepeople>">Główni ludzie Tora</a></li> + <li><a href="<page about/sponsors>">Sponsorzy</a></li> + <li><a href="<page about/contact>">Kontakt</a></li> + </ul> + </div> +  + <div class="col"> + <h4>Get Involved</h4> + <ul> + <li><a href="<page donate/donate>">Dotacje</a></li> + <li><a href="<page docs/documentation>#MailingLists">Listy mailingowe</a></li> + <li><a href="<page getinvolved/mirrors>">Mirrory</a></li> + <li><a href="<page docs/hidden-services>">Usługi Ukryte</a></li> + <li><a href="<page getinvolved/translation>">Tłumaczenia</a></li> + <li><a href="<page getinvolved/open-positions>">Kariery</a></li> + </ul> + </div> +  + <div class="col"> + <h4>Documentation</h4> + <ul> + <li><a href="<page docs/tor-manual>">Podręczniki</a></li> + <li><a href="<page docs/documentation>">Przewodniki instalacji</a></li> + <li><a href="<wiki>">Wiki Tora</a></li> + <li><a href="<page docs/faq>">Ogólne FAQ Tora</a></li> + </ul> + </div> +  + +  + <div class="col wider"> + <h4>Languages</h4> + <: if (has_translations()) { :> + <p> + Ta strona jest także dostępna w następujących językach: + <: print list_translations() :>.<br /> + Jak ustawić <a href="http://www.debian.org/intro/cn#howtoset">domyślny język dokumentu</a>. + </p> + <: }; :> + </div> + + + </div> +  + + </div> +  +</body> +</html> Added: website/trunk/include/pl/info.wmi =================================================================== --- website/trunk/include/pl/info.wmi (rev 0) +++ website/trunk/include/pl/info.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -0,0 +1,10 @@ +#!/usr/bin/env wml +<div class="img-shadow"> + <div class="infoblock"> + <h2 class="bulb">Wskazówka Tora</h2> + <p>Tor jest pisany dla i wspierany przez ludzi takich, jak Ty. <a href="<page +donate/donate>">Złóż dotację już dziś</a>!</p> + </div> +  +</div> + Added: website/trunk/include/pl/navigation.wmi =================================================================== --- website/trunk/include/pl/navigation.wmi (rev 0) +++ website/trunk/include/pl/navigation.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -0,0 +1,24 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 22069 $ +# Translation-Priority: 1-high + +<: + # path link text + my @navigation = ( + 'index' , 'Start', + 'about/overview' , 'O Torze', + 'docs/documentation' , 'Dokumentacja', + 'projects/projects' , 'Projekty', + 'press/press' , 'Prasa', + '<blog>' , 'Blog', + 'http://printfection.com/torprojectstore' , 'Sklep', + ); + my @calltoaction = ( + 'download/download' , 'Pobierz', + 'donate/donate' , 'Dotacje', + 'getinvolved/volunteer' , 'Weź udział', + ); + +:> Modified: website/trunk/pl/navigation.wmi =================================================================== --- website/trunk/pl/navigation.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/pl/navigation.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,24 +1,24 @@ #!/usr/bin/wml ## translation metadata -# Revision: $Revision: 22069 $ +# Revision: $Revision$ # Translation-Priority: 1-high <: # path link text my @navigation = ( - 'index' , 'Home', - 'about/overview' , 'About Tor', - 'docs/documentation' , 'Documentation', - 'projects/projects' , 'Projects', - 'press/press' , 'Press', + 'index' , 'Start', + 'about/overview' , 'O Torze', + 'docs/documentation' , 'Dokumentacja', + 'projects/projects' , 'Projekty', + 'press/press' , 'Prasa', '<blog>' , 'Blog', - 'http://printfection.com/torprojectstore' , 'Store', + 'http://printfection.com/torprojectstore' , 'Sklep', ); my @calltoaction = ( - 'download/download' , 'Download', - 'donate/donate' , 'Donate', - 'getinvolved/volunteer' , 'Get Involved', - ); + 'download/download' , 'Pobierz', + 'donate/donate' , 'Dotacje', + 'getinvolved/volunteer' , 'Weź udział', + ); :> Modified: website/trunk/press/pl/info.wmi =================================================================== --- website/trunk/press/pl/info.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/press/pl/info.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,10 +1,10 @@ ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision$ # Translation-Priority: 2-medium #!/usr/bin/env wml <div class="img-shadow"> <div class="infoblock"> - <h2 class="media">Press Contact</h2> + <h2 class="media">Kontakt prasowy</h2> <p> <b>Andrew Lewman</b><br> Executive Director<br> @@ -12,6 +12,6 @@ +1-781-424-9877<br> </p> </div> -  +  </div>  Modified: website/trunk/press/pl/sidenav.wmi =================================================================== --- website/trunk/press/pl/sidenav.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/press/pl/sidenav.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,32 +1,32 @@ #!/usr/bin/wml ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision$ # Translation-Priority: 2-medium -# this structure defines the side nav bar for the /about pages +# this structure defines the side nav bar for the /press pages # and is the input for include/side.wmi # fields: # # url - the path to the wml page, as used the the <page> tag. This tag ensures # that links will point to the current language if supported, and alternately -# the english version +# the english version # # txt - the link text to be displayed. Different translations will -# need to supply alternate txt +# need to supply alternate txt <: my $sidenav; $sidenav = [ {'url' => 'press/press', - 'txt' => 'Press Releases', - }, + 'txt' => 'Informacje prasowe', + }, {'url' => 'press/inthemedia', - 'txt' => 'Tor in the Media', - }, + 'txt' => 'Tor w mediach', + }, {'url' => 'https://blog.torproject.org/', - 'txt' => 'Tor Blog', - }, + 'txt' => 'Blog Tora', + }, ]; :> Modified: website/trunk/projects/pl/sidenav.wmi =================================================================== --- website/trunk/projects/pl/sidenav.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/projects/pl/sidenav.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,10 +1,10 @@ #!/usr/bin/wml ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision$ # Translation-Priority: 2-medium -# this structure defines the side nav bar for the /about pages +# this structure defines the side nav bar for the /projects pages # and is the input for include/side.wmi # fields: @@ -15,22 +15,22 @@ # # url - the path to the wml page, as used the the <page> tag. This tag ensures # that links will point to the current language if supported, and alternately -# the english version +# the english version # # txt - the link text to be displayed. Different translations will -# need to supply alternate txt - +# need to supply alternate txt + <: my $sidenav; $sidenav = [ {'url' => 'projects/projects', - 'txt' => 'Software & Services', + 'txt' => 'Oprogramowanie i Usługi', 'subelements' => [ {'url' => 'torbutton/index', 'txt' => 'TorButton', }, {'url' => 'projects/torbrowser', - 'txt' => 'Tor Browser Bundle', + 'txt' => 'Paczka Tora z Przeglądarką', }, {'url' => 'projects/vidalia', 'txt' => 'Vidalia', @@ -38,14 +38,17 @@ {'url' => 'projects/arm', 'txt' => 'Arm', }, - {'url' => '<wiki>projects/TorBulkExitlist', - 'txt' => 'TorBEL', + {'url' => 'https://guardianproject.info/apps/orbot/', + 'txt' => 'Orbot', }, - {'url' => 'https://check.torproject.org', - 'txt' => 'TorCheck', + {'url' => 'https://tails.boum.org/', + 'txt' => 'Tails', }, - {'url' => 'projects/gettor', - 'txt' => 'GetTor', + {'url' => 'http://torstatus.blutmagie.de/', + 'txt' => 'TorStatus', + }, + {'url' => 'https://metrics.torproject.org/', + 'txt' => 'Portal Pomiarów', } ] }]; Modified: website/trunk/torbutton/pl/sidenav.wmi =================================================================== --- website/trunk/torbutton/pl/sidenav.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/torbutton/pl/sidenav.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,10 +1,10 @@ #!/usr/bin/wml ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision$ # Translation-Priority: 2-medium -# this structure defines the side nav bar for the /about pages +# this structure defines the side nav bar for the /torbutton pages # and is the input for include/side.wmi # fields: @@ -15,11 +15,11 @@ # # url - the path to the wml page, as used the the <page> tag. This tag ensures # that links will point to the current language if supported, and alternately -# the english version +# the english version # # txt - the link text to be displayed. Different translations will -# need to supply alternate txt - +# need to supply alternate txt + <: my $sidenav; $sidenav = [ @@ -27,10 +27,10 @@ 'txt' => 'Torbutton', 'subelements' => [ {'url' => 'torbutton/torbutton-options', - 'txt' => 'Torbutton Options', + 'txt' => 'Opcje Torbuttona', }, {'url' => 'torbutton/torbutton-faq', - 'txt' => 'Torbutton FAQ', + 'txt' => 'FAQ Torbuttona', }] }] :>

1 0

r24510: {website} add CNN interview and segment. (website/trunk/press/en)
by Andrew Lewman 30 Mar '11

30 Mar '11

Author: phobos Date: 2011-03-30 02:52:30 +0000 (Wed, 30 Mar 2011) New Revision: 24510 Modified: website/trunk/press/en/inthemedia.wml Log: add CNN interview and segment. Modified: website/trunk/press/en/inthemedia.wml =================================================================== --- website/trunk/press/en/inthemedia.wml 2011-03-30 01:45:47 UTC (rev 24509) +++ website/trunk/press/en/inthemedia.wml 2011-03-30 02:52:30 UTC (rev 24510) @@ -32,6 +32,13 @@ <th>Topic</th> </tr> </thead> +<tr> +<td>2011 March 29</td> +<td>CNN: Situation Room</td> +<td><a href="http://edition.cnn.com/CNN/Programs/situation.room/">Tor +featured in a segment about US companies providing censorship to +repressive regimes and those circumventing their products.</a></td> +</tr> <tr style="background-color: #e5e5e5;"> <td>2011 March 18</td> <td>Telegraph</td>

1 0

r24509: {website} make the overview h3 just say overview. (website/trunk/about/en)
by Andrew Lewman 30 Mar '11

30 Mar '11

Author: phobos Date: 2011-03-30 01:45:47 +0000 (Wed, 30 Mar 2011) New Revision: 24509 Modified: website/trunk/about/en/overview.wml Log: make the overview h3 just say overview. Modified: website/trunk/about/en/overview.wml =================================================================== --- website/trunk/about/en/overview.wml 2011-03-30 00:54:38 UTC (rev 24508) +++ website/trunk/about/en/overview.wml 2011-03-30 01:45:47 UTC (rev 24509) @@ -41,7 +41,7 @@ others. </p> <a name="overview"></a> - <h3><a class="anchor" href="#overview">Tor: Overview</a></h3> + <h3><a class="anchor" href="#overview">Overview</a></h3> <p> Tor is a network of virtual tunnels that allows people and groups to

1 0

r24508: {website} make the overview section logically flow after inception, up (website/trunk/about/en)
by Andrew Lewman 30 Mar '11

30 Mar '11

Author: phobos Date: 2011-03-30 00:54:38 +0000 (Wed, 30 Mar 2011) New Revision: 24508 Modified: website/trunk/about/en/overview.wml Log: make the overview section logically flow after inception, update the nav and title. Modified: website/trunk/about/en/overview.wml =================================================================== --- website/trunk/about/en/overview.wml 2011-03-30 00:37:04 UTC (rev 24507) +++ website/trunk/about/en/overview.wml 2011-03-30 00:54:38 UTC (rev 24508) @@ -9,14 +9,13 @@ <a href="<page about/overview>">About » </a> </div> <div id="maincol"> - <a name="overview"></a> - <h2><a class="anchor" href="#overview">Tor: Overview</a></h2> + <h2>Tor: Overview</h2>  <div class="sidebar-left"> <h3>Topics</h3> <ul> + <li><a href="<page about/overview>#inception">Inception</a></li> <li><a href="<page about/overview>#overview">Overview</a></li> - <li><a href="<page about/overview>#inception">Inception</a></li> <li><a href="<page about/overview>#whyweneedtor">Why we need Tor</a></li> <li><a href="<page about/overview>#thesolution">The Solution</a></li> <li><a href="<page about/overview>#hiddenservices">Hidden services</a></li> @@ -41,6 +40,9 @@ journalists, law enforcement officers, activists, and many others. </p> + <a name="overview"></a> + <h3><a class="anchor" href="#overview">Tor: Overview</a></h3> + <p> Tor is a network of virtual tunnels that allows people and groups to improve their privacy and security on the Internet. It also enables

1 0