September 2013 - tor-commits - lists.torproject.org

[tor/maint-0.2.4] let the NumNTorsPerTAP consensus param override our queue choice
by arma＠torproject.org 05 Sep '13

05 Sep '13

commit a66791230f7ca09953163fcc0fa8ced8143b599f Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 3 20:58:15 2013 -0400 let the NumNTorsPerTAP consensus param override our queue choice --- src/or/onion.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/or/onion.c b/src/or/onion.c index 639481b..4ea2061 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -14,6 +14,7 @@ #include "circuitlist.h" #include "config.h" #include "cpuworker.h" +#include "networkstatus.h" #include "onion.h" #include "onion_fast.h" #include "onion_ntor.h" @@ -171,8 +172,14 @@ onion_pending_add(or_circuit_t *circ, create_cell_t *onionskin) static int num_ntors_per_tap(void) { -#define NUM_NTORS_PER_TAP 5 - return NUM_NTORS_PER_TAP; +#define DEFAULT_NUM_NTORS_PER_TAP 10 +#define MIN_NUM_NTORS_PER_TAP 0 +#define MAX_NUM_NTORS_PER_TAP 100000 + + return networkstatus_get_param(NULL, "NumNTorsPerTAP", + DEFAULT_NUM_NTORS_PER_TAP, + MIN_NUM_NTORS_PER_TAP, + MAX_NUM_NTORS_PER_TAP); } /** Choose which onion queue we'll pull from next. If one is empty choose

1 0

[tor/maint-0.2.4] add a changes entry for ticket 9574
by arma＠torproject.org 05 Sep '13

05 Sep '13

commit 71e0ca02b57f7945d922a8708a2c97815a9350ad Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 4 02:10:30 2013 -0400 add a changes entry for ticket 9574 --- changes/feature9574 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/feature9574 b/changes/feature9574 new file mode 100644 index 0000000..723606e --- /dev/null +++ b/changes/feature9574 @@ -0,0 +1,7 @@ + o Major features: + - Relays now process the new "NTor" circuit-level handshake requests + with higher priority than the old "TAP" circuit-level handshake + requests. We still process some TAP requests to not totally starve + 0.2.3 clients when NTor becomes popular. A new consensus parameter + "NumNTorsPerTAP" lets us tune the balance later if we need to. + Implements ticket 9574.

1 0

[tor/maint-0.2.4] Separate cpuworker queues by handshake type
by arma＠torproject.org 05 Sep '13

05 Sep '13

commit 87a18514efc7af2ee70d3f180aede5a8da95457c Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Aug 31 23:35:58 2013 -0400 Separate cpuworker queues by handshake type Now we prioritize ntor create cells over tap create cells. Starts to address ticket 9574. --- src/or/onion.c | 53 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/src/or/onion.c b/src/or/onion.c index d4a6502..60dfdde 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -28,6 +28,7 @@ typedef struct onion_queue_t { TOR_TAILQ_ENTRY(onion_queue_t) next; or_circuit_t *circ; + uint16_t handshake_type; create_cell_t *onionskin; time_t when_added; } onion_queue_t; @@ -35,11 +36,16 @@ typedef struct onion_queue_t { /** 5 seconds on the onion queue til we just send back a destroy */ #define ONIONQUEUE_WAIT_CUTOFF 5 -/** Queue of circuits waiting for CPU workers, or NULL if the list is empty.*/ -TOR_TAILQ_HEAD(onion_queue_head_t, onion_queue_t) ol_list = - TOR_TAILQ_HEAD_INITIALIZER(ol_list); +/** Array of queues of circuits waiting for CPU workers. An element is NULL + * if that queue is empty.*/ +TOR_TAILQ_HEAD(onion_queue_head_t, onion_queue_t) + ol_list[MAX_ONION_HANDSHAKE_TYPE+1] = { + TOR_TAILQ_HEAD_INITIALIZER(ol_list[0]), /* tap */ + TOR_TAILQ_HEAD_INITIALIZER(ol_list[1]), /* fast */ + TOR_TAILQ_HEAD_INITIALIZER(ol_list[2]), /* ntor */ +}; -/** Number of entries of each type currently in ol_list. */ +/** Number of entries of each type currently in each element of ol_list[]. */ static int ol_entries[MAX_ONION_HANDSHAKE_TYPE+1]; static void onion_queue_entry_remove(onion_queue_t *victim); @@ -60,8 +66,7 @@ have_room_for_onionskin(uint16_t type) int num_cpus; uint64_t tap_usec, ntor_usec; /* If we've got fewer than 50 entries, we always have room for one more. */ - if (ol_entries[ONION_HANDSHAKE_TYPE_TAP] + - ol_entries[ONION_HANDSHAKE_TYPE_NTOR] < 50) + if (ol_entries[type] < 50) return 1; num_cpus = get_num_cpus(options); /* Compute how many microseconds we'd expect to need to clear all @@ -72,10 +77,17 @@ have_room_for_onionskin(uint16_t type) ntor_usec = estimated_usec_for_onionskins( ol_entries[ONION_HANDSHAKE_TYPE_NTOR], ONION_HANDSHAKE_TYPE_NTOR) / num_cpus; + /* See whether that exceeds MaxOnionQueueDelay. If so, we can't queue * this. */ - if ((tap_usec + ntor_usec) / 1000 > (uint64_t)options->MaxOnionQueueDelay) + if (type == ONION_HANDSHAKE_TYPE_NTOR && + ntor_usec / 1000 > (uint64_t)options->MaxOnionQueueDelay) return 0; + + if (type == ONION_HANDSHAKE_TYPE_TAP && + (tap_usec + ntor_usec) / 1000 > (uint64_t)options->MaxOnionQueueDelay) + return 0; + #ifdef CURVE25519_ENABLED /* If we support the ntor handshake, then don't let TAP handshakes use * more than 2/3 of the space on the queue. */ @@ -100,6 +112,7 @@ onion_pending_add(or_circuit_t *circ, create_cell_t *onionskin) tmp = tor_malloc_zero(sizeof(onion_queue_t)); tmp->circ = circ; + tmp->handshake_type = onionskin->handshake_type; tmp->onionskin = onionskin; tmp->when_added = now; @@ -108,7 +121,8 @@ onion_pending_add(or_circuit_t *circ, create_cell_t *onionskin) static ratelim_t last_warned = RATELIM_INIT(WARN_TOO_MANY_CIRC_CREATIONS_INTERVAL); char *m; - if ((m = rate_limit_log(&last_warned, approx_time()))) { + if (onionskin->handshake_type == ONION_HANDSHAKE_TYPE_NTOR && + (m = rate_limit_log(&last_warned, approx_time()))) { log_warn(LD_GENERAL, "Your computer is too slow to handle this many circuit " "creation requests! Please consider using the " @@ -122,11 +136,11 @@ onion_pending_add(or_circuit_t *circ, create_cell_t *onionskin) ++ol_entries[onionskin->handshake_type]; circ->onionqueue_entry = tmp; - TOR_TAILQ_INSERT_TAIL(&ol_list, tmp, next); + TOR_TAILQ_INSERT_TAIL(&ol_list[onionskin->handshake_type], tmp, next); /* cull elderly requests. */ while (1) { - onion_queue_t *head = TOR_TAILQ_FIRST(&ol_list); + onion_queue_t *head = TOR_TAILQ_FIRST(&ol_list[onionskin->handshake_type]); if (now - head->when_added < (time_t)ONIONQUEUE_WAIT_CUTOFF) break; @@ -140,14 +154,18 @@ onion_pending_add(or_circuit_t *circ, create_cell_t *onionskin) return 0; } -/** Remove the first item from ol_list and return it, or return - * NULL if the list is empty. +/** Remove the highest priority item from ol_list[] and return it, or + * return NULL if the lists are empty. */ or_circuit_t * onion_next_task(create_cell_t **onionskin_out) { or_circuit_t *circ; - onion_queue_t *head = TOR_TAILQ_FIRST(&ol_list); + + /* skip ol_list[ONION_HANDSHAKE_TYPE_FAST] since we know it'll be empty */ + onion_queue_t *head = TOR_TAILQ_FIRST(&ol_list[ONION_HANDSHAKE_TYPE_NTOR]); + if (!head) + head = TOR_TAILQ_FIRST(&ol_list[ONION_HANDSHAKE_TYPE_TAP]); if (!head) return NULL; /* no onions pending, we're done */ @@ -186,7 +204,7 @@ onion_pending_remove(or_circuit_t *circ) static void onion_queue_entry_remove(onion_queue_t *victim) { - TOR_TAILQ_REMOVE(&ol_list, victim, next); + TOR_TAILQ_REMOVE(&ol_list[victim->handshake_type], victim, next); if (victim->circ) victim->circ->onionqueue_entry = NULL; @@ -204,8 +222,11 @@ void clear_pending_onions(void) { onion_queue_t *victim; - while ((victim = TOR_TAILQ_FIRST(&ol_list))) { - onion_queue_entry_remove(victim); + int i; + for (i=0; i<=MAX_ONION_HANDSHAKE_TYPE; i++) { + while ((victim = TOR_TAILQ_FIRST(&ol_list[i]))) { + onion_queue_entry_remove(victim); + } } memset(ol_entries, 0, sizeof(ol_entries)); }

1 0

[tor/maint-0.2.4] refactor and give it unit tests
by arma＠torproject.org 05 Sep '13

05 Sep '13

commit bb32bfa2f240d3f417e11b08d98069e0a4a8307e Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Sep 1 04:40:05 2013 -0400 refactor and give it unit tests --- src/or/onion.c | 66 ++++++++++++++++++++++++++++++++++++------------------- src/or/onion.h | 4 ++++ src/test/test.c | 46 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 22 deletions(-) diff --git a/src/or/onion.c b/src/or/onion.c index 60dfdde..a102f13 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -171,7 +171,9 @@ onion_next_task(create_cell_t **onionskin_out) return NULL; /* no onions pending, we're done */ tor_assert(head->circ); - tor_assert(head->circ->p_chan); /* make sure it's still valid */ +// tor_assert(head->circ->p_chan); /* make sure it's still valid */ +/* XXX I only commented out the above line to make the unit tests + * more manageable. That's probably not good long-term. -RD */ circ = head->circ; if (head->onionskin && head->onionskin->handshake_type <= MAX_ONION_HANDSHAKE_TYPE) @@ -183,6 +185,14 @@ onion_next_task(create_cell_t **onionskin_out) return circ; } +/** Return the number of handshake_type-style create requests pending. + */ +int +onion_num_pending(uint16_t handshake_type) +{ + return ol_entries[handshake_type]; +} + /** Go through ol_list, find the onion_queue_t element which points to * circ, remove and free that element. Leave circ itself alone. */ @@ -535,6 +545,22 @@ check_create_cell(const create_cell_t *cell, int unknown_ok) return 0; } +/** Write the various parameters into the create cell. Separate from + * create_cell_parse() to make unit testing easier. + */ +void +create_cell_init(create_cell_t *cell_out, uint8_t cell_type, + uint16_t handshake_type, uint16_t handshake_len, + const uint8_t *onionskin) +{ + memset(cell_out, 0, sizeof(*cell_out)); + + cell_out->cell_type = cell_type; + cell_out->handshake_type = handshake_type; + cell_out->handshake_len = handshake_len; + memcpy(cell_out->onionskin, onionskin, handshake_len); +} + /** Helper: parse the CREATE2 payload at p, which could be up to * p_len bytes long, and use it to fill the fields of * cell_out. Return 0 on success and -1 on failure. @@ -545,17 +571,21 @@ check_create_cell(const create_cell_t *cell, int unknown_ok) static int parse_create2_payload(create_cell_t *cell_out, const uint8_t *p, size_t p_len) { + uint16_t handshake_type, handshake_len; + if (p_len < 4) return -1; - cell_out->cell_type = CELL_CREATE2; - cell_out->handshake_type = ntohs(get_uint16(p)); - cell_out->handshake_len = ntohs(get_uint16(p+2)); - if (cell_out->handshake_len > CELL_PAYLOAD_SIZE - 4 || - cell_out->handshake_len > p_len - 4) + + handshake_type = ntohs(get_uint16(p)); + handshake_len = ntohs(get_uint16(p+2)); + + if (handshake_len > CELL_PAYLOAD_SIZE - 4 || handshake_len > p_len - 4) return -1; - if (cell_out->handshake_type == ONION_HANDSHAKE_TYPE_FAST) + if (handshake_type == ONION_HANDSHAKE_TYPE_FAST) return -1; - memcpy(cell_out->onionskin, p+4, cell_out->handshake_len); + + create_cell_init(cell_out, CELL_CREATE2, handshake_type, handshake_len, + p+4); return 0; } @@ -573,27 +603,19 @@ parse_create2_payload(create_cell_t *cell_out, const uint8_t *p, size_t p_len) int create_cell_parse(create_cell_t *cell_out, const cell_t *cell_in) { - memset(cell_out, 0, sizeof(*cell_out)); - switch (cell_in->command) { case CELL_CREATE: - cell_out->cell_type = CELL_CREATE; if (tor_memeq(cell_in->payload, NTOR_CREATE_MAGIC, 16)) { - cell_out->handshake_type = ONION_HANDSHAKE_TYPE_NTOR; - cell_out->handshake_len = NTOR_ONIONSKIN_LEN; - memcpy(cell_out->onionskin, cell_in->payload+16, NTOR_ONIONSKIN_LEN); + create_cell_init(cell_out, CELL_CREATE, ONION_HANDSHAKE_TYPE_NTOR, + NTOR_ONIONSKIN_LEN, cell_in->payload+16); } else { - cell_out->handshake_type = ONION_HANDSHAKE_TYPE_TAP; - cell_out->handshake_len = TAP_ONIONSKIN_CHALLENGE_LEN; - memcpy(cell_out->onionskin, cell_in->payload, - TAP_ONIONSKIN_CHALLENGE_LEN); + create_cell_init(cell_out, CELL_CREATE, ONION_HANDSHAKE_TYPE_TAP, + TAP_ONIONSKIN_CHALLENGE_LEN, cell_in->payload); } break; case CELL_CREATE_FAST: - cell_out->cell_type = CELL_CREATE_FAST; - cell_out->handshake_type = ONION_HANDSHAKE_TYPE_FAST; - cell_out->handshake_len = CREATE_FAST_LEN; - memcpy(cell_out->onionskin, cell_in->payload, CREATE_FAST_LEN); + create_cell_init(cell_out, CELL_CREATE_FAST, ONION_HANDSHAKE_TYPE_FAST, + CREATE_FAST_LEN, cell_in->payload); break; case CELL_CREATE2: if (parse_create2_payload(cell_out, cell_in->payload, diff --git a/src/or/onion.h b/src/or/onion.h index db4c999..d62f032 100644 --- a/src/or/onion.h +++ b/src/or/onion.h @@ -15,6 +15,7 @@ struct create_cell_t; int onion_pending_add(or_circuit_t *circ, struct create_cell_t *onionskin); or_circuit_t *onion_next_task(struct create_cell_t **onionskin_out); +int onion_num_pending(uint16_t handshake_type); void onion_pending_remove(or_circuit_t *circ); void clear_pending_onions(void); @@ -99,6 +100,9 @@ typedef struct extended_cell_t { created_cell_t created_cell; } extended_cell_t; +void create_cell_init(create_cell_t *cell_out, uint8_t cell_type, + uint16_t handshake_type, uint16_t handshake_len, + const uint8_t *onionskin); int create_cell_parse(create_cell_t *cell_out, const cell_t *cell_in); int created_cell_parse(created_cell_t *cell_out, const cell_t *cell_in); int extend_cell_parse(extend_cell_t *cell_out, const uint8_t command, diff --git a/src/test/test.c b/src/test/test.c index 3ff39e6..4ec8792 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -44,6 +44,7 @@ double fabs(double x); #include "or.h" #include "buffers.h" +#include "circuitlist.h" #include "circuitstats.h" #include "config.h" #include "connection_edge.h" @@ -53,6 +54,7 @@ double fabs(double x); #include "torgzip.h" #include "mempool.h" #include "memarea.h" +#include "onion.h" #include "onion_tap.h" #include "policies.h" #include "rephist.h" @@ -933,6 +935,49 @@ test_ntor_handshake(void *arg) } #endif +/** Run unit tests for the onion queues. */ +static void +test_onion_queues(void) +{ + uint8_t buf1[TAP_ONIONSKIN_CHALLENGE_LEN] = {0}; + uint8_t buf2[NTOR_ONIONSKIN_LEN] = {0}; + + or_circuit_t *circ1 = or_circuit_new(0, NULL); + or_circuit_t *circ2 = or_circuit_new(0, NULL); + + create_cell_t *onionskin = NULL; + create_cell_t *create1 = tor_malloc_zero(sizeof(create_cell_t)); + create_cell_t *create2 = tor_malloc_zero(sizeof(create_cell_t)); + + create_cell_init(create1, CELL_CREATE, ONION_HANDSHAKE_TYPE_TAP, + TAP_ONIONSKIN_CHALLENGE_LEN, buf1); + create_cell_init(create2, CELL_CREATE, ONION_HANDSHAKE_TYPE_NTOR, + NTOR_ONIONSKIN_LEN, buf2); + + test_eq(0, onion_num_pending(ONION_HANDSHAKE_TYPE_TAP)); + test_eq(0, onion_pending_add(circ1, create1)); + test_eq(1, onion_num_pending(ONION_HANDSHAKE_TYPE_TAP)); + + test_eq(0, onion_num_pending(ONION_HANDSHAKE_TYPE_NTOR)); + test_eq(0, onion_pending_add(circ2, create2)); + test_eq(1, onion_num_pending(ONION_HANDSHAKE_TYPE_NTOR)); + + test_eq_ptr(circ2, onion_next_task(&onionskin)); + test_eq(1, onion_num_pending(ONION_HANDSHAKE_TYPE_TAP)); + test_eq(0, onion_num_pending(ONION_HANDSHAKE_TYPE_NTOR)); + + clear_pending_onions(); + test_eq(0, onion_num_pending(ONION_HANDSHAKE_TYPE_TAP)); + test_eq(0, onion_num_pending(ONION_HANDSHAKE_TYPE_NTOR)); + + done: + ; +// circuit_free(circ1); +// circuit_free(circ2); + /* and free create1 and create2 */ + /* XXX leaks everything here */ +} + static void test_circuit_timeout(void) { @@ -2005,6 +2050,7 @@ static struct testcase_t test_array[] = { ENT(buffers), { "buffer_copy", test_buffer_copy, 0, NULL, NULL }, ENT(onion_handshake), + ENT(onion_queues), #ifdef CURVE25519_ENABLED { "ntor_handshake", test_ntor_handshake, 0, NULL, NULL }, #endif

1 0

[tor/maint-0.2.4] add info-level logs to help track onion queue sizes
by arma＠torproject.org 05 Sep '13

05 Sep '13

commit 9d2030e5801acd955ab81d1329360b45af09d253 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Sep 1 16:51:27 2013 -0400 add info-level logs to help track onion queue sizes --- src/or/onion.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/or/onion.c b/src/or/onion.c index a102f13..c5f1566 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -135,6 +135,11 @@ onion_pending_add(or_circuit_t *circ, create_cell_t *onionskin) } ++ol_entries[onionskin->handshake_type]; + log_info(LD_OR, "New create (%s). Queues now ntor=%d and tap=%d.", + onionskin->handshake_type == ONION_HANDSHAKE_TYPE_NTOR ? "ntor" : "tap", + ol_entries[ONION_HANDSHAKE_TYPE_NTOR], + ol_entries[ONION_HANDSHAKE_TYPE_TAP]); + circ->onionqueue_entry = tmp; TOR_TAILQ_INSERT_TAIL(&ol_list[onionskin->handshake_type], tmp, next); @@ -176,8 +181,13 @@ onion_next_task(create_cell_t **onionskin_out) * more manageable. That's probably not good long-term. -RD */ circ = head->circ; if (head->onionskin && - head->onionskin->handshake_type <= MAX_ONION_HANDSHAKE_TYPE) - --ol_entries[head->onionskin->handshake_type]; + head->handshake_type <= MAX_ONION_HANDSHAKE_TYPE) + --ol_entries[head->handshake_type]; + log_info(LD_OR, "Processing create (%s). Queues now ntor=%d and tap=%d.", + head->handshake_type == ONION_HANDSHAKE_TYPE_NTOR ? "ntor" : "tap", + ol_entries[ONION_HANDSHAKE_TYPE_NTOR], + ol_entries[ONION_HANDSHAKE_TYPE_TAP]); + *onionskin_out = head->onionskin; head->onionskin = NULL; /* prevent free. */ circ->onionqueue_entry = NULL;

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 05 Sep '13

05 Sep '13

commit 0c2a7bc7fb9d7aba9e5c6270a02543515a003830 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 5 03:16:24 2013 +0000 Update translations for torbirdy --- fr/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torbirdy.dtd b/fr/torbirdy.dtd index c358d66..1f018f4 100644 --- a/fr/torbirdy.dtd +++ b/fr/torbirdy.dtd @@ -46,7 +46,7 @@ <!ENTITY torbirdy.prefs.emailwizard.label "Activer l'assistant de configuration automatique d'e-mail de Thunderbird [défaut : désactivé]"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> <!ENTITY torbirdy.prefs.automatic.label "Vérifier automatiquement les nouveaux messages de tous les comptes [par défaut : désactivé]"> -<!ENTITY torbirdy.prefs.automatic.key ""> +<!ENTITY torbirdy.prefs.automatic.key "f"> <!ENTITY torbirdy.prefs.renegotiation.label "Autoriser les connexions aux serveurs qui ne supportent pas SSL/TLS avec renégociation sécurisée [défaut : ne pas autoriser]"> <!ENTITY torbirdy.prefs.renegotiation.key "r"> <!ENTITY torbirdy.prefs.account_specific "Compte-spécifique">

1 0

r26340: {website} update mirror status (website/trunk/include)
by Andrew Lewman 05 Sep '13

05 Sep '13

Author: phobos Date: 2013-09-05 02:41:15 +0000 (Thu, 05 Sep 2013) New Revision: 26340 Modified: website/trunk/include/mirrors-table.wmi Log: update mirror status Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2013-09-04 15:27:07 UTC (rev 26339) +++ website/trunk/include/mirrors-table.wmi 2013-09-05 02:41:15 UTC (rev 26340) @@ -35,6 +35,23 @@ <tr> + <td>DK</td> + + <td>Zentrum der Gesundheit</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>EE</td> <td>CyberSIDE</td> @@ -273,23 +290,6 @@ <tr> - <td>US</td> - - <td>AskApache</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>RU</td> <td>Soviet Anonymous</td> @@ -375,6 +375,23 @@ <tr> + <td>NL</td> + + <td>BBLN.nl</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://mirror.bbln.nl/tor/dist/">http</a></td> + <td><a href="http://mirror.bbln.nl/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>INT</td> <td>CoralCDN</td> @@ -409,6 +426,23 @@ <tr> + <td>NL</td> + + <td>Amorphis</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IS</td> <td>torproject.is</td> @@ -715,15 +749,15 @@ <tr> - <td>US</td> + <td>SE</td> - <td></td> + <td>homosu</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> - <td><a href="http://mirror.nametoday.me/tor/">http</a></td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -732,15 +766,15 @@ <tr> - <td>DK</td> + <td>US</td> - <td>Zentrum der Gesundheit</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -751,51 +785,34 @@ <td>US</td> - <td>HackThisSite.org</td> + <td>AskApache</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.hackthissite.org/tor">http</a></td> - <td><a href="http://tor.hackthissite.org/">http</a></td> - <td><a href="https://mirror.hackthissite.org/tor">https</a></td> - <td><a href="https://tor.hackthissite.org/">https</a></td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> <td> - </td> -</tr> - -<tr> - - <td>NL</td> - - <td>Amorphis</td> - - <td>Up to date</td> - <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>SE</td> + <td>US</td> - <td>homosu</td> + <td>HackThisSite.org</td> - <td>Up to date</td> + <td>DO NOT USE. Out of date.</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> + <td><a href="http://mirror.hackthissite.org/tor">http</a></td> + <td><a href="http://tor.hackthissite.org/">http</a></td> + <td><a href="https://mirror.hackthissite.org/tor">https</a></td> + <td><a href="https://tor.hackthissite.org/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> @@ -919,49 +936,49 @@ <tr> - <td>NL</td> + <td>IS</td> - <td></td> + <td>Frenn vun der Enn A.S.B.L.</td> - <td>DO NOT USE. Out of date.</td> + <td>Unknown</td> <td> - </td> + <td><a href="http://torproject.lu/dist/">http</a></td> + <td><a href="http://torproject.lu/">http</a></td> <td> - </td> <td> - </td> - <td><a href="https://www.coevoet.nl/tor/dist/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> </tr> <tr> - <td>LU</td> + <td>NL</td> <td></td> - <td>Unknown</td> + <td>DO NOT USE. Out of date.</td> <td> - </td> - <td><a href="http://torproject.adamas.ai/dist/">http</a></td> - <td><a href="http://torproject.adamas.ai/">http</a></td> <td> - </td> <td> - </td> + <td><a href="https://www.coevoet.nl/tor/dist/">https</a></td> <td> - </td> <td> - </td> + <td> - </td> </tr> <tr> - <td>NL</td> + <td>LU</td> - <td>BBLN.nl</td> + <td></td> <td>Unknown</td> <td> - </td> - <td><a href="http://mirror.bbln.nl/tor/dist/">http</a></td> - <td><a href="http://mirror.bbln.nl/tor/">http</a></td> + <td><a href="http://torproject.adamas.ai/dist/">http</a></td> + <td><a href="http://torproject.adamas.ai/">http</a></td> <td> - </td> <td> - </td> <td> - </td>

1 0

[translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
by translation＠torproject.org 05 Sep '13

05 Sep '13

commit 44a44e6fa3beef61c7d7f202b3dbb7553b3c4f1e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 5 01:16:51 2013 +0000 Update translations for tor-launcher-progress_completed --- sr/progress.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sr/progress.dtd b/sr/progress.dtd new file mode 100644 index 0000000..57ec42b --- /dev/null +++ b/sr/progress.dtd @@ -0,0 +1,4 @@ +<!ENTITY torprogress.dialog.title "Тор статус"> +<!ENTITY torprogress.openSettings "Отвори подешавања"> +<!ENTITY torprogress.heading "Повезивање на Тор мрежу"> +<!ENTITY torprogress.pleaseWait "Тор претраживач ће се отворити након што се успостави конекција са Тор мрежом.">

1 0

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 05 Sep '13

05 Sep '13

commit 7a6d038765c929029972406d594513bdf4f910db Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 5 01:16:49 2013 +0000 Update translations for tor-launcher-progress --- sr/progress.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sr/progress.dtd b/sr/progress.dtd index 8bcdc13..57ec42b 100644 --- a/sr/progress.dtd +++ b/sr/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings ""> +<!ENTITY torprogress.dialog.title "Тор статус"> +<!ENTITY torprogress.openSettings "Отвори подешавања"> <!ENTITY torprogress.heading "Повезивање на Тор мрежу"> -<!ENTITY torprogress.pleaseWait ""> +<!ENTITY torprogress.pleaseWait "Тор претраживач ће се отворити након што се успостави конекција са Тор мрежом.">

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 05 Sep '13

05 Sep '13

commit 2f3aba79cfb0e617210b7f53f7fbe59e03dd8dce Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 5 01:15:33 2013 +0000 Update translations for vidalia_alpha --- sr/vidalia_sr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sr/vidalia_sr.po b/sr/vidalia_sr.po index cb20d8b..a7bdd36 100644 --- a/sr/vidalia_sr.po +++ b/sr/vidalia_sr.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2013-08-20 08:30+0000\n" +"PO-Revision-Date: 2013-09-05 01:00+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/torproject/language/sr/)\n" "MIME-Version: 1.0\n"

1 0