February 2014 - tor-commits - lists.torproject.org

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug10777_nointernal_024' into maint-0.2.4
by nickm＠torproject.org 11 Feb '14

11 Feb '14

commit 8836c1ee2f460422a688781c79760652524c3d6e Merge: 7f6aa78 b15f75b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 18:55:26 2014 -0500 Merge remote-tracking branch 'public/bug10777_nointernal_024' into maint-0.2.4 changes/bug10777_internal_024 | 4 ++++ src/or/relay.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.4] make EACCES survivable too.
by nickm＠torproject.org 11 Feb '14

11 Feb '14

commit e0c8031516852143fb82d8fee91a0f4c576c7418 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 15:06:10 2014 -0500 make EACCES survivable too. --- src/or/reasons.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/reasons.c b/src/or/reasons.c index fc31a43..6eb2643 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -174,11 +174,12 @@ errno_to_stream_end_reason(int e) S_CASE(ENOTSOCK): S_CASE(EPROTONOSUPPORT): S_CASE(EAFNOSUPPORT): - E_CASE(EACCES): S_CASE(ENOTCONN): return END_STREAM_REASON_INTERNAL; S_CASE(ENETUNREACH): S_CASE(EHOSTUNREACH): + E_CASE(EACCES): + E_CASE(EPERM): return END_STREAM_REASON_NOROUTE; S_CASE(ECONNREFUSED): return END_STREAM_REASON_CONNECTREFUSED;

1 0

[tor/maint-0.2.4] Don't treat END_STREAM_REASON_INTERNAL as total circuit failure
by nickm＠torproject.org 11 Feb '14

11 Feb '14

commit b15f75b63266742aa6aa358c553799a31f0b350e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 9 21:35:14 2014 -0500 Don't treat END_STREAM_REASON_INTERNAL as total circuit failure It can happen because we sent something that got an ENETUNREACH response. Bugfix on 0.2.4.8-alpha; fixes a part of bug 10777. --- changes/bug10777_internal_024 | 4 ++++ src/or/relay.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug10777_internal_024 b/changes/bug10777_internal_024 new file mode 100644 index 0000000..4544147 --- /dev/null +++ b/changes/bug10777_internal_024 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Do not treat END_STREAM_REASON_INTERNAL as indicating a definite + circuit failure, since it could also indicate an ENETUNREACH + error. Fixes part of bug 10777; bugfix on 0.2.4.8-alpha. diff --git a/src/or/relay.c b/src/or/relay.c index 63119cb..57633f8 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -731,13 +731,15 @@ connection_ap_process_end_not_open( if (rh->length > 0) { if (reason == END_STREAM_REASON_TORPROTOCOL || - reason == END_STREAM_REASON_INTERNAL || reason == END_STREAM_REASON_DESTROY) { - /* All three of these reasons could mean a failed tag + /* Both of these reasons could mean a failed tag * hit the exit and it complained. Do not probe. * Fail the circuit. */ circ->path_state = PATH_STATE_USE_FAILED; return -END_CIRC_REASON_TORPROTOCOL; + } else if (reason == END_STREAM_REASON_INTERNAL) { + /* We can't infer success or failure, since older Tors report + * ENETUNREACH as END_STREAM_REASON_INTERNAL. */ } else { /* Path bias: If we get a valid reason code from the exit, * it wasn't due to tagging.

1 0

[tor/master] Free leakable values in the unit tests.
by nickm＠torproject.org 11 Feb '14

11 Feb '14

commit c3720c05fa44b3790ab0dc37e2506ee482796e21 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 18:10:33 2014 -0500 Free leakable values in the unit tests. Thanks, Coverity! (CID 1171414, 1171415, 1171416) --- src/test/test.c | 6 ++++-- src/test/test_config.c | 11 +++++++++-- src/test/test_dir.c | 4 +++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/test/test.c b/src/test/test.c index 522f2af..45f7c09 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -875,6 +875,7 @@ test_policies(void) { int i; char *policy = NULL; + short_policy_t *parsed; smartlist_t *chunks = smartlist_new(); smartlist_add(chunks, tor_strdup("accept ")); for (i=1; i<10000; ++i) @@ -883,8 +884,9 @@ test_policies(void) policy = smartlist_join_strings(chunks, "", 0, NULL); SMARTLIST_FOREACH(chunks, char *, ch, tor_free(ch)); smartlist_free(chunks); - tt_ptr_op(NULL, ==, parse_short_policy(policy));/* shouldn't be accepted */ - tor_free(policy); /* could leak. */ + parsed = parse_short_policy(policy);/* shouldn't be accepted */ + tor_free(policy); + tt_ptr_op(NULL, ==, parsed); } /* truncation ports */ diff --git a/src/test/test_config.c b/src/test/test_config.c index 3a1b6d7..a1dff64 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -247,6 +247,7 @@ test_config_write_to_data_subdir(void *arg) { or_options_t* options = get_options_mutable(); char *datadir = options->DataDirectory = tor_strdup(get_fname("datadir-1")); + char *cp = NULL; const char* subdir = "test_stats"; const char* fname = "test_file"; const char* str = @@ -280,17 +281,23 @@ test_config_write_to_data_subdir(void *arg) // Content of file after write attempt should be // equal to the original string. test_assert(!write_to_data_subdir(subdir, fname, str, NULL)); - test_streq(read_file_to_str(filepath, 0, NULL), str); + cp = read_file_to_str(filepath, 0, NULL); + test_streq(cp, str); + tor_free(cp); // A second write operation should overwrite the old content. test_assert(!write_to_data_subdir(subdir, fname, str, NULL)); - test_streq(read_file_to_str(filepath, 0, NULL), str); + cp = read_file_to_str(filepath, 0, NULL); + test_streq(cp, str); + tor_free(cp); + done: (void) unlink(filepath); rmdir(options->DataDirectory); tor_free(datadir); tor_free(filepath); + tor_free(cp); } /* Test helper function: Make sure that a bridge line gets parsed diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 7c625ce..dcfe98d 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1230,7 +1230,8 @@ test_a_networkstatus( vote_routerstatus_t *vrs; routerstatus_t *rs; int idx, n_rs, n_vrs; - char *v1_text=NULL, *v2_text=NULL, *v3_text=NULL, *consensus_text=NULL, *cp; + char *v1_text=NULL, *v2_text=NULL, *v3_text=NULL, *consensus_text=NULL, + *cp=NULL; smartlist_t *votes = smartlist_new(); /* For generating the two other consensuses. */ @@ -1648,6 +1649,7 @@ test_a_networkstatus( } done: + tor_free(cp); smartlist_free(votes); tor_free(v1_text); tor_free(v2_text);

1 0

[torspec/master] ticket 9934 says DROPGUARDS is going into 0.2.5.2-alpha
by arma＠torproject.org 11 Feb '14

11 Feb '14

commit 10cfb4c63aadcc7fdcdc10f55a1e324b1148f37c Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 11 17:18:59 2014 -0500 ticket 9934 says DROPGUARDS is going into 0.2.5.2-alpha --- control-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control-spec.txt b/control-spec.txt index 9d1df49..0725d26 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1157,7 +1157,7 @@ Tor replies with "250 OK" on success. - [DROPGUARDS was added in Tor 0.2.5.1-alpha.] + [DROPGUARDS was added in Tor 0.2.5.2-alpha.] 4. Replies

1 0

[tor-launcher/master] Bug #10604: Tor status & error messages not translated.
by brade＠torproject.org 11 Feb '14

11 Feb '14

commit 8ef16bb1475f3c1a6ea8e471e8bc027eaa957bb2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Feb 11 16:32:46 2014 -0500 Bug #10604: Tor status & error messages not translated. Incorporated translated bootstrap status messages from Vidalia. --- src/chrome/content/progress.js | 10 +++--- src/chrome/locale/ar/torlauncher.properties | 24 +++++++++++-- src/chrome/locale/bg/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/ca/torlauncher.properties | 21 ++++++++++++ src/chrome/locale/cs/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/da/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/de/torlauncher.properties | 24 +++++++++++-- src/chrome/locale/el/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/en/torlauncher.properties | 24 +++++++++++-- src/chrome/locale/eo/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/es/torlauncher.properties | 24 +++++++++++-- src/chrome/locale/eu/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/fa/torlauncher.properties | 24 +++++++++++-- src/chrome/locale/fi/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/fr/torlauncher.properties | 24 +++++++++++-- src/chrome/locale/he/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/hr-HR/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/hu/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/id/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/it/torlauncher.properties | 24 +++++++++++-- src/chrome/locale/ja/torlauncher.properties | 24 +++++++++++-- src/chrome/locale/ko/torlauncher.properties | 24 +++++++++++-- src/chrome/locale/lt/torlauncher.properties | 13 +++++++ src/chrome/locale/lv/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/my/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/nb/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/nl/torlauncher.properties | 24 +++++++++++-- src/chrome/locale/pl/torlauncher.properties | 24 +++++++++++-- src/chrome/locale/pt-BR/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/pt/torlauncher.properties | 24 +++++++++++-- src/chrome/locale/ro/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/ru/torlauncher.properties | 24 +++++++++++-- src/chrome/locale/sk/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/sr/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/sv/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/th/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/tr/torlauncher.properties | 22 ++++++++++++ src/chrome/locale/vi/torlauncher.properties | 24 +++++++++++-- src/chrome/locale/zh-CN/torlauncher.properties | 24 +++++++++++-- src/chrome/locale/zh-TW/torlauncher.properties | 15 +++++++++ src/components/tl-process.js | 20 ++++++----- src/modules/tl-util.jsm | 43 +++++++++++++++++++++++- 42 files changed, 900 insertions(+), 44 deletions(-) diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js index 8a2f427..4cee3d6 100644 --- a/src/chrome/content/progress.js +++ b/src/chrome/content/progress.js @@ -1,4 +1,4 @@ -// Copyright (c) 2013, The Tor Project, Inc. +// Copyright (c) 2014, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -142,7 +142,8 @@ var gObserver = { else if (kBootstrapStatusTopic == aTopic) { var statusObj = aSubject.wrappedJSObject; - var labelText = (statusObj.SUMMARY) ? statusObj.SUMMARY : ""; + var labelText = + TorLauncherUtil.getLocalizedBootstrapStatus(statusObj, "TAG"); var percentComplete = (statusObj.PROGRESS) ? statusObj.PROGRESS : 0; var meter = document.getElementById("progressMeter"); @@ -158,8 +159,9 @@ var gObserver = { } else if (statusObj._errorOccurred) { - if (statusObj.WARNING) - labelText = statusObj.WARNING; + var s = TorLauncherUtil.getLocalizedBootstrapStatus(statusObj, "REASON"); + if (s) + labelText = s; if (meter) meter.setAttribute("hidden", true); diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index 1769467..19d407c 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=مُشغل تور @@ -7,7 +7,7 @@ torlauncher.tor_exited=توقف تور عن العمل بشكل غير متوق torlauncher.please_restart_app=يرجي إعادة تشغيل هذا البرنامج. torlauncher.tor_controlconn_failed=تعذر الاتصال بمنفذ التحكم الخاص بتور. torlauncher.tor_failed_to_start=تور فشل في بدء التشغيل. -torlauncher.tor_bootstrap_failed=فشل تور في إنشاء اتصال بشبكة تور.\n\n%S +torlauncher.tor_bootstrap_failed=فشل تور في إنشاء اتصال بشبكة تور (%S). torlauncher.unable_to_start_tor=غير قادر علي بدء تشغيل تور.\n\n%S torlauncher.tor_missing=الملف التنفيذي لتور مفقود. @@ -29,3 +29,23 @@ torlauncher.quit_win=خروج torlauncher.done=تم torlauncher.forAssistance=للمساعدة, اتصل بـ %S + +torlauncher.bootstrapStatus.conn_dir=جارٍ الاتصال بدليل التحويلات +torlauncher.bootstrapStatus.handshake_dir=ينشئ اتصالا معمًى بالدليل +torlauncher.bootstrapStatus.requesting_status=يسترجع حالة الشبكة +torlauncher.bootstrapStatus.loading_status=يحمل حالة الشبكة +torlauncher.bootstrapStatus.loading_keys=يحمل شهادات السلطة +torlauncher.bootstrapStatus.requesting_descriptors=يطلب معلومات التحويلة +torlauncher.bootstrapStatus.loading_descriptors=يحمل معلومات التحويلة +torlauncher.bootstrapStatus.conn_or=يتصل بشبكة تور +torlauncher.bootstrapStatus.handshake_or=ينشئ دائرة تور +torlauncher.bootstrapStatus.done=تم الاتصال بشبكة تور + +torlauncher.bootstrapWarning.done=تم +torlauncher.bootstrapWarning.connectrefused=تم رفض الاتصال +torlauncher.bootstrapWarning.misc=متفرقات +torlauncher.bootstrapWarning.resourcelimit=الموارد غير كافية +torlauncher.bootstrapWarning.identity=لم تتطابق الهوية +torlauncher.bootstrapWarning.timeout=الاتصال عاطل +torlauncher.bootstrapWarning.noroute=لا طريق للمضيف +torlauncher.bootstrapWarning.ioerror=خطأ في القراءة/الكتابة diff --git a/src/chrome/locale/bg/torlauncher.properties b/src/chrome/locale/bg/torlauncher.properties new file mode 100644 index 0000000..dc317fd --- /dev/null +++ b/src/chrome/locale/bg/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Свързване с препредаващата директория +torlauncher.bootstrapStatus.handshake_dir=Осъществяване на връзка с криптираната директория +torlauncher.bootstrapStatus.requesting_status=Получаване на информация за статуса на мрежата +torlauncher.bootstrapStatus.loading_status=Зареждане на информацията за статуса на мрежата +torlauncher.bootstrapStatus.loading_keys=Зареждане на сертификати от достоверен източник +torlauncher.bootstrapStatus.requesting_descriptors=Запитване за препредаваща информация +torlauncher.bootstrapStatus.loading_descriptors=Зареждане на препредаваща информация +torlauncher.bootstrapStatus.conn_or=Свързване с Тор мрежата +torlauncher.bootstrapStatus.handshake_or=Осъществяване на Тор верига +torlauncher.bootstrapStatus.done=Свързан с Тор мрежата! + +torlauncher.bootstrapWarning.done=готов +torlauncher.bootstrapWarning.connectrefused=връзката отказана +torlauncher.bootstrapWarning.misc=разнороден +torlauncher.bootstrapWarning.resourcelimit=недостатъчно ресурси +torlauncher.bootstrapWarning.identity=несъвпадение с идентичност +torlauncher.bootstrapWarning.timeout=пауза на връзката +torlauncher.bootstrapWarning.noroute=няма път до хоста +torlauncher.bootstrapWarning.ioerror=грешка при четене/писане diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties new file mode 100644 index 0000000..b7e19f8 --- /dev/null +++ b/src/chrome/locale/ca/torlauncher.properties @@ -0,0 +1,21 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory +torlauncher.bootstrapStatus.handshake_dir=S'està establint una connexió a un directori xifrat +torlauncher.bootstrapStatus.requesting_status=S'està rebent l'estat de la xarxa +torlauncher.bootstrapStatus.loading_status=S'està carregant l'estat de la xarxa +torlauncher.bootstrapStatus.loading_keys=S'estan carregant les autoritats de certificació +torlauncher.bootstrapStatus.requesting_descriptors=S'està demanant informació del relé +torlauncher.bootstrapStatus.loading_descriptors=S'està carregant informació del relé +torlauncher.bootstrapStatus.conn_or=S'està connectant a la xarxa Tor +torlauncher.bootstrapStatus.handshake_or=S'està establint un circuit amb el Tor +torlauncher.bootstrapStatus.done=Connectats a la xarxa Tor! + +torlauncher.bootstrapWarning.done=fet +torlauncher.bootstrapWarning.connectrefused=connexió refusada +torlauncher.bootstrapWarning.misc=miscel·lània +torlauncher.bootstrapWarning.resourcelimit=recursos insuficients +torlauncher.bootstrapWarning.timeout=S'ha excedit el temps d'espera de connexió +torlauncher.bootstrapWarning.noroute=no hi ha ruta cap al servidor +torlauncher.bootstrapWarning.ioerror=error de lectura/escriptura diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties new file mode 100644 index 0000000..211e7f1 --- /dev/null +++ b/src/chrome/locale/cs/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Připojování do adresáře uzlu +torlauncher.bootstrapStatus.handshake_dir=Navazuji spojení s šifrovaným adresářem +torlauncher.bootstrapStatus.requesting_status=Zjišťuji stav sítě +torlauncher.bootstrapStatus.loading_status=Načítam stav sítě +torlauncher.bootstrapStatus.loading_keys=Nahrávám certifikáty autority +torlauncher.bootstrapStatus.requesting_descriptors=Zjišťuji informace o uzlu +torlauncher.bootstrapStatus.loading_descriptors=Nahrávám informace o uzlu +torlauncher.bootstrapStatus.conn_or=Připojuji se do sítě Tor +torlauncher.bootstrapStatus.handshake_or=Sestavuji Tor řetězec +torlauncher.bootstrapStatus.done=Připojeno do sítě Tor! + +torlauncher.bootstrapWarning.done=hotovo +torlauncher.bootstrapWarning.connectrefused=spojení odmítnuto +torlauncher.bootstrapWarning.misc=různý +torlauncher.bootstrapWarning.resourcelimit=nedostatečné zdroje +torlauncher.bootstrapWarning.identity=nesouhlasí identita +torlauncher.bootstrapWarning.timeout=čas spojení vypršel +torlauncher.bootstrapWarning.noroute=bez spojení s hostitelem +torlauncher.bootstrapWarning.ioerror=chyba čtená/zápisu diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties new file mode 100644 index 0000000..89b0222 --- /dev/null +++ b/src/chrome/locale/da/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Tilslutter til relæ mappe +torlauncher.bootstrapStatus.handshake_dir=Opretter en krypteret mappe forbindelse +torlauncher.bootstrapStatus.requesting_status=Henter netværk status +torlauncher.bootstrapStatus.loading_status=Henter netværk status +torlauncher.bootstrapStatus.loading_keys=Henter nøglecentercertifikater +torlauncher.bootstrapStatus.requesting_descriptors=Beder om relæ information +torlauncher.bootstrapStatus.loading_descriptors=Henter relæ information +torlauncher.bootstrapStatus.conn_or=Forbinder til Tor netværk +torlauncher.bootstrapStatus.handshake_or=Opretter et Tor kredsløb +torlauncher.bootstrapStatus.done=Forbundet til Tor netværket! + +torlauncher.bootstrapWarning.done=færdig +torlauncher.bootstrapWarning.connectrefused=forbindelse afvist +torlauncher.bootstrapWarning.misc=diverse +torlauncher.bootstrapWarning.resourcelimit=utilstrækkelige ressourcer +torlauncher.bootstrapWarning.identity=identitet matcher ikke +torlauncher.bootstrapWarning.timeout=forbindelse timeout +torlauncher.bootstrapWarning.noroute=ingen rute til vært +torlauncher.bootstrapWarning.ioerror=læs/skriv fejl diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index 394f343..f8f7a64 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor-Starter @@ -7,7 +7,7 @@ torlauncher.tor_exited=Tor wurde unerwartet geschlossen. torlauncher.please_restart_app=Bitte starten Sie die Anwendung neu. torlauncher.tor_controlconn_failed=Zum Tor-Kontrollanschluss konnte keine Verbindung hergestellt werden. torlauncher.tor_failed_to_start=Der Start von Tor ist fehlgeschlagen. -torlauncher.tor_bootstrap_failed=Tor konnte keine Verbindung zum Tor-Netzwerk herstellen.\n\n%S +torlauncher.tor_bootstrap_failed=Tor konnte keine Verbindung zum Tor-Netzwerk herstellen (%S). torlauncher.unable_to_start_tor=Tor kann nicht gestartet werden.\n\n%S torlauncher.tor_missing=Die Tor-Programmdatei ist nicht vorhanden. @@ -29,3 +29,23 @@ torlauncher.quit_win=Beenden torlauncher.done=Fertig torlauncher.forAssistance=Falls Sie Hilfe benötigen, kontaktieren Sie %S + +torlauncher.bootstrapStatus.conn_dir=Verbinde zu einem Verzeichnis +torlauncher.bootstrapStatus.handshake_dir=Stelle eine verschlüsselte Verbindung zu einem Verzeichnis her +torlauncher.bootstrapStatus.requesting_status=Erfrage Netzwerkstatusdatei +torlauncher.bootstrapStatus.loading_status=Lade Netzwerkstatusdatei +torlauncher.bootstrapStatus.loading_keys=Lade Zertifikate der zentralen Verzeichnisse +torlauncher.bootstrapStatus.requesting_descriptors=Fordere Verteiler-Informationen an +torlauncher.bootstrapStatus.loading_descriptors=Lade Verteiler-Informationen +torlauncher.bootstrapStatus.conn_or=Verbinde zum Tor-Netzwerk +torlauncher.bootstrapStatus.handshake_or=Erstelle einen Tor-Circuit +torlauncher.bootstrapStatus.done=Verbindung zum Tor-Netzwerk hergestellt! + +torlauncher.bootstrapWarning.done=abgeschlossen +torlauncher.bootstrapWarning.connectrefused=Verbindung verweigert +torlauncher.bootstrapWarning.misc=Verschiedenes +torlauncher.bootstrapWarning.resourcelimit=Unzureichende Ressourcen +torlauncher.bootstrapWarning.identity=Nichtübereinstimmung der Identitäten +torlauncher.bootstrapWarning.timeout=Verbindungszeitüberschreitung +torlauncher.bootstrapWarning.noroute=Kein Pfad zum Rechner +torlauncher.bootstrapWarning.ioerror=Lese-/Schreibfehler diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties new file mode 100644 index 0000000..f89acfe --- /dev/null +++ b/src/chrome/locale/el/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Σύνδεση σε ενδιάμεσο (relay) κατάλογο +torlauncher.bootstrapStatus.handshake_dir=Πραγματοποιήθηκε σύνδεση σε κρυπτογραφημένο κατάλογο +torlauncher.bootstrapStatus.requesting_status=Ανάκτηση της κατάστασης του δικτύου +torlauncher.bootstrapStatus.loading_status=Φόρτωση της κατάστασης του δικτύου +torlauncher.bootstrapStatus.loading_keys=Φόρτωση των πιστοποιητικών του φορέα +torlauncher.bootstrapStatus.requesting_descriptors=Γίνεται αίτηση για πληροφορίες των Ενδιάμεσων +torlauncher.bootstrapStatus.loading_descriptors=Φόρτωση πληροφοριών Ενδιάμεσου +torlauncher.bootstrapStatus.conn_or=Γίνεται σύνδεση στο δίκτυο Tor +torlauncher.bootstrapStatus.handshake_or=Σύνδεση σε ένα κύκλωμα Tor +torlauncher.bootstrapStatus.done=Συνδέθηκε στο δίκτυο Tor! + +torlauncher.bootstrapWarning.done=εντάξει +torlauncher.bootstrapWarning.connectrefused=απόρριψη σύνδεσης +torlauncher.bootstrapWarning.misc=διάφορα +torlauncher.bootstrapWarning.resourcelimit=ανεπαρκείς πόροι +torlauncher.bootstrapWarning.identity=η ταυτότητα δεν ταιριάζει +torlauncher.bootstrapWarning.timeout=λήξη χρονικού ορίου σύνδεσης +torlauncher.bootstrapWarning.noroute=δεν βρέθηκε διαδρομή προς σύνδεση +torlauncher.bootstrapWarning.ioerror=σφάλμα ανάγνωσης/εγγραφής diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 483ce43..f167375 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -7,7 +7,7 @@ torlauncher.tor_exited=Tor unexpectedly exited. torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S +torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection (%S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. @@ -29,3 +29,23 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S + +torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory +torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection +torlauncher.bootstrapStatus.requesting_status=Retrieving network status +torlauncher.bootstrapStatus.loading_status=Loading network status +torlauncher.bootstrapStatus.loading_keys=Loading authority certificates +torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information +torlauncher.bootstrapStatus.loading_descriptors=Loading relay information +torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network +torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit +torlauncher.bootstrapStatus.done=Connected to the Tor network! + +torlauncher.bootstrapWarning.done=done +torlauncher.bootstrapWarning.connectrefused=connection refused +torlauncher.bootstrapWarning.misc=miscellaneous +torlauncher.bootstrapWarning.resourcelimit=insufficient resources +torlauncher.bootstrapWarning.identity=identity mismatch +torlauncher.bootstrapWarning.timeout=connection timeout +torlauncher.bootstrapWarning.noroute=no route to host +torlauncher.bootstrapWarning.ioerror=read/write error diff --git a/src/chrome/locale/eo/torlauncher.properties b/src/chrome/locale/eo/torlauncher.properties new file mode 100644 index 0000000..d76cef7 --- /dev/null +++ b/src/chrome/locale/eo/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Konektante al relajsa dosierujo +torlauncher.bootstrapStatus.handshake_dir=Starigante ĉifritan dosierujan konekton +torlauncher.bootstrapStatus.requesting_status=Ricevante retan staton +torlauncher.bootstrapStatus.loading_status=Ŝarĝante retan staton +torlauncher.bootstrapStatus.loading_keys=Ŝarĝante aŭtoritatajn atestilojn +torlauncher.bootstrapStatus.requesting_descriptors=Petante relajsajn informojn +torlauncher.bootstrapStatus.loading_descriptors=Ŝarĝante relajsajn informojn +torlauncher.bootstrapStatus.conn_or=Konektante al Tor-reto +torlauncher.bootstrapStatus.handshake_or=Starigante Tor-cirkviton +torlauncher.bootstrapStatus.done=Konektita al Tor-reto + +torlauncher.bootstrapWarning.done=farite +torlauncher.bootstrapWarning.connectrefused=Konekto rifuzita +torlauncher.bootstrapWarning.misc=diversaĵoj +torlauncher.bootstrapWarning.resourcelimit=nesufiĉaj risurcoj +torlauncher.bootstrapWarning.identity=Identmiskongruo +torlauncher.bootstrapWarning.timeout=Tempolimo de konekto +torlauncher.bootstrapWarning.noroute=neniu kurso al gastiga komputilo +torlauncher.bootstrapWarning.ioerror=lega/skriba eraro diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index e236d38..e9d8049 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Arranque de Tor @@ -7,7 +7,7 @@ torlauncher.tor_exited=Tor se cerró inesperadamente. torlauncher.please_restart_app=Por favor reinicie esta aplicación. torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor torlauncher.tor_failed_to_start=Tor no pudo iniciarse. -torlauncher.tor_bootstrap_failed=Tor no pudo establecer una conexión de red Tor.\n\n%S +torlauncher.tor_bootstrap_failed=Tor no pudo establecer una conexión de red Tor (%S). torlauncher.unable_to_start_tor=No fue posible iniciar Tor.\n\n%S torlauncher.tor_missing=No se encuentra el fichero ejecutable de Tor. @@ -29,3 +29,23 @@ torlauncher.quit_win=Salir torlauncher.done=Listo torlauncher.forAssistance=Para obtener ayuda, contacte con %S + +torlauncher.bootstrapStatus.conn_dir=Conectando a un directorio repetidor +torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexión encriptada con el directorio +torlauncher.bootstrapStatus.requesting_status=Recuperando el estado de la red +torlauncher.bootstrapStatus.loading_status=Cargando el estado de la red +torlauncher.bootstrapStatus.loading_keys=Cargando los certificados de autoridades +torlauncher.bootstrapStatus.requesting_descriptors=Solicitando información del repetidor +torlauncher.bootstrapStatus.loading_descriptors=Cargando información del repetidor +torlauncher.bootstrapStatus.conn_or=Conectando a la red Tor +torlauncher.bootstrapStatus.handshake_or=Estableciendo un circuito Tor +torlauncher.bootstrapStatus.done=¡Conectado a la red Tor! + +torlauncher.bootstrapWarning.done=terminado +torlauncher.bootstrapWarning.connectrefused=conexión rechazada +torlauncher.bootstrapWarning.misc=miscelánea +torlauncher.bootstrapWarning.resourcelimit=recursos insuficientes +torlauncher.bootstrapWarning.identity=no hay coincidencia de identidad +torlauncher.bootstrapWarning.timeout=tiempo de espera de conexión agotado +torlauncher.bootstrapWarning.noroute=no hay ruta hacia el host +torlauncher.bootstrapWarning.ioerror=error de escritura/lectura diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties new file mode 100644 index 0000000..b9abc63 --- /dev/null +++ b/src/chrome/locale/eu/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Errele direktorio batera konektatzen +torlauncher.bootstrapStatus.handshake_dir=Enkriptatutako direktorio batera konexioa ezartzen +torlauncher.bootstrapStatus.requesting_status=Sarearen egoera eskuratzen +torlauncher.bootstrapStatus.loading_status=Sarearen egoera kargatzen +torlauncher.bootstrapStatus.loading_keys=Aginpide ziurtagiriak kargatzen +torlauncher.bootstrapStatus.requesting_descriptors=Errele informazioa eskatzen +torlauncher.bootstrapStatus.loading_descriptors=Errele informazioa kargatzen +torlauncher.bootstrapStatus.conn_or=Tor sarera konektatzen +torlauncher.bootstrapStatus.handshake_or=Tor zirkuitu bat ezartzen +torlauncher.bootstrapStatus.done=Tor sarera konektatuta! + +torlauncher.bootstrapWarning.done=eginda +torlauncher.bootstrapWarning.connectrefused=konexioa ukatua +torlauncher.bootstrapWarning.misc=hainbat +torlauncher.bootstrapWarning.resourcelimit=baliabideak ez dira nahikoak +torlauncher.bootstrapWarning.identity=nortasuna ez dator bat +torlauncher.bootstrapWarning.timeout=konexioa denboraz kanpo +torlauncher.bootstrapWarning.noroute=ez dago biderik ostalarira +torlauncher.bootstrapWarning.ioerror=irakurketa/idazketa akatsa diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties index cb8acdf..de3669f 100644 --- a/src/chrome/locale/fa/torlauncher.properties +++ b/src/chrome/locale/fa/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=اجرا کننده تور @@ -7,7 +7,7 @@ torlauncher.tor_exited=تور بدلیلی نامشخص خارج شد. torlauncher.please_restart_app=لطفا نرم افزار را مجددا راه اندازی نمایید. torlauncher.tor_controlconn_failed=اتصال به پورت کنترل تور امکان پذیر نمی باشد. torlauncher.tor_failed_to_start=خطا در راه اندازی. -torlauncher.tor_bootstrap_failed=تور برای اتصال به شبکه تور ناموفق می باشد.\n\n\n%S +torlauncher.tor_bootstrap_failed=تور برای اتصال به شبکه تور ناموفق می باشد (%S). torlauncher.unable_to_start_tor=راه اندازی تور امکان پذیر نمی باشد.\n\n%S torlauncher.tor_missing=تور اجرا شونده یافت نشد. @@ -29,3 +29,23 @@ torlauncher.quit_win=خروج torlauncher.done=انجام شد torlauncher.forAssistance=برای دریافت کمک٫ با %S تماس بگیرید + +torlauncher.bootstrapStatus.conn_dir=اتصال به یک فهرست بازپخش +torlauncher.bootstrapStatus.handshake_dir=برپایی یک اتصال فهرست رمزبندی شده +torlauncher.bootstrapStatus.requesting_status=بازیابی وضعیت شبکه +torlauncher.bootstrapStatus.loading_status=بارگذاری وضعیت شبکه +torlauncher.bootstrapStatus.loading_keys=بارگذاری مجوزها +torlauncher.bootstrapStatus.requesting_descriptors=درخواست اطلاعات بازپخش +torlauncher.bootstrapStatus.loading_descriptors=بارگذاری اطلاعات بازپخش +torlauncher.bootstrapStatus.conn_or=در حال اتصال به شبکه تور +torlauncher.bootstrapStatus.handshake_or=برپایی یک جریان تور +torlauncher.bootstrapStatus.done=وصل شده به شبکه تور + +torlauncher.bootstrapWarning.done=انجام شده +torlauncher.bootstrapWarning.connectrefused=اتصال ردشد +torlauncher.bootstrapWarning.misc=گوناگون +torlauncher.bootstrapWarning.resourcelimit=منابع ناکافی +torlauncher.bootstrapWarning.identity=عدم تطبیق هویت +torlauncher.bootstrapWarning.timeout=اتمام وقت اتصال +torlauncher.bootstrapWarning.noroute=نبود مسیر به میزبان +torlauncher.bootstrapWarning.ioerror=خطای خواندن/نوشتن diff --git a/src/chrome/locale/fi/torlauncher.properties b/src/chrome/locale/fi/torlauncher.properties new file mode 100644 index 0000000..3f35f69 --- /dev/null +++ b/src/chrome/locale/fi/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Yhdistetään reititinlistaan +torlauncher.bootstrapStatus.handshake_dir=Muodostetaan suojattu hakemistoyhteys +torlauncher.bootstrapStatus.requesting_status=Selvitetään verkon tilaa +torlauncher.bootstrapStatus.loading_status=Ladataan verkon tilaa +torlauncher.bootstrapStatus.loading_keys=Ladataan sertifikaattioikeuksia +torlauncher.bootstrapStatus.requesting_descriptors=Selvitetään reititintietoja +torlauncher.bootstrapStatus.loading_descriptors=Ladataan reititintietoja +torlauncher.bootstrapStatus.conn_or=Yhdistetään Tor-verkkoon +torlauncher.bootstrapStatus.handshake_or=Muodostetaan Tor-datavirta +torlauncher.bootstrapStatus.done=Yhdistetty Tor-verkkoon + +torlauncher.bootstrapWarning.done=valmis +torlauncher.bootstrapWarning.connectrefused=yhteys hylätty +torlauncher.bootstrapWarning.misc=sekalaiset +torlauncher.bootstrapWarning.resourcelimit=puutteelliset resurssit +torlauncher.bootstrapWarning.identity=identiteetti yhteensopimattomuus +torlauncher.bootstrapWarning.timeout=yhteyden aikakatkaisu +torlauncher.bootstrapWarning.noroute=ei reittiä palvelimelle +torlauncher.bootstrapWarning.ioerror=luku-/kirjoitus- virhe diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 6fcd0ef..be36d43 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lanceur Tor @@ -7,7 +7,7 @@ torlauncher.tor_exited=Le programme Tor s'est terminé de manière inatendue. torlauncher.please_restart_app=Veuillez redémarrer l'application. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer. -torlauncher.tor_bootstrap_failed=Tor n'a pas réussi à établir une connexion au réseau Tor.\n\n%S +torlauncher.tor_bootstrap_failed=Tor n'a pas réussi à établir une connexion au réseau Tor (%S). torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S torlauncher.tor_missing=L'exécutable Tor est introuvable. @@ -29,3 +29,23 @@ torlauncher.quit_win=Sortir torlauncher.done=Terminé torlauncher.forAssistance=Pour obtenir de l'aide, contactez %S + +torlauncher.bootstrapStatus.conn_dir=Connexion à un annuaire de relais +torlauncher.bootstrapStatus.handshake_dir=Etablissement d'une connexion annuaire cryptée +torlauncher.bootstrapStatus.requesting_status=Recherche de l'état du réseau +torlauncher.bootstrapStatus.loading_status=Chargement de l'état du réseau +torlauncher.bootstrapStatus.loading_keys=Chargement des certificats des authorités +torlauncher.bootstrapStatus.requesting_descriptors=Demande d'informations sur le relais +torlauncher.bootstrapStatus.loading_descriptors=Chargement des informations sur le relais +torlauncher.bootstrapStatus.conn_or=Connexion au réseau Tor +torlauncher.bootstrapStatus.handshake_or=Etablissement d'un circuit Tor +torlauncher.bootstrapStatus.done=Connecté au réseau Tor ! + +torlauncher.bootstrapWarning.done=fait +torlauncher.bootstrapWarning.connectrefused=connexion refusée +torlauncher.bootstrapWarning.misc=divers +torlauncher.bootstrapWarning.resourcelimit=ressources insuffisantes +torlauncher.bootstrapWarning.identity=identité incorrecte +torlauncher.bootstrapWarning.timeout=temps de connexion expiré +torlauncher.bootstrapWarning.noroute=pas de route vers l'hôte +torlauncher.bootstrapWarning.ioerror=erreur de lecture/écriture diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties new file mode 100644 index 0000000..c1e2c80 --- /dev/null +++ b/src/chrome/locale/he/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=מתחבר כעת אל מדור ממסר +torlauncher.bootstrapStatus.handshake_dir=מקים כעת חיבור ספריות מוצפן +torlauncher.bootstrapStatus.requesting_status=מאתר כעת את מצב הרשת +torlauncher.bootstrapStatus.loading_status=טוען כעת את מצב הרשת +torlauncher.bootstrapStatus.loading_keys=טוען כעת אישורים אמינים +torlauncher.bootstrapStatus.requesting_descriptors=מבקש כעת מידע ממסר +torlauncher.bootstrapStatus.loading_descriptors=טוען כעת מידע ממסר +torlauncher.bootstrapStatus.conn_or=מתחבר כעת אל רשת Tor +torlauncher.bootstrapStatus.handshake_or=מקים כעת מעגל Tor +torlauncher.bootstrapStatus.done=מחובר לרשת Tor! + +torlauncher.bootstrapWarning.done=בוצע +torlauncher.bootstrapWarning.connectrefused=החיבור נדחה +torlauncher.bootstrapWarning.misc=שונות +torlauncher.bootstrapWarning.resourcelimit=משאבים לא מספיקים +torlauncher.bootstrapWarning.identity=זהות אינה תואמת +torlauncher.bootstrapWarning.timeout=החיבור התעכב +torlauncher.bootstrapWarning.noroute=אין נתיב אל השרת +torlauncher.bootstrapWarning.ioerror=שגיאה בקריאה/כתיבה diff --git a/src/chrome/locale/hr-HR/torlauncher.properties b/src/chrome/locale/hr-HR/torlauncher.properties new file mode 100644 index 0000000..80d540c --- /dev/null +++ b/src/chrome/locale/hr-HR/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Spajanje na mapu releja +torlauncher.bootstrapStatus.handshake_dir=Uspostavljanje šifrirane veze prema mapi +torlauncher.bootstrapStatus.requesting_status=Dohvaćanje statusa mreže +torlauncher.bootstrapStatus.loading_status=Učitavanje statusa mreže +torlauncher.bootstrapStatus.loading_keys=Učitavanje certifikata autoriteta +torlauncher.bootstrapStatus.requesting_descriptors=Zahtjevanje informacije o releju +torlauncher.bootstrapStatus.loading_descriptors=Učitavanje informacija o releju +torlauncher.bootstrapStatus.conn_or=Spajanje na Tor mrežu +torlauncher.bootstrapStatus.handshake_or=Uspostavljanje Tor kruga +torlauncher.bootstrapStatus.done=Spojen na Tor mrežu! + +torlauncher.bootstrapWarning.done=gotovo +torlauncher.bootstrapWarning.connectrefused=veza odbijena +torlauncher.bootstrapWarning.misc=razno +torlauncher.bootstrapWarning.resourcelimit=nedostatni resursi +torlauncher.bootstrapWarning.identity=nepodudaranje identiteta +torlauncher.bootstrapWarning.timeout=vrijeme čekanja veze isteklo +torlauncher.bootstrapWarning.noroute=nema rute do domaćina +torlauncher.bootstrapWarning.ioerror=greška čitanja/pisanja diff --git a/src/chrome/locale/hu/torlauncher.properties b/src/chrome/locale/hu/torlauncher.properties new file mode 100644 index 0000000..6f39d92 --- /dev/null +++ b/src/chrome/locale/hu/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Csatlakozás egy Elosztó címtárhoz +torlauncher.bootstrapStatus.handshake_dir=Titkosított címtárkapcsolat létrehozása +torlauncher.bootstrapStatus.requesting_status=Hálózat státuszának lekérdezése +torlauncher.bootstrapStatus.loading_status=Hálózat státuszának betöltése +torlauncher.bootstrapStatus.loading_keys=Tanúsítványkiadó tanúsítványok betöltése +torlauncher.bootstrapStatus.requesting_descriptors=Elosztási adatok lekérdezése +torlauncher.bootstrapStatus.loading_descriptors=Elosztási adatok betöltése +torlauncher.bootstrapStatus.conn_or=Kapcsolódás a Tor hálózathoz +torlauncher.bootstrapStatus.handshake_or=Tor kapcsolat felépítése +torlauncher.bootstrapStatus.done=Kapcsolódva a Tor hálózathoz! + +torlauncher.bootstrapWarning.done=kész +torlauncher.bootstrapWarning.connectrefused=kapcsolódás visszautasítva +torlauncher.bootstrapWarning.misc=egyebek +torlauncher.bootstrapWarning.resourcelimit=elfogytak az erőforrások +torlauncher.bootstrapWarning.identity=identitás eltérés +torlauncher.bootstrapWarning.timeout=a kapcsolódási idő letelt +torlauncher.bootstrapWarning.noroute=nincs út a kiszolgálóhoz +torlauncher.bootstrapWarning.ioerror=írás/olvasás hiba diff --git a/src/chrome/locale/id/torlauncher.properties b/src/chrome/locale/id/torlauncher.properties new file mode 100644 index 0000000..0b5f80d --- /dev/null +++ b/src/chrome/locale/id/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Menghubungkan diri ke direktori relay +torlauncher.bootstrapStatus.handshake_dir=Membuat koneksi direktori terenkripsi +torlauncher.bootstrapStatus.requesting_status=Mengambil status jaringan +torlauncher.bootstrapStatus.loading_status=Memuat status jaringan +torlauncher.bootstrapStatus.loading_keys=Memuat sertifikat otoritas +torlauncher.bootstrapStatus.requesting_descriptors=Meminta informasi relay +torlauncher.bootstrapStatus.loading_descriptors=Memuat informasi relay +torlauncher.bootstrapStatus.conn_or=Menghubungkan diri ke jaringan Tor +torlauncher.bootstrapStatus.handshake_or=Membuat sirkuit Tor +torlauncher.bootstrapStatus.done=Telah terhubung ke jaringan Tor + +torlauncher.bootstrapWarning.done=selesai +torlauncher.bootstrapWarning.connectrefused=koneksi ditolak +torlauncher.bootstrapWarning.misc=aneka +torlauncher.bootstrapWarning.resourcelimit=sumber daya tidak mencukupi +torlauncher.bootstrapWarning.identity=identitas tidak cocok +torlauncher.bootstrapWarning.timeout=waktu koneksi habis +torlauncher.bootstrapWarning.noroute=tidak ada rute ke host +torlauncher.bootstrapWarning.ioerror=error baca/tulis diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties index 664c472..9566559 100644 --- a/src/chrome/locale/it/torlauncher.properties +++ b/src/chrome/locale/it/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Avviatore di Tor @@ -7,7 +7,7 @@ torlauncher.tor_exited=Tor si è arrestato inaspettatamente. torlauncher.please_restart_app=Per favore riavvia questa applicazione. torlauncher.tor_controlconn_failed=Impossibile connettersi alla porta di controllo di Tor. torlauncher.tor_failed_to_start=Si è verificato un errore nell'avvio di Tor. -torlauncher.tor_bootstrap_failed=Si è verificato un errore nello stabilire una connessione alla rete Tor.⏎\n⏎\n%S +torlauncher.tor_bootstrap_failed=Si è verificato un errore nello stabilire una connessione alla rete Tor (%S). torlauncher.unable_to_start_tor=Impossibile avviare Tor.⏎\n⏎\n%S torlauncher.tor_missing=Il file eseguibile di Tor è mancante. @@ -29,3 +29,23 @@ torlauncher.quit_win=Esci torlauncher.done=Fatto torlauncher.forAssistance=Per richiedere assistenza, contattare %S + +torlauncher.bootstrapStatus.conn_dir=Connessione ad una directory dei relay +torlauncher.bootstrapStatus.handshake_dir=Sto creando una connessione cifrata alla directory +torlauncher.bootstrapStatus.requesting_status=Sto ottenendo informazioni sullo stato della rete +torlauncher.bootstrapStatus.loading_status=Caricamento dello stato della rete +torlauncher.bootstrapStatus.loading_keys=Caricamento dei certificati delle authority +torlauncher.bootstrapStatus.requesting_descriptors=Richiesta di informazioni sui relay +torlauncher.bootstrapStatus.loading_descriptors=Caricamento delle informazioni sui relay +torlauncher.bootstrapStatus.conn_or=Mi sto connettendo alla rete Tor +torlauncher.bootstrapStatus.handshake_or=Sto creando un circuito Tor +torlauncher.bootstrapStatus.done=Connesso alla rete Tor! + +torlauncher.bootstrapWarning.done=fatto +torlauncher.bootstrapWarning.connectrefused=connessione rifiutata +torlauncher.bootstrapWarning.misc=varie +torlauncher.bootstrapWarning.resourcelimit=risorse insufficienti +torlauncher.bootstrapWarning.identity=discordanza di identità +torlauncher.bootstrapWarning.timeout=timeout della connessione +torlauncher.bootstrapWarning.noroute=nessun rotta per l'host +torlauncher.bootstrapWarning.ioerror=errore di lettura/scrittura diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index bd66b3e..b9a2cd7 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -7,7 +7,7 @@ torlauncher.tor_exited=Torは予期せず終了しました。 torlauncher.please_restart_app=このアプリケーションを再起動してください。 torlauncher.tor_controlconn_failed=Torのコントロールポートに接続出来ませんでした。 torlauncher.tor_failed_to_start=Torは開始出来ませんでした。 -torlauncher.tor_bootstrap_failed=TorはTorネットワーク接続の確立に失敗しました。 +torlauncher.tor_bootstrap_failed=TorはTorネットワーク接続の確立に失敗しました (%S)。 torlauncher.unable_to_start_tor=Torを開始出来ません。\n\n%S torlauncher.tor_missing=Torの実行可能ファイルが見つかりません。 @@ -29,3 +29,23 @@ torlauncher.quit_win=終了 torlauncher.done=完了 torlauncher.forAssistance=サポートについては、%Sにお問い合わせください + +torlauncher.bootstrapStatus.conn_dir=リレーディレクトリへ接続 +torlauncher.bootstrapStatus.handshake_dir=暗号化されたディレクトリとの接続を確立 +torlauncher.bootstrapStatus.requesting_status=ネットワークを検索中 +torlauncher.bootstrapStatus.loading_status=ネットワークを読込中 +torlauncher.bootstrapStatus.loading_keys=認証局の署名を読込中 +torlauncher.bootstrapStatus.requesting_descriptors=リレー情報を要求中 +torlauncher.bootstrapStatus.loading_descriptors=リレー情報を読込中 +torlauncher.bootstrapStatus.conn_or=Torネットワックに接続しています +torlauncher.bootstrapStatus.handshake_or=Tor回線を設置しています +torlauncher.bootstrapStatus.done=Torネットワークに接続しました! + +torlauncher.bootstrapWarning.done=完了 +torlauncher.bootstrapWarning.connectrefused=接続に失敗 +torlauncher.bootstrapWarning.misc=その他 +torlauncher.bootstrapWarning.resourcelimit=資源不足 +torlauncher.bootstrapWarning.identity=識別子の不一致 +torlauncher.bootstrapWarning.timeout=接続タイムアウト +torlauncher.bootstrapWarning.noroute=ホストへの経路が見つかりません +torlauncher.bootstrapWarning.ioerror=読み書きエラー diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index e00a45a..3bc1ee9 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. # torlauncher.error_title=Tor Launcher @@ -7,7 +7,7 @@ # torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. -# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S +# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection (%S). # torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S # torlauncher.tor_missing=The Tor executable is missing. @@ -29,3 +29,23 @@ torlauncher.quit_win=종료 torlauncher.done=완료 # torlauncher.forAssistance=For assistance, contact %S + +torlauncher.bootstrapStatus.conn_dir=중계서버 디렉토리에 연결 +torlauncher.bootstrapStatus.handshake_dir=암호화된 디렉터리 연결을 설정 +torlauncher.bootstrapStatus.requesting_status=네트워크의 상태를 가져오는중 +torlauncher.bootstrapStatus.loading_status=네트워크의 상태를 요청중 +torlauncher.bootstrapStatus.loading_keys=권한 인증서를 로딩중 +torlauncher.bootstrapStatus.requesting_descriptors=중계서버 정보를 요청중 +torlauncher.bootstrapStatus.loading_descriptors=중계서버 정보를 로딩중 +torlauncher.bootstrapStatus.conn_or=Tor 네트워크에 연결중 +torlauncher.bootstrapStatus.handshake_or=토르 서킷의 연결을 성공 +torlauncher.bootstrapStatus.done=Tor 네트워크에 연결 성공! + +torlauncher.bootstrapWarning.done=완료 +torlauncher.bootstrapWarning.connectrefused=연결이 거부됨 +torlauncher.bootstrapWarning.misc=잡동사니 +torlauncher.bootstrapWarning.resourcelimit=리소스 부족 +torlauncher.bootstrapWarning.identity=계정 불일치 +torlauncher.bootstrapWarning.timeout=연결 타임아웃 +torlauncher.bootstrapWarning.noroute=호스트로의 연결 경로가 없음 +torlauncher.bootstrapWarning.ioerror=읽기 / 쓰기 오류 diff --git a/src/chrome/locale/lt/torlauncher.properties b/src/chrome/locale/lt/torlauncher.properties new file mode 100644 index 0000000..0387fba --- /dev/null +++ b/src/chrome/locale/lt/torlauncher.properties @@ -0,0 +1,13 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Jungiamasi prie retransliavimo taškų +torlauncher.bootstrapStatus.handshake_dir=Užmezgiamas ryšys +torlauncher.bootstrapStatus.requesting_status=Nuskaitoma tinklo būklė +torlauncher.bootstrapStatus.loading_status=Nustatoma tinklo būklė +torlauncher.bootstrapStatus.loading_keys=Įkeliami prieigos sertifikatai +torlauncher.bootstrapStatus.requesting_descriptors=Užklausiama retranslaicijos taškų informacija +torlauncher.bootstrapStatus.loading_descriptors=Įkeliama retransliacijos informacija +torlauncher.bootstrapStatus.conn_or=Jungiamasi prie Tor tinklo +torlauncher.bootstrapStatus.handshake_or=Užmezgiamas sujungimas +torlauncher.bootstrapStatus.done=Prijungtas prie Tor tinklo! diff --git a/src/chrome/locale/lv/torlauncher.properties b/src/chrome/locale/lv/torlauncher.properties new file mode 100644 index 0000000..a92044f --- /dev/null +++ b/src/chrome/locale/lv/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Veido savienojumu ar retranslatoru direktoriju +torlauncher.bootstrapStatus.handshake_dir=Izveido šifrētu savienojumu ar direktoriju +torlauncher.bootstrapStatus.requesting_status=Izgūst tīkla statusu +torlauncher.bootstrapStatus.loading_status=Ielādē tīkla statusu +torlauncher.bootstrapStatus.loading_keys=Ielādē sertificēšanas sertifikātus +torlauncher.bootstrapStatus.requesting_descriptors=Pieprasa retranslatoru informāciju +torlauncher.bootstrapStatus.loading_descriptors=Ielādē retranslatoru informāciju +torlauncher.bootstrapStatus.conn_or=Veido savienojumu ar Tor tīklu +torlauncher.bootstrapStatus.handshake_or=Izveido Tor maršrutu +torlauncher.bootstrapStatus.done=Savienojums ar tīklu Tor izveidots! + +torlauncher.bootstrapWarning.done=gatavs +torlauncher.bootstrapWarning.connectrefused=savienojums atteikts +torlauncher.bootstrapWarning.misc=dažādi +torlauncher.bootstrapWarning.resourcelimit=nepietiek resursu +torlauncher.bootstrapWarning.identity=identitātes neatbilstība +torlauncher.bootstrapWarning.timeout=savienojuma noilgums +torlauncher.bootstrapWarning.noroute=nav maršruta uz viesotāju +torlauncher.bootstrapWarning.ioerror=lasīšanas/rakstīšanas kļūda diff --git a/src/chrome/locale/my/torlauncher.properties b/src/chrome/locale/my/torlauncher.properties new file mode 100644 index 0000000..abfd502 --- /dev/null +++ b/src/chrome/locale/my/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Relay ဖိုင်လမ်းကြောင်း တစ်ခုကို ဆက်သွယ်နေသည် +torlauncher.bootstrapStatus.handshake_dir=စာဝှက်ထားသည့် ဖိုင်လမ်းကြောင်း ချိတ်ဆက်မှု တစ်ခု တည်ဆောက်နေသည် +torlauncher.bootstrapStatus.requesting_status=ကွန်ရက် အနေအထားကို ပြန်ရယူနေသည် +torlauncher.bootstrapStatus.loading_status=ကွန်ရက် အနေအထားကို ဖွင့်နေသည် +torlauncher.bootstrapStatus.loading_keys=လုပ်ပိုင်ခွင့် လက်မှတ်များကို ရယူနေသည် +torlauncher.bootstrapStatus.requesting_descriptors=Relay အချက်အလက်ကို တောင်းခံနေသည် +torlauncher.bootstrapStatus.loading_descriptors=Relay အချက်အလက်များကို ရယူနေသည် +torlauncher.bootstrapStatus.conn_or=Tor ကွန်ရက်ကို ဆက်သွယ်နေသည် +torlauncher.bootstrapStatus.handshake_or=Tor ဆားကစ် တစ်ခုကို တည်ဆောက်နေသည် +torlauncher.bootstrapStatus.done=Tor ကွန်ရက်ကို ချိတ်ဆက်မိသည်! + +torlauncher.bootstrapWarning.done=ပြီးသွားပြီ +torlauncher.bootstrapWarning.connectrefused=ဆက်သွယ်မှုလိုင်း မရပါ +torlauncher.bootstrapWarning.misc=အထွေထွေ +torlauncher.bootstrapWarning.resourcelimit=အရင်းအမြစ်များ မလုံလောက်ပါ +torlauncher.bootstrapWarning.identity=အထောက်အထား မကိုက်ညီပါ +torlauncher.bootstrapWarning.timeout=ချိတ်ဆက်မှုလိုင်း ပြတ်သွားသည် +torlauncher.bootstrapWarning.noroute=Host ကို သွားမည့် လမ်းမရှိပါ +torlauncher.bootstrapWarning.ioerror=အရေး/အဖတ် ချို့ယွင်းချက် diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties new file mode 100644 index 0000000..c706902 --- /dev/null +++ b/src/chrome/locale/nb/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Kobler til en relékatalog +torlauncher.bootstrapStatus.handshake_dir=Etablerer en kryptert katalogforbindelse +torlauncher.bootstrapStatus.requesting_status=Mottar nettverkstatus +torlauncher.bootstrapStatus.loading_status=Laster nettverkstatus +torlauncher.bootstrapStatus.loading_keys=Laster serfikater for autoritet +torlauncher.bootstrapStatus.requesting_descriptors=Sender forespørsel om reléinformasjon +torlauncher.bootstrapStatus.loading_descriptors=Laster reléinformasjon +torlauncher.bootstrapStatus.conn_or=Kobler til Tor-nettverket +torlauncher.bootstrapStatus.handshake_or=Etablerer en Tor-rute +torlauncher.bootstrapStatus.done=Koblet til Tor-nettverket! + +torlauncher.bootstrapWarning.done=ferdig +torlauncher.bootstrapWarning.connectrefused=forbindelse nektet +torlauncher.bootstrapWarning.misc=diverse +torlauncher.bootstrapWarning.resourcelimit=ikke nok resursser +torlauncher.bootstrapWarning.identity=feil identitet +torlauncher.bootstrapWarning.timeout=forbindelse tidsavbrutt +torlauncher.bootstrapWarning.noroute=ingen rute til vert +torlauncher.bootstrapWarning.ioerror=lese/skrive feil diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index 5931b44..780f40b 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Starter @@ -7,7 +7,7 @@ torlauncher.tor_exited=Tor is onverwacht afgesloten. torlauncher.please_restart_app=Herstart deze applicatie alstublieft. torlauncher.tor_controlconn_failed=Kon niet verbinden met een Tor controlepoort. torlauncher.tor_failed_to_start=Tor kon niet starten. -torlauncher.tor_bootstrap_failed=Tor slaagde er niet in een verbinding met het Tor netwerk te maken.\n\n%S +torlauncher.tor_bootstrap_failed=Tor slaagde er niet in een verbinding met het Tor netwerk te maken (%S). torlauncher.unable_to_start_tor=Kon Tor niet starten.\n\n%S torlauncher.tor_missing=Het Tor uitvoerbare bestand ontbreekt. @@ -29,3 +29,23 @@ torlauncher.quit_win=Sluit af torlauncher.done=OK torlauncher.forAssistance=Voor hulp, contacteer %S + +torlauncher.bootstrapStatus.conn_dir=Verbinden met een relay directory +torlauncher.bootstrapStatus.handshake_dir=Maken van een versleutelde verbinding met de lijst +torlauncher.bootstrapStatus.requesting_status=Ontvangen van de netwerkstatus +torlauncher.bootstrapStatus.loading_status=Laden van de netwerkstatus +torlauncher.bootstrapStatus.loading_keys=Laden van de authoriteitcertificaten +torlauncher.bootstrapStatus.requesting_descriptors=Opvragen van verbindingsinformatie +torlauncher.bootstrapStatus.loading_descriptors=Laden van verbindingsinformatie +torlauncher.bootstrapStatus.conn_or=Verbinden met het Tor-netwerk +torlauncher.bootstrapStatus.handshake_or=Maken van een Tor circuit +torlauncher.bootstrapStatus.done=Verbonden met het Tor-netwerk! + +torlauncher.bootstrapWarning.done=uitgevoerd +torlauncher.bootstrapWarning.connectrefused=verbinding geweigerd +torlauncher.bootstrapWarning.misc=willekeurig +torlauncher.bootstrapWarning.resourcelimit=onvoldoende resources +torlauncher.bootstrapWarning.identity=identiteitsfout +torlauncher.bootstrapWarning.timeout=verbindingstimeout +torlauncher.bootstrapWarning.noroute=geen route naar de server +torlauncher.bootstrapWarning.ioerror=lees/schrijffout diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index 301974e..537a7c0 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -7,7 +7,7 @@ torlauncher.tor_exited=Tor wyłączył się niespodziewanie. torlauncher.please_restart_app=Proszę zrestartuj tą aplikację. torlauncher.tor_controlconn_failed=Nie można połączyć się z portem kontrolnym Tora. torlauncher.tor_failed_to_start=Nie powiodło się włączenie Tora. -torlauncher.tor_bootstrap_failed=Błąd w ustanowieniu połączenia przez Tora.\n\n%S +torlauncher.tor_bootstrap_failed=Błąd w ustanowieniu połączenia przez Tora (%S). torlauncher.unable_to_start_tor=Nie można wystartować aplikacji Tor.\n\n%S torlauncher.tor_missing=Brakuje pliku wykonywalnego Tora. @@ -29,3 +29,23 @@ torlauncher.quit_win=Wyjście torlauncher.done=Gotowe torlauncher.forAssistance=By uzyskać pomoc, skontaktuj się + +torlauncher.bootstrapStatus.conn_dir=Podłączanie do katalogu węzłów +torlauncher.bootstrapStatus.handshake_dir=Ustanawianie szyfrowanego połączenia z katalogiem +torlauncher.bootstrapStatus.requesting_status=Odczytywanie stanu sieci +torlauncher.bootstrapStatus.loading_status=Wczytywanie stanu sieci +torlauncher.bootstrapStatus.loading_keys=Wczytywanie certyfikatów +torlauncher.bootstrapStatus.requesting_descriptors=Żądanie informacji o węźle +torlauncher.bootstrapStatus.loading_descriptors=Wczytywanie informacji o węźle +torlauncher.bootstrapStatus.conn_or=Podłączanie do sieci Tor +torlauncher.bootstrapStatus.handshake_or=Ustanawianie ścieżki Tora +torlauncher.bootstrapStatus.done=Połączony z siecią Tor! + +torlauncher.bootstrapWarning.done=zrobione +torlauncher.bootstrapWarning.connectrefused=połączenie odrzucone +torlauncher.bootstrapWarning.misc=różne +torlauncher.bootstrapWarning.resourcelimit=niewystarczające zasoby +torlauncher.bootstrapWarning.identity=niezgodność tożsamości +torlauncher.bootstrapWarning.timeout=upłynął czas połączenia +torlauncher.bootstrapWarning.noroute=brak trasy do hosta +torlauncher.bootstrapWarning.ioerror=błąd zapisu/odczytu diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties new file mode 100644 index 0000000..83f9f9c --- /dev/null +++ b/src/chrome/locale/pt-BR/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Conectando a um diretório de servidores +torlauncher.bootstrapStatus.handshake_dir=Estabelecendo conexão de diretório criptografado +torlauncher.bootstrapStatus.requesting_status=Recebendo estado da rede +torlauncher.bootstrapStatus.loading_status=Carregando estado da rede +torlauncher.bootstrapStatus.loading_keys=Carregando certificados de autoridade +torlauncher.bootstrapStatus.requesting_descriptors=Requisitando informações de servidor +torlauncher.bootstrapStatus.loading_descriptors=Carregando informações de servidor +torlauncher.bootstrapStatus.conn_or=Conectando à rede Tor +torlauncher.bootstrapStatus.handshake_or=Estabelecendo circuito Tor +torlauncher.bootstrapStatus.done=Conectado à rede Tor! + +torlauncher.bootstrapWarning.done=pronto +torlauncher.bootstrapWarning.connectrefused=conexão recusada +torlauncher.bootstrapWarning.misc=variados +torlauncher.bootstrapWarning.resourcelimit=recursos insuficientes +torlauncher.bootstrapWarning.identity=identidade conflitante +torlauncher.bootstrapWarning.timeout=tempo limite da conexão excedido +torlauncher.bootstrapWarning.noroute=sem rota para o host +torlauncher.bootstrapWarning.ioerror=erro de leitura/escrita diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index c36ee16..0caeb1f 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Iniciador Tor @@ -7,7 +7,7 @@ torlauncher.tor_exited=O Tor fechou-se insperadamente. torlauncher.please_restart_app=Por favor reinicie a aplicação. torlauncher.tor_controlconn_failed=Não foi possível ligar à porta de controlo do Tor. torlauncher.tor_failed_to_start=O Tor falhou a inicialização. -torlauncher.tor_bootstrap_failed=o Tor não conseguiu ligar-se à rede Tor.\n\n %S +torlauncher.tor_bootstrap_failed=o Tor não conseguiu ligar-se à rede Tor (%S). torlauncher.unable_to_start_tor=Impossível inicializar o Tor.\n\n %S torlauncher.tor_missing=O executável do Tor está em falta. @@ -29,3 +29,23 @@ torlauncher.quit_win=Sair torlauncher.done=Completo torlauncher.forAssistance=Para assistência contacte %S + +torlauncher.bootstrapStatus.conn_dir=Conectando-se a uma pasta do retransmissor +torlauncher.bootstrapStatus.handshake_dir=Estabelecendo uma conexão de pasta criptografada +torlauncher.bootstrapStatus.requesting_status=A recuperar o estado da rede +torlauncher.bootstrapStatus.loading_status=A carregar o estado da rede +torlauncher.bootstrapStatus.loading_keys=A carregar o certificados de autoridade +torlauncher.bootstrapStatus.requesting_descriptors=Pedindo informação do retransmissor +torlauncher.bootstrapStatus.loading_descriptors=Carregando informações do retransmissor +torlauncher.bootstrapStatus.conn_or=Conectando à rede Tor +torlauncher.bootstrapStatus.handshake_or=Estabelecendo um circuito Tor +torlauncher.bootstrapStatus.done=Conectado à rede Tor + +torlauncher.bootstrapWarning.done=Feito +torlauncher.bootstrapWarning.connectrefused=conexão recusada +torlauncher.bootstrapWarning.misc=diversos +torlauncher.bootstrapWarning.resourcelimit=recursos insuficientes +torlauncher.bootstrapWarning.identity=identidade incompatível +torlauncher.bootstrapWarning.timeout=Tempo de ligação expirado +torlauncher.bootstrapWarning.noroute=sem rota para o hospedeiro +torlauncher.bootstrapWarning.ioerror=Erro de leitura/escrita diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties new file mode 100644 index 0000000..79fff0e --- /dev/null +++ b/src/chrome/locale/ro/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Conectare la un director relay +torlauncher.bootstrapStatus.handshake_dir=Se stabileşte o conexiune criptată la director +torlauncher.bootstrapStatus.requesting_status=Se obţin informaţii despre starea reţelei +torlauncher.bootstrapStatus.loading_status=Se încarcă informaţiile despre starea reţelei +torlauncher.bootstrapStatus.loading_keys=Se încarcă certificatele de autoritate +torlauncher.bootstrapStatus.requesting_descriptors=Se cer informaţii despre relay +torlauncher.bootstrapStatus.loading_descriptors=Se încarcă informaţiile despre relay +torlauncher.bootstrapStatus.conn_or=Conctare la reţeaua Tor +torlauncher.bootstrapStatus.handshake_or=Se stabileşte un circuit Tor +torlauncher.bootstrapStatus.done=Conectare efectuată cu succes! + +torlauncher.bootstrapWarning.done=efectuat +torlauncher.bootstrapWarning.connectrefused=conexiune refuzată +torlauncher.bootstrapWarning.misc=diverse +torlauncher.bootstrapWarning.resourcelimit=resurse insuficiente +torlauncher.bootstrapWarning.identity=identităţile nu se potrivesc +torlauncher.bootstrapWarning.timeout=timpul alocat pentru conexiune a expirat (timeout) +torlauncher.bootstrapWarning.noroute=nici o rută către gazdă +torlauncher.bootstrapWarning.ioerror=eroare la scriere/citire diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index 52b7219..141c2c1 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Загрузчик Tor @@ -7,7 +7,7 @@ torlauncher.tor_exited=Tor неожиданно завершился. torlauncher.please_restart_app=Пожалуйста, перезапустите приложение torlauncher.tor_controlconn_failed=Невозможно соединиться с портом управления Tor. torlauncher.tor_failed_to_start=Невозможно запустить Tor. -torlauncher.tor_bootstrap_failed=Tor не сумел установить сетевое соединение.\n\n%S +torlauncher.tor_bootstrap_failed=Tor не сумел установить сетевое соединение (%S). torlauncher.unable_to_start_tor=Невозможно запустить Tor.\n\n%S torlauncher.tor_missing=Исполняемый файл Tor отсутствует. @@ -29,3 +29,23 @@ torlauncher.quit_win=Выход torlauncher.done=Готово torlauncher.forAssistance=Для помощи свяжитесь с %S + +torlauncher.bootstrapStatus.conn_dir=Подключение к каталогy ретрансляторов +torlauncher.bootstrapStatus.handshake_dir=Создание шифрованного соединения каталогa +torlauncher.bootstrapStatus.requesting_status=Получение статуса сети +torlauncher.bootstrapStatus.loading_status=Загрузка состояния сети +torlauncher.bootstrapStatus.loading_keys=Загрузка сертификатов +torlauncher.bootstrapStatus.requesting_descriptors=Запрос информации ретранслятора +torlauncher.bootstrapStatus.loading_descriptors=Загрузка информации ретранслятора +torlauncher.bootstrapStatus.conn_or=Подключение к сети Tor +torlauncher.bootstrapStatus.handshake_or=Создание цепочки Tor +torlauncher.bootstrapStatus.done=Подключен к сети Tor! + +torlauncher.bootstrapWarning.done=cделано +torlauncher.bootstrapWarning.connectrefused=в подключении отказано +torlauncher.bootstrapWarning.misc=pазное +torlauncher.bootstrapWarning.resourcelimit=нехватка ресурсов +torlauncher.bootstrapWarning.identity=несоответствие идентификации +torlauncher.bootstrapWarning.timeout=Тайм-аут соединения +torlauncher.bootstrapWarning.noroute=не указан путь к хосту +torlauncher.bootstrapWarning.ioerror=ошибка чтения / записи diff --git a/src/chrome/locale/sk/torlauncher.properties b/src/chrome/locale/sk/torlauncher.properties new file mode 100644 index 0000000..f4b446f --- /dev/null +++ b/src/chrome/locale/sk/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory +torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection +torlauncher.bootstrapStatus.requesting_status=Retrieving network status +torlauncher.bootstrapStatus.loading_status=Načítanie stavu siete +torlauncher.bootstrapStatus.loading_keys=Nahrávanie autorizačných certifikátov +torlauncher.bootstrapStatus.requesting_descriptors=Požiadať o informácie o relay +torlauncher.bootstrapStatus.loading_descriptors=Načítať informácie o relay +torlauncher.bootstrapStatus.conn_or=Pripájanie do siete Tor +torlauncher.bootstrapStatus.handshake_or=Nastavuje sa Tor okruh +torlauncher.bootstrapStatus.done=Ste pripojený do siete Tor! + +torlauncher.bootstrapWarning.done=hotovo +torlauncher.bootstrapWarning.connectrefused=pripojenie bolo odmietnuté +torlauncher.bootstrapWarning.misc=rôzne +torlauncher.bootstrapWarning.resourcelimit=nedostatočné zdroje +torlauncher.bootstrapWarning.identity=nesprávna identita +torlauncher.bootstrapWarning.timeout=časový limit pripojenia +torlauncher.bootstrapWarning.noroute=žiadna cesta k hostiteľovi +torlauncher.bootstrapWarning.ioerror=chyba pri načítaní/zápise diff --git a/src/chrome/locale/sr/torlauncher.properties b/src/chrome/locale/sr/torlauncher.properties new file mode 100644 index 0000000..bb9b993 --- /dev/null +++ b/src/chrome/locale/sr/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Повезивање са релеј директоријумом +torlauncher.bootstrapStatus.handshake_dir=Успостављање шифроване везе директоријума +torlauncher.bootstrapStatus.requesting_status=Преузимање мрежног статуса +torlauncher.bootstrapStatus.loading_status=Учитавање мрежног статуса +torlauncher.bootstrapStatus.loading_keys=Преузимање сертификата ауторитета +torlauncher.bootstrapStatus.requesting_descriptors=Захтев за пренос информације +torlauncher.bootstrapStatus.loading_descriptors=Учитавање преноса информације +torlauncher.bootstrapStatus.conn_or=Повезивање на Тор мрежу +torlauncher.bootstrapStatus.handshake_or=Успостављање Тор круга +torlauncher.bootstrapStatus.done=Повезан са Тор мрежом! + +torlauncher.bootstrapWarning.done=ради +torlauncher.bootstrapWarning.connectrefused=веза одбијена +torlauncher.bootstrapWarning.misc=разно +torlauncher.bootstrapWarning.resourcelimit=недовољна средства +torlauncher.bootstrapWarning.identity=идентитет неусклађен +torlauncher.bootstrapWarning.timeout=веза је истекла +torlauncher.bootstrapWarning.noroute=нема путање до сервера +torlauncher.bootstrapWarning.ioerror=грешка при писању/читању diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties new file mode 100644 index 0000000..647ee4f --- /dev/null +++ b/src/chrome/locale/sv/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Ansluter till en nodkatalog +torlauncher.bootstrapStatus.handshake_dir=Skapar en krypterad kataloganslutning +torlauncher.bootstrapStatus.requesting_status=Hämtar nätverksstatusen +torlauncher.bootstrapStatus.loading_status=Laddar nätverksstatus +torlauncher.bootstrapStatus.loading_keys=Laddar auktoritära certifikat +torlauncher.bootstrapStatus.requesting_descriptors=Begär nodinformation +torlauncher.bootstrapStatus.loading_descriptors=Laddar routerinformation +torlauncher.bootstrapStatus.conn_or=Ansluter till Tor-nätverket +torlauncher.bootstrapStatus.handshake_or=Skapar en Torkrets +torlauncher.bootstrapStatus.done=Ansluten till Tor-nätverket! + +torlauncher.bootstrapWarning.done=redo +torlauncher.bootstrapWarning.connectrefused=anslutningen vägrades +torlauncher.bootstrapWarning.misc=blandat +torlauncher.bootstrapWarning.resourcelimit=otillräckliga resurser +torlauncher.bootstrapWarning.identity=identitet felmatchad +torlauncher.bootstrapWarning.timeout=anslutningen gjorde en timeout +torlauncher.bootstrapWarning.noroute=framkomlig väg till värddatorn saknas (no route to host) +torlauncher.bootstrapWarning.ioerror=läs/skrivfel diff --git a/src/chrome/locale/th/torlauncher.properties b/src/chrome/locale/th/torlauncher.properties new file mode 100644 index 0000000..1c0a755 --- /dev/null +++ b/src/chrome/locale/th/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=กำลังเชื่อมต่อกับ คลังเก็บรายชื่อ relay (relay directory) +torlauncher.bootstrapStatus.handshake_dir=กำลังสร้างการเชื่อมต่อแบบเข้ารหัสกับคลังเก็บรายชื่อ +torlauncher.bootstrapStatus.requesting_status=กำลังตรวจสถานะเครือข่าย +torlauncher.bootstrapStatus.loading_status=กำลังดึงข้อมูลสถานะเครือข่าย +torlauncher.bootstrapStatus.loading_keys=กำลังดึง ใบรับรองการให้สิทธิ (authority certificates) +torlauncher.bootstrapStatus.requesting_descriptors=กำลังร้องขอ ข้อมูล relay +torlauncher.bootstrapStatus.loading_descriptors=กำลังดึง ข้อมูล relay +torlauncher.bootstrapStatus.conn_or=กำลังเชื่อมต่อสู่ เครือข่าย Tor +torlauncher.bootstrapStatus.handshake_or=กำลังสร้างวงจรเชื่อมต่อ Tor +torlauncher.bootstrapStatus.done=เชื่อมต่อสู่เครือข่าย Tor เรียบร้อย! + +torlauncher.bootstrapWarning.done=สำเร็จ +torlauncher.bootstrapWarning.connectrefused=ถูกปฏิเสธการเชื่อมต่อ +torlauncher.bootstrapWarning.misc=เบ็ดเตล็ด +torlauncher.bootstrapWarning.resourcelimit=ทรัพยากรไม่เพียงพอ +torlauncher.bootstrapWarning.identity=ตัวตนไม่ถูกต้อง +torlauncher.bootstrapWarning.timeout=นานเกินไปในการเชื่อมต่อ +torlauncher.bootstrapWarning.noroute=หาเส้นทางไปหา host ไม่พบ +torlauncher.bootstrapWarning.ioerror=อ่าน/เขียน ผิดพลาด diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties new file mode 100644 index 0000000..dff67aa --- /dev/null +++ b/src/chrome/locale/tr/torlauncher.properties @@ -0,0 +1,22 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=Aktarım klasörüne bağlanıyor +torlauncher.bootstrapStatus.handshake_dir=Şifrelenmiş dizin bağlantısı kuruluyor +torlauncher.bootstrapStatus.requesting_status=Ağ durumu güncelliyor +torlauncher.bootstrapStatus.loading_status=Ağ yükleniyor +torlauncher.bootstrapStatus.loading_keys=Doğrulama sertifikalarını yüklüyor +torlauncher.bootstrapStatus.requesting_descriptors=Ayna bilgisi isteniyor +torlauncher.bootstrapStatus.loading_descriptors=Ayna bilgisi yükleniyor +torlauncher.bootstrapStatus.conn_or=Tor ağına bağlanıyor +torlauncher.bootstrapStatus.handshake_or=Tor ağına bağlantı sağlanıyor +torlauncher.bootstrapStatus.done=Tor ağına bağlandı! + +torlauncher.bootstrapWarning.done=tamam +torlauncher.bootstrapWarning.connectrefused=Bağlantı red edildi +torlauncher.bootstrapWarning.misc=Diğer +torlauncher.bootstrapWarning.resourcelimit=Yetersiz kaynak +torlauncher.bootstrapWarning.identity=kimlik uyumsuz +torlauncher.bootstrapWarning.timeout=Zaman aşımı +torlauncher.bootstrapWarning.noroute=Yönlendirilecek sunucu yok +torlauncher.bootstrapWarning.ioerror=Okuma/yazma hatası diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties index 4db7387..e731323 100644 --- a/src/chrome/locale/vi/torlauncher.properties +++ b/src/chrome/locale/vi/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. # torlauncher.error_title=Tor Launcher @@ -7,7 +7,7 @@ # torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Chạy Tor thất bại. -torlauncher.tor_bootstrap_failed=Không thể thiết lập kết nối vào mạng Tor. +torlauncher.tor_bootstrap_failed=Không thể thiết lập kết nối vào mạng Tor (%S). # torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S # torlauncher.tor_missing=The Tor executable is missing. @@ -29,3 +29,23 @@ torlauncher.quit_win=Thoát # torlauncher.done=Done # torlauncher.forAssistance=For assistance, contact %S + +torlauncher.bootstrapStatus.conn_dir=Kết nối vào một thư mục chuyển tiếp +torlauncher.bootstrapStatus.handshake_dir=Thành lập một kết nối thư mục được mã hóa +torlauncher.bootstrapStatus.requesting_status=Khôi phục trạng thái mạng +torlauncher.bootstrapStatus.loading_status=Nap tình trạng mạng +torlauncher.bootstrapStatus.loading_keys=Nạp giấy chứng nhận quyền +torlauncher.bootstrapStatus.requesting_descriptors=Yêu cầu thông tin tiếp sức +torlauncher.bootstrapStatus.loading_descriptors=Tải thông tin tiếp sức +torlauncher.bootstrapStatus.conn_or=Kết nối với mạng Tor +torlauncher.bootstrapStatus.handshake_or=Thành lập một mạch Tor +torlauncher.bootstrapStatus.done=Kết nối với mạng Tor! + +torlauncher.bootstrapWarning.done=làm xong +torlauncher.bootstrapWarning.connectrefused=kết nối từ chối +torlauncher.bootstrapWarning.misc=hỗn hợp +torlauncher.bootstrapWarning.resourcelimit=không đủ nguồn lực +torlauncher.bootstrapWarning.identity=nhận dạng không phù hợp +torlauncher.bootstrapWarning.timeout=kết nối timeout +torlauncher.bootstrapWarning.noroute=không có lộ trình để lưu trữ +torlauncher.bootstrapWarning.ioerror=lỗi đọc / ghi diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties index d82b07d..2805383 100644 --- a/src/chrome/locale/zh-CN/torlauncher.properties +++ b/src/chrome/locale/zh-CN/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor 启动器 @@ -7,7 +7,7 @@ torlauncher.tor_exited=Tor 意外退出。 torlauncher.please_restart_app=请重启该应用程序。 torlauncher.tor_controlconn_failed=无法连接 Tor 控制端口。 torlauncher.tor_failed_to_start=Tor 无法启动。 -torlauncher.tor_bootstrap_failed=Tor 无法建立 Tor 网络连接。\n\n%S +torlauncher.tor_bootstrap_failed=Tor 无法建立 Tor 网络连接 (%S)。 torlauncher.unable_to_start_tor=无法启动 Tor。\n\n%S torlauncher.tor_missing=缺少 Tor 可执行文件。 @@ -29,3 +29,23 @@ torlauncher.quit_win=关闭 torlauncher.done=完成 torlauncher.forAssistance=如需帮助，请联系 %S + +torlauncher.bootstrapStatus.conn_dir=连接中继目录 +torlauncher.bootstrapStatus.handshake_dir=建立加密的目录连接 +torlauncher.bootstrapStatus.requesting_status=接收网络状态 +torlauncher.bootstrapStatus.loading_status=载入网络状态 +torlauncher.bootstrapStatus.loading_keys=载入授权服务器证书 +torlauncher.bootstrapStatus.requesting_descriptors=请求中继信息 +torlauncher.bootstrapStatus.loading_descriptors=载入中继信息 +torlauncher.bootstrapStatus.conn_or=连接 Tor 网络 +torlauncher.bootstrapStatus.handshake_or=建立 Tor 回路 +torlauncher.bootstrapStatus.done=Tor 网络已经连接！ + +torlauncher.bootstrapWarning.done=结束 +torlauncher.bootstrapWarning.connectrefused=连接被拒绝 +torlauncher.bootstrapWarning.misc=杂项 +torlauncher.bootstrapWarning.resourcelimit=资源不够 +torlauncher.bootstrapWarning.identity=身份不一致 +torlauncher.bootstrapWarning.timeout=连接超时 +torlauncher.bootstrapWarning.noroute=没有可用链路 +torlauncher.bootstrapWarning.ioerror=读写错误 diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties new file mode 100644 index 0000000..317fe9b --- /dev/null +++ b/src/chrome/locale/zh-TW/torlauncher.properties @@ -0,0 +1,15 @@ +### Copyright (c) 2014, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.bootstrapStatus.conn_dir=正在連線至中繼站目錄 +torlauncher.bootstrapStatus.handshake_dir=正在建立加密的目錄連線 +torlauncher.bootstrapStatus.requesting_descriptors=正在要求中繼站資訊 +torlauncher.bootstrapStatus.conn_or=正在連線至 Tor 網路 +torlauncher.bootstrapStatus.handshake_or=正在建立 Tor 迴路 +torlauncher.bootstrapStatus.done=已連線到 Tor 網路! + +torlauncher.bootstrapWarning.done=完成 +torlauncher.bootstrapWarning.misc=雜項 +torlauncher.bootstrapWarning.resourcelimit=資源不足 +torlauncher.bootstrapWarning.timeout=連線逾時 +torlauncher.bootstrapWarning.ioerror=讀寫錯誤 diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 660588d..f9b863e 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -1,4 +1,4 @@ -// Copyright (c) 2013, The Tor Project, Inc. +// Copyright (c) 2014, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -236,7 +236,7 @@ TorProcessService.prototype = TorClearBootstrapError: function() { this.mLastTorWarningPhase = null; - this.mLastTorWarningText = null; + this.mLastTorWarningReason = null; }, @@ -255,7 +255,7 @@ TorProcessService.prototype = mQuitSoon: false, // Quit was requested by the user; do so soon. mRestartWithQuit: false, mLastTorWarningPhase: null, - mLastTorWarningText: null, + mLastTorWarningReason: null, // Private Methods ///////////////////////////////////////////////////////// @@ -412,20 +412,22 @@ TorProcessService.prototype = { this.mBootstrapErrorOccurred = true; TorLauncherUtil.setBoolPref(this.kPrefPromptAtStartup, true); - TorLauncherLogger.log(5, "Tor bootstrap error: " + aStatusObj.WARNING); + var reason = TorLauncherUtil.getLocalizedBootstrapStatus(aStatusObj, + "REASON"); + TorLauncherLogger.log(5, "Tor bootstrap error: " + aStatusObj.REASON + + " (" + reason + ")"); if ((aStatusObj.TAG != this.mLastTorWarningPhase) || - (aStatusObj.WARNING != this.mLastTorWarningText)) + (aStatusObj.REASON != this.mLastTorWarningReason)) { this.mLastTorWarningPhase = aStatusObj.TAG; - this.mLastTorWarningText = aStatusObj.WARNING; + this.mLastTorWarningReason = aStatusObj.REASON; var s = TorLauncherUtil.getFormattedLocalizedString( - "tor_bootstrap_failed", [aStatusObj.WARNING], 1); + "tor_bootstrap_failed", [reason], 1); TorLauncherUtil.showAlert(null, s); - this.mObsSvc.notifyObservers(null, "TorBootstrapError", - aStatusObj.WARNING); + this.mObsSvc.notifyObservers(null, "TorBootstrapError", reason); } } } diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index e6298e8..ef13a72 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -1,4 +1,4 @@ -// Copyright (c) 2013, The Tor Project, Inc. +// Copyright (c) 2014, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -94,6 +94,47 @@ let TorLauncherUtil = // Public return aStringName; }, + getLocalizedBootstrapStatus: function(aStatusObj, aKeyword) + { + if (!aStatusObj || !aKeyword) + return ""; + + var result; + var fallbackStr; + if (aStatusObj[aKeyword]) + { + var val = aStatusObj[aKeyword].toLowerCase(); + var key; + if (aKeyword == "TAG") + { + if ("onehop_create" == val) + val = "handshake_dir"; + else if ("circuit_create" == val) + val = "handshake_or"; + + key = "bootstrapStatus." + val; + fallbackStr = aStatusObj.SUMMARY; + } + else if (aKeyword == "REASON") + { + if ("connectreset" == val) + val = "connectrefused"; + + key = "bootstrapWarning." + val; + fallbackStr = aStatusObj.WARNING; + } + + result = TorLauncherUtil.getLocalizedString(key); + if (result == key) + result = undefined; + } + + if (!result) + result = fallbackStr; + + return (result) ? result : ""; + }, + // Preferences getBoolPref: function(aPrefName, aDefaultVal) {

1 0

r26609: {website} update mirrors and status. (website/trunk/include)
by Andrew Lewman 11 Feb '14

11 Feb '14

Author: phobos Date: 2014-02-11 21:12:00 +0000 (Tue, 11 Feb 2014) New Revision: 26609 Modified: website/trunk/include/mirrors-table.wmi website/trunk/include/tor-mirrors.csv Log: update mirrors and status. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2014-02-11 15:53:29 UTC (rev 26608) +++ website/trunk/include/mirrors-table.wmi 2014-02-11 21:12:00 UTC (rev 26609) @@ -18,32 +18,32 @@ <tr> - <td>US</td> + <td>DE</td> - <td>Tor Supporter</td> + <td>beme it</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> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="http://tor.beme-it.de/dist/">http</a></td> + <td><a href="http://tor.beme-it.de/">http</a></td> + <td><a href="https://tor.beme-it.de/dist/">https</a></td> + <td><a href="https://tor.beme-it.de/">https</a></td> + <td><a href="rsync://tor.beme-it.de/tor/dist">rsync</a></td> + <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> </tr> <tr> - <td>DK</td> + <td>US</td> - <td>Zentrum der Gesundheit</td> + <td>Tor Supporter</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> @@ -69,23 +69,6 @@ <tr> - <td>ES</td> - - <td>Tor Supporter</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.zilog.es/dist/">http</a></td> - <td><a href="http://tor.zilog.es/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>NL</td> <td>BBLN</td> @@ -120,40 +103,6 @@ <tr> - <td>EE</td> - - <td>CyberSIDE</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>IS</td> - - <td>torproject.is</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://torproject.is/dist/">http</a></td> - <td><a href="http://torproject.is/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> <td>spline</td> @@ -205,6 +154,23 @@ <tr> + <td>HU</td> + + <td>Unknown</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://mirror.tor.hu/dist/">http</a></td> + <td><a href="http://mirror.tor.hu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>TN</td> <td>Tor Supporter</td> @@ -307,42 +273,8 @@ <tr> - <td>US</td> - - <td>Xpdm</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://torproj.xpdm.us/dist/">http</a></td> - <td><a href="http://torproj.xpdm.us/">http</a></td> - <td><a href="https://torproj.xpdm.us/dist/">https</a></td> - <td><a href="https://torproj.xpdm.us/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> - <td>beme it</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.beme-it.de/dist/">http</a></td> - <td><a href="http://tor.beme-it.de/">http</a></td> - <td><a href="https://tor.beme-it.de/dist/">https</a></td> - <td><a href="https://tor.beme-it.de/">https</a></td> - <td><a href="rsync://tor.beme-it.de/tor/dist">rsync</a></td> - <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> -</tr> - -<tr> - - <td>DE</td> - <td>Tor Supporter</td> <td>Up to date</td> @@ -358,42 +290,8 @@ <tr> - <td>LT</td> - - <td>Tor Supporter</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<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>US</td> - <td>hessmo</td> <td>Up to date</td> @@ -494,23 +392,6 @@ <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>US</td> <td>HackThisSite.org</td> @@ -715,23 +596,6 @@ <tr> - <td>SE</td> - - <td>homosu</td> - - <td>Up to 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> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IS</td> <td>myRL.net</td> @@ -916,3 +780,122 @@ <td><a href="rsync://torproject.gtor.org/website-mirror/dist/">rsync</a></td> <td><a href="rsync://torproject.gtor.org/website-mirror/">rsync</a></td> </tr> + +<tr> + + <td>LT</td> + + <td>Tor Supporter</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<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>IN</td> + + <td>India Tor Fans</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://www.torproject.org.in/dist/">http</a></td> + <td><a href="http://www.torproject.org.in/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>EE</td> + + <td>CyberSIDE</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>SE</td> + + <td>homosu</td> + + <td>Up to 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> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<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>ES</td> + + <td>Tor Supporter</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.zilog.es/dist/">http</a></td> + <td><a href="http://tor.zilog.es/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> Modified: website/trunk/include/tor-mirrors.csv =================================================================== --- website/trunk/include/tor-mirrors.csv 2014-02-11 15:53:29 UTC (rev 26608) +++ website/trunk/include/tor-mirrors.csv 2014-02-11 21:12:00 UTC (rev 26609) @@ -1,80 +1,80 @@ adminContact, orgName, isoCC, subRegion, region, ipv4, ipv6, loadBalanced, httpWebsiteMirror, httpsWebsiteMirror, rsyncWebsiteMirror, ftpWebsiteMirror, httpDistMirror, httpsDistMirror, rsyncDistMirror, hiddenServiceMirror, updateDate -Tor Fan, Tor Supporter, US, United States, US,TRUE,FALSE, No, http://mirror.nametoday.me/tor/, , , , http://mirror.nametoday.me/tor/dist/, , , , Thu Feb 6 17:28:24 2014 -Tor Fan, Tor Supporter, US, United States, US,TRUE,TRUE, No, http://tor.loritsu.com/, , , , http://tor.loritsu.com/dist/, , , , -info AT zentrum-der-gesundheit DOT de, Zentrum der Gesundheit, DK, Denmark, Europe,TRUE,FALSE, No, http://tor.idnr.ws/, , , , http://tor.idnr.ws/dist/, , , , Thu Feb 6 17:28:24 2014 -http://www.multinet.no, MultiNet AS, NO, Trondheim, Trondheim,TRUE,TRUE, No, http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Thu Feb 6 17:28:24 2014 -Tor Fan, Tor Supporter, US, United States, US,TRUE,FALSE, No, http://tor.mirrors.whitedholdings.org/, https://tor.mirrors.whitedholdings.org/, rsync://mirrors.whitedholdings.org/tor, , http://tor.mirrors.whitedholdings.org/dist/, https://tor.mirrors.whitedholdings.org/dist/, rsync://tor.mirrors.whitedholdings.org/tor-dist, , -haskell at gmx.es, Tor Supporter, ES, Spain, Europe,TRUE,FALSE, No, http://tor.zilog.es/, , , , http://tor.zilog.es/dist/, , , , Thu Feb 6 17:28:24 2014 -webmaster AT bbln DOT nl, BBLN, NL, The Netherlands, Europe,TRUE,TRUE, No, http://mirror.ml/tor/, https://mirror.ml/tor/, , , http://mirror.ml/tor/dist/, https://mirror.ml/tor/dist/, , , Thu Feb 6 17:28:24 2014 -Tor Fan, Tor Supporter, US, United States, US,TRUE,FALSE, No, http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Thu Feb 6 17:28:24 2014 -margus.random at mail.ee, CyberSIDE, EE, Estonia, EE,TRUE,FALSE, No, http://cyberside.planet.ee/tor/, , , , http://cyberside.net.ee/tor/, , , , Thu Feb 6 17:28:24 2014 -Tor Fan, torproject.is, IS, Iceland, IS,TRUE,FALSE, No, http://torproject.is/, , , , http://torproject.is/dist/, , , , Thu Feb 6 17:28:24 2014 -Tor Fan, spline, DE, Germany, DE,TRUE,FALSE, No, http://tor.spline.de/, https://tor.spline.inf.fu-berlin.de/, rsync://ftp.spline.de/tor, ftp://ftp.spline.de/pub/tor, http://tor.spline.de/dist/, https://tor.spline.inf.fu-berlin.de/dist/, rsync://ftp.spline.de/tor/dist, , Thu Feb 6 17:28:24 2014 -Tor Fan, me0w.cc, RO, Romania, RO,TRUE,FALSE, No, http://tor.me0w.cc/, , , , http://tor.me0w.cc/dist/, , , , Thu Feb 6 17:28:24 2014 -Tor Fan, borgmann.tv, DE, Germany, DE,TRUE,FALSE, No, http://tor.borgmann.tv/, , , , http://tor.borgmann.tv/dist/, , , , Thu Feb 6 17:28:24 2014 -security AT hostoffice DOT hu, Unknown, HU, Hungary, Europe,TRUE,FALSE, No, http://mirror.tor.hu/, , , , http://mirror.tor.hu/dist/, , , , Sun Feb 2 05:50:15 2014 -Tor Fan, Tor Supporter, TN, Tunisia, TN,TRUE,FALSE, No, http://torproject.antagonism.org/, https://torproject.antagonism.org/, , , , , , , Thu Feb 6 17:28:24 2014 -webmaster AT ccc DOT de, CCC, NL, The Netherlands, Europe,TRUE,FALSE, No, http://tor.ccc.de/, , , , http://tor.ccc.de/dist/, , , , Thu Feb 6 17:28:24 2014 -Tor Fan, searchprivate, US, TX, US,TRUE,FALSE, No, http://tor.searchprivate.com/, , , , http://tor.searchprivate.com/dist/, , , , Sun Jul 29 23:49:26 2012 -Tor Fan, Tor Supporter, AT, Austria, AT,TRUE,TRUE, No, http://tor.dont-know-me.at/, , , , http://tor.dont-know-me.at/dist/, , , , Thu Feb 6 17:28:24 2014 -Tor Fan, Tor Supporter, LU, Luxemborg, LU,TRUE,FALSE, No, http://torproject.adamas.ai/, , , , http://torproject.adamas.ai/dist/, , , , -mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe,TRUE,FALSE, No, http://mirror.ntzk.de/torproject.org/, , , , http://mirror.ntzk.de/torproject.org/dist/, , , , Thu Feb 6 17:28:24 2014 -coralcdn.org, CoralCDN, INT, International, INT,TRUE,FALSE, Yes, http://www.torproject.org.nyud.net/, , , , http://www.torproject.org.nyud.net/dist/, , , , Sat Feb 8 03:31:25 2014 -Tor Fan, Tor Supporter, US, United States, US,TRUE,TRUE, No, http://mirror.nametoday.me/tor/, , , , http://mirror.nametoday.me/tor/dist/, , , , Thu Feb 6 17:28:24 2014 -Tor Fan, Tor Supporter, AT, Austria, AT,TRUE,FALSE, No, http://torproject.ph3x.at/, , , , http://torproject.ph3x.at/dist/, , , , Thu Feb 6 17:28:24 2014 -info /AT enn /DOT lu, Frenn vun der Enn A.S.B.L., IS, Iceland, Europe,TRUE,FALSE, No, http://torproject.lu/, , , , http://torproject.lu/dist/, , , http://btn6gqzqevlhoryd.onion, Mon Jan 20 19:14:22 2014 -neutrino8 AT gmail DOT com, teambelgium, BE, Belgium, Europe,TRUE,FALSE, No, http://tor.teambelgium.net:8080/, , , ftp://tor.teambelgium.net:2121/torproject/, http://tor.teambelgium.net:8080/dist/, , , , Thu Feb 6 17:28:24 2014 -tormaster AT xpdm DOT us, Xpdm, US, United States, North America,TRUE,FALSE, No, http://torproj.xpdm.us/, https://torproj.xpdm.us/, , , http://torproj.xpdm.us/dist/, https://torproj.xpdm.us/dist/, , http://h3prhz46uktgm4tt.onion/, Thu Feb 6 17:28:24 2014 -Tor Fan, Tor Supporter, UA, Ukraine, UA,TRUE,FALSE, No, http://torua.reactor-xg.kiev.ua/, , , , http://torua.reactor-xg.kiev.ua/dist/, , , , - mail AT benjamin-meier DOT info, beme it, DE, Germany, DE,TRUE,FALSE, No, http://tor.beme-it.de/, https://tor.beme-it.de/, rsync://tor.beme-it.de/tor, , http://tor.beme-it.de/dist/, https://tor.beme-it.de/dist/, rsync://tor.beme-it.de/tor/dist, , Thu Feb 6 17:28:24 2014 -wollomatic at posteo.eu, Tor Supporter, DE, Germany, Europe,TRUE,TRUE, No, http://tormirror.almnet.de/, https://tormirror.almnet.de/, , , http://tormirror.almnet.de/dist/, https://tormirror.almnet.de/dist/, , , Thu Feb 6 17:28:24 2014 -Tor Fan, Tor Supporter, LT, Lithuania, LT,TRUE,FALSE, No, http://tor.vesta.nu/, , , , http://tor.vesta.nu/dist/, , , , Thu Feb 6 17:28:24 2014 -Tor Fan, Tor Supporter, MX, Mexico, MX,TRUE,FALSE, No, http://fbnaia.homelinux.net/torproject/, https://fbnaia.homelinux.net/torproject/, , , http://fbnaia.homelinux.net/torproject/dist/, https://fbnaia.homelinux.net/torproject/dist/, , , Sat Jan 25 21:32:38 2014 -Tor Fan, Tor Supporter, FR, France, FR,TRUE,FALSE, No, http://37.187.0.127/tormirror/, , , , http://37.187.0.127/tormirror/dist/, , , , -Tor Fan, Tor Supporter, US, United States, US,TRUE,FALSE, No, http://tor.minibofh.org/, , , , http://tor.minibofh.org/dist/, , , , -Tor Fan, Tor Supporter, UK, United Kingdom, UK,TRUE,FALSE, No, http://tor.mage.me.uk/, , , , http://tor.mage.me.uk/dist/, , , , -webmaster AT askapache DOT com, AskApache, US, California, US,TRUE,FALSE, No, http://tor.askapache.com/, , , , http://tor.askapache.com/dist/, , , , Thu Feb 6 17:28:24 2014 -nsane2307 eml cc, tor-mirror.de, DE, Germany, Europe,TRUE,FALSE, No, http://tor-mirror.de/, https://tor-mirror.de/, , , http://tor-mirror.de/dist/, https://tor-mirror.de/dist/, , , -Tor Fan, hessmo, US, United States, US,TRUE,FALSE, No, http://mirror.hessmo.com/tor/, , , , http://mirror.hessmo.com/tor/dist/, , , , Thu Feb 6 17:28:24 2014 -Tor Fan, Tor Supporter, DE, Germany, DE,TRUE,FALSE, No, http://tor.dev-random.de/, https://tor.dev-random.de/, , , http://tor.dev-random.de/dist/, https://tor.dev-random.de/dist/, , , Thu Feb 6 17:28:24 2014 -Tor Fan, India Tor Fans, IN, India, IN,TRUE,FALSE, No, http://www.torproject.org.in/, , , , http://www.torproject.org.in/dist/, , , , Mon Nov 25 18:31:18 2013 -mirror-admin(a)linsrv.net, linsrv, FR, France, Europe,TRUE,FALSE, No, http://mirrors.linsrv.net/torproject/, , mirrors.linsrv.net::pub/torproject, ftp://ftp.linsrv.net/pub/torproject/, http://mirrors.linsrv.net/torproject/dist/, , mirrors.linsrv.net::pub/torproject/dist, , Thu Feb 6 17:28:24 2014 -Tor Fan, Tor Supporter, FR, France, FR,TRUE,FALSE, No, http://tor.mirror.chekanov.net/, , , , http://tor.mirror.chekanov.net/dist/, , , , Thu Feb 6 17:28:24 2014 -http://sebastian.pfeifer.or.at/, TechAsk.IT, AT, Favoriten, Wien,TRUE,TRUE, No, http://www.unicorncloud.org/public/torproject.org/, https://www.unicorncloud.org/public/torproject.org/, , , http://www.unicorncloud.org/public/torproject.org/dist, https://www.unicorncloud.org/public/torproject.org/dist, , , Thu Feb 6 17:28:24 2014 -BarkerJr AT barkerjr DOT net, BarkerJr, FR, France, FR,TRUE,FALSE, No, http://www.oignon.net/, https://www.oignon.net/, , , http://www.oignon.net/dist/, https://www.oignon.net/dist/, , , Thu Feb 6 17:28:24 2014 -root AT amorphis DOT eu, Amorphis, NL, The Netherlands, Europe,TRUE,FALSE, No, http://tor.amorphis.eu/, , , , http://tor.amorphis.eu/dist/, , , , Thu Feb 6 17:28:24 2014 -hackthissite.org, HackThisSite.org, US, United States, US,TRUE,TRUE, No, http://tor.hackthissite.org/, https://tor.hackthissite.org/, , , http://mirror.hackthissite.org/tor, https://mirror.hackthissite.org/tor, , , Thu Feb 6 17:28:24 2014 -citizen428 AT gmail DOT com, [[:bbs:]], DE, Germany, Europe,TRUE,FALSE, No, http://tor.blingblingsquad.net/, https://tor.blingblingsquad.net/, , , http://tor.blingblingsquad.net/dist/, https://tor.blingblingsquad.net/dist/, , , -Tor Fan, Tor Supporter, DE, Germany, DE,TRUE,FALSE, No, http://tor.linuxlounge.net/, https://tor.linuxlounge.net/, , , http://tor.linuxlounge.net/dist/, https://tor.linuxlounge.net/dist/, , , Thu Feb 6 17:28:24 2014 -Tor Fan, Tor Supporter, US, United States, US,TRUE,FALSE, No, , , , , http://www.netgull.com/torproject/, , , , -paul at coffswifi.net, CoffsWiFi, AU, Australia and New Zealand, APNIC,TRUE,FALSE, No, http://torproject.coffswifi.net, , , , http://torproject.coffswifi.net/dist, , , , Thu Feb 6 17:28:24 2014 -Tor Fan, cyberarmy, AT, Austria, AT,TRUE,FALSE, No, http://tor.cyberarmy.at/, , , , , , , , Thu Feb 6 17:28:24 2014 -Tor Fan, Tor Supporter, DE, Germany, DE,TRUE,FALSE, No, http://torproject.cryptowars.info/, https://torproject.cryptowars.info/, rsync://torproject.cryptowars.info/, , http://torproject.cryptowars.info/dist/, https://torproject.cryptowars.info/dist/, , , Thu Feb 6 17:28:24 2014 -hostmaster AT zombiewerks DOT com, TheOnionRouter, IS, Iceland, Iceland,TRUE,FALSE, No, http://theonionrouter.com/, , , , http://theonionrouter.com/dist/, , , , Thu Feb 6 17:28:24 2014 -Tor Fan, crazyhaze.de, DE, Germany, DE,TRUE,FALSE, No, http://tor.crazyhaze.de/, https://tor.crazyhaze.de/, , , http://tor.crazyhaze.de/dist/, https://tor.crazyhaze.de/dist/, , , Thu Feb 6 17:28:24 2014 -Tor Fan, chaos darmstadt, DE, Germany, Europe,TRUE,FALSE, No, http://mirrors.chaos-darmstadt.de/tor-mirror/, , , , http://mirrors.chaos-darmstadt.de/tor-mirror/dist/, , , , Thu Feb 6 17:28:24 2014 -Tor Fan, Soviet Anonymous, RU, Russia, RU,TRUE,FALSE, No, http://creep.im/tor, https://creep.im/tor, rsync://creep.im/tor, ftp://creep.im/mirrors/tor, http://creep.im/tor/dist/, https://creep.im/tor/dist/, rsync://creep.im/tor-dist, , Thu Feb 6 17:28:24 2014 -Tor Fan, Tor Supporter, US, United States, US,TRUE,FALSE, No, , , , ftp://mirrors.go-parts.com/tor/, http://mirrors.go-parts.com/tor/dist/, , rsync://mirrors.go-parts.com/mirrors/tor/, , Wed Jan 8 16:41:17 2014 -Tor Fan, NW Linux, US, WA, US,TRUE,FALSE, No, http://torproject.nwlinux.us/, , rsync://nwlinux.us/tor-web, , http://torproject.nwlinux.us/dist/, , rsync://nwlinux.us/tor-dist, , -Tor Fan, torservers, DE, Germany, DE,TRUE,FALSE, No, http://www.torservers.net/mirrors/torproject.org/, https://www.torservers.net/mirrors/torproject.org/, , , http://www.torservers.net/mirrors/torproject.org/dist/, https://www.torservers.net/mirrors/torproject.org/dist/, , http://hbpvnydyyjbmhx6b.onion/mirrors/torproject.org/, Thu Feb 6 17:28:24 2014 -Tor Fan, Tor Supporter, NL, The Netherlands, NL,TRUE,FALSE, No, , , , , , https://www.coevoet.nl/tor/dist/, , , -Tor Fan, torland, GB, United Kingdom, GB,TRUE,FALSE, No, http://mirror.torland.me/torproject.org/, https://mirror.torland.me/torproject.org/, , , http://mirror.torland.me/torproject.org/dist/, https://mirror.torland.me/torproject.org/dist/, , , Thu Feb 6 17:28:24 2014 -Tor Fan, Tor Supporter, FR, France, FR,TRUE,FALSE, No, http://torproject.c3l.lu/, , , , http://torproject.c3l.lu/dist/, , , , Wed Dec 25 05:35:51 2013 -Tor Fan, Lightning-bolt.net, CZ, Czech Republic, CZ,TRUE,FALSE, No, http://torproject.lightning-bolt.net/, , , , http://torproject.lightning-bolt.net/dist/, , , , Thu Feb 6 17:28:24 2014 -Tor Fan, LazyTiger, FR, France, FR,TRUE,FALSE, No, http://tor.taiga-san.net/, , , , http://tor.taiga-san.net/dist/, , , , -Tor Fan, Tor Supporter, EE, Estonia, EE,TRUE,FALSE, No, http://tor.li/, https://tor.li/, , , http://tor.li/dist/, https://tor.li/dist/, , , -Tor Fan, homosu, SE, Sweden, SE,TRUE,FALSE, No, http://tor.homosu.net/, , , , http://tor.homosu.net/dist/, , , , Thu Feb 6 17:28:24 2014 -IceBear, myRL.net, IS, Iceland, IS,TRUE,FALSE, No, http://tor.myrl.net/, https://tor.myrl.net/, , , http://tor.myrl.net/dist/, https://tor.myrl.net/dist/, , , Thu Feb 6 17:28:24 2014 -barkerjr(a)gmail.com, BarkerJr, LU, Luxemborg, LU,TRUE,TRUE, No, http://www.tor.lu, https://www.tor.lu, , , http://www.tor.lu/dist/, https://www.tor.lu/dist/, , , Thu Feb 6 17:28:24 2014 -Tor Fan, DevRandom, NL, The Netherlands, NL,TRUE,FALSE, No, http://devrandom.co/tor-mirror, https://devrandom.co/tor-mirror, , , http://devrandom.co/tor-mirror/dist, https://devrandom.co/tor-mirror/dist, , , Sun Feb 2 05:50:15 2014 -kiro AT userzap DOT de, Userzap, DE, Germany, DE,TRUE,FALSE, No, http://torprojekt.userzap.de, https://torprojekt.userzap.de, , , http://torprojekt.userzap.de/dist/, https://torprojekt.userzap.de/dist/, , , Thu Feb 6 17:28:24 2014 -postmaster(a)otivpn.com, otivpn.com, US, United States, US,TRUE,FALSE, Yes, http://otivpn.com/tor/, https://otivpn.com/tor/, , , http://otivpn.com/tor/dist, https://otivpn.com/tor/dist, , https://l4aujgukgr2osawn.onion/, Thu Feb 6 17:28:24 2014 -tor(a)eprci.net, EPRCI, US, United States, US,TRUE,FALSE, NO, http://tor.eprci.net/, https://www.eprci.com/tor/, , , http://tor.eprci.net/dist/, https://www.eprci.com/tor/dist/, , , Thu Feb 6 17:28:24 2014 -tor(a)les.net, tor(a)les.net, CA, Canada, CA,TRUE,FALSE, NO, http://tor.les.net/, , , , http://tor.les.net/dist, , , , Thu Feb 6 17:28:24 2014 -Tor Fan, PW, DE, Germany, DE,TRUE,TRUE, NO, http://tor.pw.is/, , , , http://tor.pw.is/dist/, , , , Thu Feb 6 17:28:24 2014 -tor(a)stalkr.net, stalkr.net, FR, France, FR,TRUE,TRUE, NO, http://tor.stalkr.net/, https://tor.stalkr.net/, , , http://tor.stalkr.net/dist/, https://tor.stalkr.net/dist/, , , Thu Feb 6 17:28:24 2014 -maki(a)maki-chan.de, Maki Hoshisawa, DE, Germany, DE,TRUE,FALSE, NO, http://tor.mirrors.maki-chan.de/, , , , http://tor.mirrors.maki-chan.de/dist/, , , , Thu Feb 6 17:28:24 2014 -doemela[AT]cyberguerrilla[DOT]org, cYbergueRrilLa AnonyMous NeXus, DE, Germany, DE,TRUE,FALSE, NO, https://tor-mirror.cyberguerrilla.org, , , , https://tor-mirror.cyberguerrilla.org/dist/, , , http://6dvj6v5imhny3anf.onion, Thu Feb 6 17:28:24 2014 -contact(a)gtor.org, Gtor, DE, Germany, DE,TRUE,TRUE, NO, http://torproject.gtor.org/, https://torproject.gtor.org/, rsync://torproject.gtor.org/website-mirror/, , http://torproject.gtor.org/dist/, https://torproject.gtor.org/dist/, rsync://torproject.gtor.org/website-mirror/dist/, , Thu Feb 6 17:28:24 2014 -mirrors(a)dev-null.io, dev-null.io, NL, The Netherlands, NL,TRUE,FALSE, NO, http://tor.dev-null.io/, https://tor.dev-null.io/, , , http://tor.dev-null.io/dist/, https://tor.dev-null.io/dist/, , , -Tor Fan, Quintex Alliance Consulting, US, United States, US,TRUE,FALSE, NO, http://tor.mirror.quintex.com, , rsync://tor.mirror.quintex.com::tor, ftp://mirror.quintex.com/tor/, http://tor.mirror.quintex.com/dist, , rsync://mirror.quintex.com::tordist, , Sat Feb 1 14:21:23 2014 +Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, http://mirror.nametoday.me/tor/, , , , http://mirror.nametoday.me/tor/dist/, , , , Tue Feb 11 08:42:17 2014 +Tor Fan, Tor Supporter, US, United States, US, TRUE, TRUE, No, http://tor.loritsu.com/, , , , http://tor.loritsu.com/dist/, , , , +info AT zentrum-der-gesundheit DOT de, Zentrum der Gesundheit, DK, Denmark, Europe, TRUE, FALSE, No, http://tor.idnr.ws/, , , , http://tor.idnr.ws/dist/, , , , Mon Feb 10 19:10:13 2014 +http://www.multinet.no, MultiNet AS, NO, Trondheim, Trondheim, TRUE, TRUE, No, http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Tue Feb 11 08:42:17 2014 +Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, http://tor.mirrors.whitedholdings.org/, https://tor.mirrors.whitedholdings.org/, rsync://mirrors.whitedholdings.org/tor, , http://tor.mirrors.whitedholdings.org/dist/, https://tor.mirrors.whitedholdings.org/dist/, rsync://tor.mirrors.whitedholdings.org/tor-dist, , +haskell at gmx.es, Tor Supporter, ES, Spain, Europe, TRUE, FALSE, No, http://tor.zilog.es/, , , , http://tor.zilog.es/dist/, , , , Mon Feb 10 01:15:45 2014 +webmaster AT bbln DOT nl, BBLN, NL, The Netherlands, Europe, TRUE, TRUE, No, http://mirror.ml/tor/, https://mirror.ml/tor/, , , http://mirror.ml/tor/dist/, https://mirror.ml/tor/dist/, , , Tue Feb 11 08:42:17 2014 +Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Tue Feb 11 08:42:17 2014 +margus.random at mail.ee, CyberSIDE, EE, Estonia, EE, TRUE, FALSE, No, http://cyberside.planet.ee/tor/, , , , http://cyberside.net.ee/tor/, , , , Mon Feb 10 20:05:07 2014 +Tor Fan, torproject.is, IS, Iceland, IS, TRUE, FALSE, No, http://torproject.is/, , , , http://torproject.is/dist/, , , , Thu Feb 6 17:28:24 2014 +Tor Fan, spline, DE, Germany, DE, TRUE, FALSE, No, http://tor.spline.de/, https://tor.spline.inf.fu-berlin.de/, rsync://ftp.spline.de/tor, ftp://ftp.spline.de/pub/tor, http://tor.spline.de/dist/, https://tor.spline.inf.fu-berlin.de/dist/, rsync://ftp.spline.de/tor/dist, , Tue Feb 11 08:42:17 2014 +Tor Fan, me0w.cc, RO, Romania, RO, TRUE, FALSE, No, http://tor.me0w.cc/, , , , http://tor.me0w.cc/dist/, , , , Tue Feb 11 08:42:17 2014 +Tor Fan, borgmann.tv, DE, Germany, DE, TRUE, FALSE, No, http://tor.borgmann.tv/, , , , http://tor.borgmann.tv/dist/, , , , Tue Feb 11 08:42:17 2014 +security AT hostoffice DOT hu, Unknown, HU, Hungary, Europe, TRUE, FALSE, No, http://mirror.tor.hu/, , , , http://mirror.tor.hu/dist/, , , , Tue Feb 11 08:42:17 2014 +Tor Fan, Tor Supporter, TN, Tunisia, TN, TRUE, FALSE, No, http://torproject.antagonism.org/, https://torproject.antagonism.org/, , , , , , , Tue Feb 11 08:42:17 2014 +webmaster AT ccc DOT de, CCC, NL, The Netherlands, Europe, TRUE, FALSE, No, http://tor.ccc.de/, , , , http://tor.ccc.de/dist/, , , , Tue Feb 11 08:42:17 2014 +Tor Fan, searchprivate, US, TX, US, TRUE, FALSE, No, http://tor.searchprivate.com/, , , , http://tor.searchprivate.com/dist/, , , , Sun Jul 29 23:49:26 2012 +Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, TRUE, No, http://tor.dont-know-me.at/, , , , http://tor.dont-know-me.at/dist/, , , , Tue Feb 11 08:42:17 2014 +Tor Fan, Tor Supporter, LU, Luxemborg, LU, TRUE, FALSE, No, http://torproject.adamas.ai/, , , , http://torproject.adamas.ai/dist/, , , , +mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe, TRUE, FALSE, No, http://mirror.ntzk.de/torproject.org/, , , , http://mirror.ntzk.de/torproject.org/dist/, , , , Tue Feb 11 08:42:17 2014 +coralcdn.org, CoralCDN, INT, International, INT, TRUE, FALSE, Yes, http://www.torproject.org.nyud.net/, , , , http://www.torproject.org.nyud.net/dist/, , , , Tue Feb 11 15:54:03 2014 +Tor Fan, Tor Supporter, US, United States, US, TRUE, TRUE, No, http://mirror.nametoday.me/tor/, , , , http://mirror.nametoday.me/tor/dist/, , , , Tue Feb 11 08:42:17 2014 +Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, FALSE, No, http://torproject.ph3x.at/, , , , http://torproject.ph3x.at/dist/, , , , Tue Feb 11 08:42:17 2014 +info /AT enn /DOT lu, Frenn vun der Enn A.S.B.L., IS, Iceland, Europe, TRUE, FALSE, No, http://torproject.lu/, , , , http://torproject.lu/dist/, , , http://btn6gqzqevlhoryd.onion, Mon Jan 20 19:14:22 2014 +neutrino8 AT gmail DOT com, teambelgium, BE, Belgium, Europe, TRUE, FALSE, No, http://tor.teambelgium.net:8080/, , , ftp://tor.teambelgium.net:2121/torproject/, http://tor.teambelgium.net:8080/dist/, , , , Tue Feb 11 08:42:17 2014 +tormaster AT xpdm DOT us, Xpdm, US, United States, North America, TRUE, FALSE, No, http://torproj.xpdm.us/, https://torproj.xpdm.us/, , , http://torproj.xpdm.us/dist/, https://torproj.xpdm.us/dist/, , http://h3prhz46uktgm4tt.onion/, Tue Feb 11 08:42:17 2014 +Tor Fan, Tor Supporter, UA, Ukraine, UA, TRUE, FALSE, No, http://torua.reactor-xg.kiev.ua/, , , , http://torua.reactor-xg.kiev.ua/dist/, , , , + mail AT benjamin-meier DOT info, beme it, DE, Germany, DE, TRUE, FALSE, No, http://tor.beme-it.de/, https://tor.beme-it.de/, rsync://tor.beme-it.de/tor, , http://tor.beme-it.de/dist/, https://tor.beme-it.de/dist/, rsync://tor.beme-it.de/tor/dist, , Tue Feb 11 15:54:03 2014 +wollomatic at posteo.eu, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, No, http://tormirror.almnet.de/, https://tormirror.almnet.de/, , , http://tormirror.almnet.de/dist/, https://tormirror.almnet.de/dist/, , , Tue Feb 11 08:42:17 2014 +Tor Fan, Tor Supporter, LT, Lithuania, LT, TRUE, FALSE, No, http://tor.vesta.nu/, , , , http://tor.vesta.nu/dist/, , , , Tue Feb 11 03:09:37 2014 +Tor Fan, Tor Supporter, MX, Mexico, MX, TRUE, FALSE, No, http://fbnaia.homelinux.net/torproject/, https://fbnaia.homelinux.net/torproject/, , , http://fbnaia.homelinux.net/torproject/dist/, https://fbnaia.homelinux.net/torproject/dist/, , , Sat Jan 25 21:32:38 2014 +Tor Fan, Tor Supporter, FR, France, FR, TRUE, FALSE, No, http://37.187.0.127/tormirror/, , , , http://37.187.0.127/tormirror/dist/, , , , +Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, http://tor.minibofh.org/, , , , http://tor.minibofh.org/dist/, , , , +Tor Fan, Tor Supporter, UK, United Kingdom, UK, TRUE, FALSE, No, http://tor.mage.me.uk/, , , , http://tor.mage.me.uk/dist/, , , , +webmaster AT askapache DOT com, AskApache, US, California, US, TRUE, FALSE, No, http://tor.askapache.com/, , , , http://tor.askapache.com/dist/, , , , Tue Feb 11 03:09:37 2014 +nsane2307 eml cc, tor-mirror.de, DE, Germany, Europe, TRUE, FALSE, No, http://tor-mirror.de/, https://tor-mirror.de/, , , http://tor-mirror.de/dist/, https://tor-mirror.de/dist/, , , +Tor Fan, hessmo, US, United States, US, TRUE, FALSE, No, http://mirror.hessmo.com/tor/, , , , http://mirror.hessmo.com/tor/dist/, , , , Tue Feb 11 08:42:17 2014 +Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, FALSE, No, http://tor.dev-random.de/, https://tor.dev-random.de/, , , http://tor.dev-random.de/dist/, https://tor.dev-random.de/dist/, , , Tue Feb 11 08:42:17 2014 +Tor Fan, India Tor Fans, IN, India, IN, TRUE, FALSE, No, http://www.torproject.org.in/, , , , http://www.torproject.org.in/dist/, , , , Tue Feb 11 03:09:37 2014 +mirror-admin(a)linsrv.net, linsrv, FR, France, Europe, TRUE, FALSE, No, http://mirrors.linsrv.net/torproject/, , mirrors.linsrv.net::pub/torproject, ftp://ftp.linsrv.net/pub/torproject/, http://mirrors.linsrv.net/torproject/dist/, , mirrors.linsrv.net::pub/torproject/dist, , Tue Feb 11 08:42:17 2014 +Tor Fan, Tor Supporter, FR, France, FR, TRUE, FALSE, No, http://tor.mirror.chekanov.net/, , , , http://tor.mirror.chekanov.net/dist/, , , , Tue Feb 11 08:42:17 2014 +http://sebastian.pfeifer.or.at/, TechAsk.IT, AT, Favoriten, Wien, TRUE, TRUE, No, http://www.unicorncloud.org/public/torproject.org/, https://www.unicorncloud.org/public/torproject.org/, , , http://www.unicorncloud.org/public/torproject.org/dist, https://www.unicorncloud.org/public/torproject.org/dist, , , Tue Feb 11 08:42:17 2014 +BarkerJr AT barkerjr DOT net, BarkerJr, FR, France, FR, TRUE, FALSE, No, http://www.oignon.net/, https://www.oignon.net/, , , http://www.oignon.net/dist/, https://www.oignon.net/dist/, , , Tue Feb 11 08:42:17 2014 +root AT amorphis DOT eu, Amorphis, NL, The Netherlands, Europe, TRUE, FALSE, No, http://tor.amorphis.eu/, , , , http://tor.amorphis.eu/dist/, , , , Thu Feb 6 17:28:24 2014 +hackthissite.org, HackThisSite.org, US, United States, US, TRUE, TRUE, No, http://tor.hackthissite.org/, https://tor.hackthissite.org/, , , http://mirror.hackthissite.org/tor, https://mirror.hackthissite.org/tor, , , Tue Feb 11 08:42:17 2014 +citizen428 AT gmail DOT com, [[:bbs:]], DE, Germany, Europe, TRUE, FALSE, No, http://tor.blingblingsquad.net/, https://tor.blingblingsquad.net/, , , http://tor.blingblingsquad.net/dist/, https://tor.blingblingsquad.net/dist/, , , +Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, FALSE, No, http://tor.linuxlounge.net/, https://tor.linuxlounge.net/, , , http://tor.linuxlounge.net/dist/, https://tor.linuxlounge.net/dist/, , , Tue Feb 11 08:42:17 2014 +Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, , , , , http://www.netgull.com/torproject/, , , , +paul at coffswifi.net, CoffsWiFi, AU, Australia and New Zealand, APNIC, TRUE, FALSE, No, http://torproject.coffswifi.net, , , , http://torproject.coffswifi.net/dist, , , , Tue Feb 11 08:42:17 2014 +Tor Fan, cyberarmy, AT, Austria, AT, TRUE, FALSE, No, http://tor.cyberarmy.at/, , , , , , , , Tue Feb 11 08:42:17 2014 +Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, FALSE, No, http://torproject.cryptowars.info/, https://torproject.cryptowars.info/, rsync://torproject.cryptowars.info/, , http://torproject.cryptowars.info/dist/, https://torproject.cryptowars.info/dist/, , , Tue Feb 11 08:42:17 2014 +hostmaster AT zombiewerks DOT com, TheOnionRouter, IS, Iceland, Iceland, TRUE, FALSE, No, http://theonionrouter.com/, , , , http://theonionrouter.com/dist/, , , , Tue Feb 11 08:42:17 2014 +Tor Fan, crazyhaze.de, DE, Germany, DE, TRUE, FALSE, No, http://tor.crazyhaze.de/, https://tor.crazyhaze.de/, , , http://tor.crazyhaze.de/dist/, https://tor.crazyhaze.de/dist/, , , Tue Feb 11 08:42:17 2014 +Tor Fan, chaos darmstadt, DE, Germany, Europe, TRUE, FALSE, No, http://mirrors.chaos-darmstadt.de/tor-mirror/, , , , http://mirrors.chaos-darmstadt.de/tor-mirror/dist/, , , , Tue Feb 11 08:42:17 2014 +Tor Fan, Soviet Anonymous, RU, Russia, RU, TRUE, FALSE, No, http://creep.im/tor, https://creep.im/tor, rsync://creep.im/tor, ftp://creep.im/mirrors/tor, http://creep.im/tor/dist/, https://creep.im/tor/dist/, rsync://creep.im/tor-dist, , Tue Feb 11 08:42:17 2014 +Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, , , , ftp://mirrors.go-parts.com/tor/, http://mirrors.go-parts.com/tor/dist/, , rsync://mirrors.go-parts.com/mirrors/tor/, , Wed Jan 8 16:41:17 2014 +Tor Fan, NW Linux, US, WA, US, TRUE, FALSE, No, http://torproject.nwlinux.us/, , rsync://nwlinux.us/tor-web, , http://torproject.nwlinux.us/dist/, , rsync://nwlinux.us/tor-dist, , +Tor Fan, torservers, DE, Germany, DE, TRUE, FALSE, No, http://www.torservers.net/mirrors/torproject.org/, https://www.torservers.net/mirrors/torproject.org/, , , http://www.torservers.net/mirrors/torproject.org/dist/, https://www.torservers.net/mirrors/torproject.org/dist/, , http://hbpvnydyyjbmhx6b.onion/mirrors/torproject.org/, Tue Feb 11 08:42:17 2014 +Tor Fan, Tor Supporter, NL, The Netherlands, NL, TRUE, FALSE, No, , , , , , https://www.coevoet.nl/tor/dist/, , , +Tor Fan, torland, GB, United Kingdom, GB, TRUE, FALSE, No, http://mirror.torland.me/torproject.org/, https://mirror.torland.me/torproject.org/, , , http://mirror.torland.me/torproject.org/dist/, https://mirror.torland.me/torproject.org/dist/, , , Tue Feb 11 08:42:17 2014 +Tor Fan, Tor Supporter, FR, France, FR, TRUE, FALSE, No, http://torproject.c3l.lu/, , , , http://torproject.c3l.lu/dist/, , , , Wed Dec 25 05:35:51 2013 +Tor Fan, Lightning-bolt.net, CZ, Czech Republic, CZ, TRUE, FALSE, No, http://torproject.lightning-bolt.net/, , , , http://torproject.lightning-bolt.net/dist/, , , , Tue Feb 11 08:42:17 2014 +Tor Fan, LazyTiger, FR, France, FR, TRUE, FALSE, No, http://tor.taiga-san.net/, , , , http://tor.taiga-san.net/dist/, , , , +Tor Fan, Tor Supporter, EE, Estonia, EE, TRUE, FALSE, No, http://tor.li/, https://tor.li/, , , http://tor.li/dist/, https://tor.li/dist/, , , +Tor Fan, homosu, SE, Sweden, SE, TRUE, FALSE, No, http://tor.homosu.net/, , , , http://tor.homosu.net/dist/, , , , Mon Feb 10 20:05:07 2014 +IceBear, myRL.net, IS, Iceland, IS, TRUE, FALSE, No, http://tor.myrl.net/, https://tor.myrl.net/, , , http://tor.myrl.net/dist/, https://tor.myrl.net/dist/, , , Tue Feb 11 08:42:17 2014 +barkerjr(a)gmail.com, BarkerJr, LU, Luxemborg, LU, TRUE, TRUE, No, http://www.tor.lu, https://www.tor.lu, , , http://www.tor.lu/dist/, https://www.tor.lu/dist/, , , Tue Feb 11 08:42:17 2014 +Tor Fan, DevRandom, NL, The Netherlands, NL, TRUE, FALSE, No, http://devrandom.co/tor-mirror, https://devrandom.co/tor-mirror, , , http://devrandom.co/tor-mirror/dist, https://devrandom.co/tor-mirror/dist, , , Sun Feb 2 05:50:15 2014 +kiro AT userzap DOT de, Userzap, DE, Germany, DE, TRUE, FALSE, No, http://torprojekt.userzap.de, https://torprojekt.userzap.de, , , http://torprojekt.userzap.de/dist/, https://torprojekt.userzap.de/dist/, , , Tue Feb 11 08:42:17 2014 +postmaster(a)otivpn.com, otivpn.com, US, United States, US, TRUE, FALSE, Yes, http://otivpn.com/tor/, https://otivpn.com/tor/, , , http://otivpn.com/tor/dist, https://otivpn.com/tor/dist, , https://l4aujgukgr2osawn.onion/, Tue Feb 11 08:42:17 2014 +tor(a)eprci.net, EPRCI, US, United States, US, TRUE, FALSE, NO, http://tor.eprci.net/, https://www.eprci.com/tor/, , , http://tor.eprci.net/dist/, https://www.eprci.com/tor/dist/, , , Tue Feb 11 08:42:17 2014 +tor(a)les.net, tor(a)les.net, CA, Canada, CA, TRUE, FALSE, NO, http://tor.les.net/, , , , http://tor.les.net/dist, , , , Tue Feb 11 08:42:17 2014 +Tor Fan, PW, DE, Germany, DE, TRUE, TRUE, NO, http://tor.pw.is/, , , , http://tor.pw.is/dist/, , , , Tue Feb 11 08:42:17 2014 +tor(a)stalkr.net, stalkr.net, FR, France, FR, TRUE, TRUE, NO, http://tor.stalkr.net/, https://tor.stalkr.net/, , , http://tor.stalkr.net/dist/, https://tor.stalkr.net/dist/, , , Tue Feb 11 08:42:17 2014 +maki(a)maki-chan.de, Maki Hoshisawa, DE, Germany, DE, TRUE, FALSE, NO, http://tor.mirrors.maki-chan.de/, , , , http://tor.mirrors.maki-chan.de/dist/, , , , Tue Feb 11 08:42:17 2014 +doemela[AT]cyberguerrilla[DOT]org, cYbergueRrilLa AnonyMous NeXus, DE, Germany, DE, TRUE, FALSE, NO, https://tor-mirror.cyberguerrilla.org, , , , https://tor-mirror.cyberguerrilla.org/dist/, , , http://6dvj6v5imhny3anf.onion, Tue Feb 11 08:42:17 2014 +contact(a)gtor.org, Gtor, DE, Germany, DE, TRUE, TRUE, NO, http://torproject.gtor.org/, https://torproject.gtor.org/, rsync://torproject.gtor.org/website-mirror/, , http://torproject.gtor.org/dist/, https://torproject.gtor.org/dist/, rsync://torproject.gtor.org/website-mirror/dist/, , Tue Feb 11 08:42:17 2014 +mirrors(a)dev-null.io, dev-null.io, NL, The Netherlands, NL, TRUE, FALSE, NO, http://tor.dev-null.io/, https://tor.dev-null.io/, , , http://tor.dev-null.io/dist/, https://tor.dev-null.io/dist/, , , +Tor Fan, Quintex Alliance Consulting, US, United States, US, TRUE, FALSE, NO, http://tor.mirror.quintex.com, , rsync://tor.mirror.quintex.com::tor, ftp://mirror.quintex.com/tor/, http://tor.mirror.quintex.com/dist, , rsync://mirror.quintex.com::tordist, , Sat Feb 1 14:21:23 2014

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 11 Feb '14

11 Feb '14

commit 65753aa94345342ba26be775b5206dbfe40decbf Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 11 18:15:46 2014 +0000 Update translations for tails-iuk --- gl.po | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/gl.po b/gl.po index 1b85815..2958c9d 100644 --- a/gl.po +++ b/gl.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# bulebule <luz.armas(a)udc.es>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-01-07 20:17+0100\n" -"PO-Revision-Date: 2014-01-08 08:17+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-01-29 14:37+0100\n" +"PO-Revision-Date: 2014-02-11 18:10+0000\n" +"Last-Translator: bulebule <luz.armas(a)udc.es>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/torproject/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +33,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:205 msgid "Error while checking for upgrades" -msgstr "" +msgstr "Produciuse un erro ao buscar actualizacións" #: ../lib/Tails/IUK/Frontend.pm:208 msgid "" @@ -73,7 +74,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:305 msgid "Error while detecting available upgrades" -msgstr "" +msgstr "Produciuse un erro ao detectar actualizacións" #: ../lib/Tails/IUK/Frontend.pm:315 #, perl-brace-format @@ -93,15 +94,15 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:330 msgid "Upgrade available" -msgstr "" +msgstr "Actualización dispoñíbel" #: ../lib/Tails/IUK/Frontend.pm:331 msgid "Upgrade now" -msgstr "" +msgstr "Actualizar agora" #: ../lib/Tails/IUK/Frontend.pm:332 msgid "Upgrade later" -msgstr "" +msgstr "Actualizar máis tarde" #: ../lib/Tails/IUK/Frontend.pm:342 #, perl-brace-format @@ -117,16 +118,16 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:356 msgid "New version available" -msgstr "" +msgstr "Está dispoñíbel unha nova versión" #: ../lib/Tails/IUK/Frontend.pm:412 msgid "Downloading upgrade" -msgstr "" +msgstr "Descargando actualización" #: ../lib/Tails/IUK/Frontend.pm:415 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." -msgstr "" +msgstr "A descargar a actualización en %{name}s %{version}s..." #: ../lib/Tails/IUK/Frontend.pm:456 msgid "" @@ -148,7 +149,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:480 ../lib/Tails/IUK/Frontend.pm:494 msgid "Error while downloading the upgrade" -msgstr "" +msgstr "Produciuse un erro ao descargar a actualización" #: ../lib/Tails/IUK/Frontend.pm:487 #, perl-brace-format @@ -159,11 +160,11 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:506 msgid "Error while creating temporary downloading directory" -msgstr "" +msgstr "Produciuse un erro ao crear o directorio de descargas temporal" #: ../lib/Tails/IUK/Frontend.pm:509 msgid "Failed to create temporary download directory" -msgstr "" +msgstr "Non se puido crear un directorio de descargas temporal" #: ../lib/Tails/IUK/Frontend.pm:521 msgid "" @@ -181,19 +182,19 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:527 msgid "Restart now" -msgstr "" +msgstr "Reiniciar agora" #: ../lib/Tails/IUK/Frontend.pm:528 msgid "Restart later" -msgstr "" +msgstr "Reiniciar máis tarde" #: ../lib/Tails/IUK/Frontend.pm:539 msgid "Error while restarting the system" -msgstr "" +msgstr "Produciuse un erro ao reiniciar o sistema" #: ../lib/Tails/IUK/Frontend.pm:542 msgid "Failed to restart the system" -msgstr "" +msgstr "Non se puido reiniciar o sistema" #: ../lib/Tails/IUK/Frontend.pm:557 msgid "Error while shutting down the network" @@ -205,7 +206,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:570 msgid "Upgrading the system" -msgstr "" +msgstr "A actualizar o sistema" #: ../lib/Tails/IUK/Frontend.pm:572 msgid "" @@ -224,4 +225,4 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:629 msgid "Error while installing the upgrade" -msgstr "" +msgstr "Produciuse un erro ao instalar a actualización"

1 0

[tor/master] Excise the insertion_time_elem_t logic
by nickm＠torproject.org 11 Feb '14

11 Feb '14

commit 3133cde3c12a814fab4c83ba59d5dfeace397ebc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 13:55:27 2014 -0500 Excise the insertion_time_elem_t logic It's now redundant with the inserted_time field in packed_cell_t Fixes bug 10870. --- changes/bug10870 | 6 ++++ src/or/or.h | 19 ------------- src/or/relay.c | 83 +++++------------------------------------------------- 3 files changed, 13 insertions(+), 95 deletions(-) diff --git a/changes/bug10870 b/changes/bug10870 new file mode 100644 index 0000000..d8a00f4 --- /dev/null +++ b/changes/bug10870 @@ -0,0 +1,6 @@ + o Code simplification and refactoring: + - Remove data structures which were introduced to implement the + CellStatistics option: they are now redundant with the addition + of timestamp to the regular packed_cell_t data structure, which + we did in 0.2.4.18-rc in order to resolve #9093. Fixes bug + 10870. \ No newline at end of file diff --git a/src/or/or.h b/src/or/or.h index 5318b0f..3eaf344 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1081,31 +1081,12 @@ typedef struct packed_cell_t { * bits truncated) when this cell was inserted. */ } packed_cell_t; -/* XXXX This next structure may be obsoleted by inserted_time in - * packed_cell_t */ - -/** Number of cells added to a circuit queue including their insertion - * time on 10 millisecond detail; used for buffer statistics. */ -typedef struct insertion_time_elem_t { - struct insertion_time_elem_t *next; /**< Next element in queue. */ - uint32_t insertion_time; /**< When were cells inserted (in 10 ms steps - * starting at 0:00 of the current day)? */ - unsigned counter; /**< How many cells were inserted? */ -} insertion_time_elem_t; - -/** Queue of insertion times. */ -typedef struct insertion_time_queue_t { - struct insertion_time_elem_t *first; /**< First element in queue. */ - struct insertion_time_elem_t *last; /**< Last element in queue. */ -} insertion_time_queue_t; - /** A queue of cells on a circuit, waiting to be added to the * or_connection_t's outbuf. */ typedef struct cell_queue_t { packed_cell_t *head; /**< The first cell, or NULL if the queue is empty. */ packed_cell_t *tail; /**< The last cell, or NULL if the queue is empty. */ int n; /**< The number of cells in the queue. */ - insertion_time_queue_t *insertion_times; /**< Insertion times of cells. */ } cell_queue_t; /** Beginning of a RELAY cell payload. */ diff --git a/src/or/relay.c b/src/or/relay.c index 63119cb..6e5b12e 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2040,10 +2040,6 @@ static size_t total_cells_allocated = 0; /** A memory pool to allocate packed_cell_t objects. */ static mp_pool_t *cell_pool = NULL; -/** Memory pool to allocate insertion_time_elem_t objects used for cell - * statistics. */ -static mp_pool_t *it_pool = NULL; - /** Allocate structures to hold cells. */ void init_cell_pool(void) @@ -2062,10 +2058,6 @@ free_cell_pool(void) mp_pool_destroy(cell_pool); cell_pool = NULL; } - if (it_pool) { - mp_pool_destroy(it_pool); - it_pool = NULL; - } } /** Free excess storage in cell pool. */ @@ -2154,36 +2146,6 @@ cell_queue_append_packed_copy(cell_queue_t *queue, const cell_t *cell, tor_gettimeofday_cached(&now); copy->inserted_time = (uint32_t)tv_to_msec(&now); - /* Remember the time when this cell was put in the queue. */ - /*XXXX This may be obsoleted by inserted_time */ - if (get_options()->CellStatistics) { - uint32_t added; - insertion_time_queue_t *it_queue = queue->insertion_times; - if (!it_pool) - it_pool = mp_pool_new(sizeof(insertion_time_elem_t), 1024); - -#define SECONDS_IN_A_DAY 86400L - added = (uint32_t)(((now.tv_sec % SECONDS_IN_A_DAY) * 100L) - + ((uint32_t)now.tv_usec / (uint32_t)10000L)); - if (!it_queue) { - it_queue = tor_malloc_zero(sizeof(insertion_time_queue_t)); - queue->insertion_times = it_queue; - } - if (it_queue->last && it_queue->last->insertion_time == added) { - it_queue->last->counter++; - } else { - insertion_time_elem_t *elem = mp_pool_get(it_pool); - elem->next = NULL; - elem->insertion_time = added; - elem->counter = 1; - if (it_queue->last) { - it_queue->last->next = elem; - it_queue->last = elem; - } else { - it_queue->first = it_queue->last = elem; - } - } - } cell_queue_append(queue, copy); } @@ -2200,14 +2162,6 @@ cell_queue_clear(cell_queue_t *queue) } queue->head = queue->tail = NULL; queue->n = 0; - if (queue->insertion_times) { - while (queue->insertion_times->first) { - insertion_time_elem_t *elem = queue->insertion_times->first; - queue->insertion_times->first = elem->next; - mp_pool_release(elem); - } - tor_free(queue->insertion_times); - } } /** Extract and return the cell at the head of <b>queue</b>; return NULL if @@ -2232,9 +2186,7 @@ cell_queue_pop(cell_queue_t *queue) size_t packed_cell_mem_cost(void) { - return sizeof(packed_cell_t) + MP_POOL_ITEM_OVERHEAD + - get_options()->CellStatistics ? - (sizeof(insertion_time_elem_t)+MP_POOL_ITEM_OVERHEAD) : 0; + return sizeof(packed_cell_t) + MP_POOL_ITEM_OVERHEAD; } /** Check whether we've got too much space used for cells. If so, @@ -2413,35 +2365,14 @@ channel_flush_from_first_active_circuit(channel_t *chan, int max) /* Calculate the exact time that this cell has spent in the queue. */ if (get_options()->CellStatistics && !CIRCUIT_IS_ORIGIN(circ)) { + uint32_t msec_waiting; struct timeval tvnow; - uint32_t flushed; - uint32_t cell_waiting_time; - insertion_time_queue_t *it_queue = queue->insertion_times; + or_circ = TO_OR_CIRCUIT(circ); tor_gettimeofday_cached(&tvnow); - flushed = (uint32_t)((tvnow.tv_sec % SECONDS_IN_A_DAY) * 100L + - (uint32_t)tvnow.tv_usec / (uint32_t)10000L); - if (!it_queue || !it_queue->first) { - log_info(LD_GENERAL, "Cannot determine insertion time of cell. " - "Looks like the CellStatistics option was " - "recently enabled."); - } else { - insertion_time_elem_t *elem = it_queue->first; - or_circ = TO_OR_CIRCUIT(circ); - cell_waiting_time = - (uint32_t)((flushed * 10L + SECONDS_IN_A_DAY * 1000L - - elem->insertion_time * 10L) % - (SECONDS_IN_A_DAY * 1000L)); -#undef SECONDS_IN_A_DAY - elem->counter--; - if (elem->counter < 1) { - it_queue->first = elem->next; - if (elem == it_queue->last) - it_queue->last = NULL; - mp_pool_release(elem); - } - or_circ->total_cell_waiting_time += cell_waiting_time; - or_circ->processed_cells++; - } + msec_waiting = ((uint32_t)tv_to_msec(&tvnow)) - cell->inserted_time; + + or_circ->total_cell_waiting_time += msec_waiting; + or_circ->processed_cells++; } /* If we just flushed our queue and this circuit is used for a

1 0

[tor/master] Merge remote-tracking branch 'public/no_itime_queue_025'
by nickm＠torproject.org 11 Feb '14

11 Feb '14

commit 10d4d3e2d58f94418ca9554aee251232bbaaab99 Merge: 5e0cdc5 5b55e0e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 11:52:35 2014 -0500 Merge remote-tracking branch 'public/no_itime_queue_025' changes/bug10870 | 6 ++ src/or/or.h | 36 ---------- src/or/relay.c | 205 ++++++++++-------------------------------------------- 3 files changed, 43 insertions(+), 204 deletions(-)

1 0