January 2015 - tor-commits - lists.torproject.org

[tor/master] Correctly reject packages lines with empty entries
by nickm＠torproject.org 30 Jan '15

30 Jan '15

commit bd630a899a1ff7658a0c52327fa3cce59e7213b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 29 14:04:57 2015 -0500 Correctly reject packages lines with empty entries --- src/or/dirserv.c | 42 +++++++++++++++++++++++++++++------------- src/test/test_dir.c | 7 +++++++ 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 3785d9a..5c59fc7 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3300,22 +3300,38 @@ validate_recommended_package_line(const char *line) WORD(); /* Skip URL */ ++cp; - /* Skip digestname=digestval + */ - int foundeq = 0; - while (*cp) { - if (*cp == ' ') { - if (!foundeq) - return 0; - foundeq = 0; - } else if (*cp == '=') { - if (++foundeq > 1) - return 0; - } - ++cp; + /* Skip digesttype=digestval + */ + int n_entries = 0; + while (1) { + const char *start_of_word = cp; + const char *end_of_word = strchr(cp, ' '); + if (! end_of_word) + end_of_word = cp + strlen(cp); + + if (start_of_word == end_of_word) + return 0; + + const char *eq = memchr(start_of_word, '=', end_of_word - start_of_word); + + if (!eq) + return 0; + if (eq == start_of_word) + return 0; + if (eq == end_of_word - 1) + return 0; + if (memchr(eq+1, '=', end_of_word - (eq+1))) + return 0; + + ++n_entries; + if (0 == *end_of_word) + break; + + cp = end_of_word + 1; } - if (!foundeq) + if (n_entries == 0) return 0; + return 1; } diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 7d3d414..efc3ec7 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2961,6 +2961,13 @@ test_dir_packages(void *arg) BAD("tor "); BAD("tor"); BAD(""); + BAD("=foobar sha256=" + "3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7"); + BAD("= = sha256=" + "3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7"); + + BAD("sha512= sha256=" + "3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7"); votes = smartlist_new(); smartlist_add(votes, tor_malloc_zero(sizeof(networkstatus_t)));

1 0

[tor/master] Merge remote-tracking branch 'public/prop227_v2'
by nickm＠torproject.org 30 Jan '15

30 Jan '15

commit fac8d40886a03d442ed9f8c18df5ed017b1e6dd0 Merge: d1e52d9 b4a8fd8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 30 07:36:55 2015 -0500 Merge remote-tracking branch 'public/prop227_v2' Conflicts: src/test/test_dir.c changes/prop227 | 5 ++ doc/tor.1.txt | 6 ++ src/common/container.c | 25 ++++++-- src/common/container.h | 8 ++- src/or/config.c | 9 +++ src/or/control.c | 2 + src/or/dirserv.c | 86 ++++++++++++++++++++++++++++ src/or/dirserv.h | 2 + src/or/dirvote.c | 100 +++++++++++++++++++++++++++++++- src/or/dirvote.h | 6 +- src/or/networkstatus.c | 31 ++++++++++ src/or/or.h | 4 ++ src/or/routerparse.c | 12 ++++ src/test/test_dir.c | 147 ++++++++++++++++++++++++++++++++++++++++++++++++ 14 files changed, 435 insertions(+), 8 deletions(-) diff --cc src/test/test_dir.c index 991e613,efc3ec7..84e80ea --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@@ -2931,29 -2930,151 +2931,175 @@@ test_dir_http_handling(void *args } static void +test_dir_purpose_needs_anonymity(void *arg) +{ + (void)arg; + tt_int_op(1, ==, purpose_needs_anonymity(0, ROUTER_PURPOSE_BRIDGE)); + tt_int_op(1, ==, purpose_needs_anonymity(0, ROUTER_PURPOSE_GENERAL)); + tt_int_op(0, ==, purpose_needs_anonymity(DIR_PURPOSE_FETCH_MICRODESC, + ROUTER_PURPOSE_GENERAL)); + done: ; +} + +static void +test_dir_fetch_type(void *arg) +{ + (void)arg; + tt_assert(dir_fetch_type(DIR_PURPOSE_FETCH_MICRODESC, ROUTER_PURPOSE_GENERAL, + NULL) == MICRODESC_DIRINFO); + tt_assert(dir_fetch_type(DIR_PURPOSE_FETCH_SERVERDESC, ROUTER_PURPOSE_BRIDGE, + NULL) == BRIDGE_DIRINFO); + tt_assert(dir_fetch_type(DIR_PURPOSE_FETCH_CONSENSUS, ROUTER_PURPOSE_GENERAL, + "microdesc") == (V3_DIRINFO | MICRODESC_DIRINFO)); + done: ; +} + ++static void + test_dir_packages(void *arg) + { + smartlist_t *votes = smartlist_new(); + char *res = NULL; + (void)arg; + + #define BAD(s) \ + tt_int_op(0, ==, validate_recommended_package_line(s)); + #define GOOD(s) \ + tt_int_op(1, ==, validate_recommended_package_line(s)); + GOOD("tor 0.2.6.3-alpha " + "http://torproject.example.com/dist/tor-0.2.6.3-alpha.tar.gz " + "sha256=sssdlkfjdsklfjdskfljasdklfj"); + GOOD("tor 0.2.6.3-alpha " + "http://torproject.example.com/dist/tor-0.2.6.3-alpha.tar.gz " + "sha256=sssdlkfjdsklfjdskfljasdklfj blake2b=fred"); + BAD("tor 0.2.6.3-alpha " + "http://torproject.example.com/dist/tor-0.2.6.3-alpha.tar.gz " + "sha256=sssdlkfjdsklfjdskfljasdklfj="); + BAD("tor 0.2.6.3-alpha " + "http://torproject.example.com/dist/tor-0.2.6.3-alpha.tar.gz " + "sha256=sssdlkfjdsklfjdskfljasdklfj blake2b"); + BAD("tor 0.2.6.3-alpha " + "http://torproject.example.com/dist/tor-0.2.6.3-alpha.tar.gz "); + BAD("tor 0.2.6.3-alpha " + "http://torproject.example.com/dist/tor-0.2.6.3-alpha.tar.gz"); + BAD("tor 0.2.6.3-alpha "); + BAD("tor 0.2.6.3-alpha"); + BAD("tor "); + BAD("tor"); + BAD(""); + BAD("=foobar sha256=" + "3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7"); + BAD("= = sha256=" + "3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7"); + + BAD("sha512= sha256=" + "3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7"); + + votes = smartlist_new(); + smartlist_add(votes, tor_malloc_zero(sizeof(networkstatus_t))); + smartlist_add(votes, tor_malloc_zero(sizeof(networkstatus_t))); + smartlist_add(votes, tor_malloc_zero(sizeof(networkstatus_t))); + smartlist_add(votes, tor_malloc_zero(sizeof(networkstatus_t))); + smartlist_add(votes, tor_malloc_zero(sizeof(networkstatus_t))); + smartlist_add(votes, tor_malloc_zero(sizeof(networkstatus_t))); + SMARTLIST_FOREACH(votes, networkstatus_t *, ns, + ns->package_lines = smartlist_new()); + + #define ADD(i, s) \ + smartlist_add(((networkstatus_t*)smartlist_get(votes, (i)))->package_lines, \ + (void*)(s)); + + /* Only one vote for this one. */ + ADD(4, "cisco 99z http://foobar.example.com/ sha256=blahblah"); + + /* Only two matching entries for this one, but 3 voters */ + ADD(1, "mystic 99y http://barfoo.example.com/ sha256=blahblah"); + ADD(3, "mystic 99y http://foobar.example.com/ sha256=blahblah"); + ADD(4, "mystic 99y http://foobar.example.com/ sha256=blahblah"); + + /* Only two matching entries for this one, but at least 4 voters */ + ADD(1, "mystic 99p http://barfoo.example.com/ sha256=ggggggg"); + ADD(3, "mystic 99p http://foobar.example.com/ sha256=blahblah"); + ADD(4, "mystic 99p http://foobar.example.com/ sha256=blahblah"); + ADD(5, "mystic 99p http://foobar.example.com/ sha256=ggggggg"); + + /* This one has only invalid votes. */ + ADD(0, "haffenreffer 1.2 http://foobar.example.com/ sha256"); + ADD(1, "haffenreffer 1.2 http://foobar.example.com/ "); + ADD(2, "haffenreffer 1.2 "); + ADD(3, "haffenreffer "); + ADD(4, "haffenreffer"); + + /* Three matching votes for this; it should actually go in! */ + ADD(2, "element 0.66.1 http://quux.example.com/ sha256=abcdef"); + ADD(3, "element 0.66.1 http://quux.example.com/ sha256=abcdef"); + ADD(4, "element 0.66.1 http://quux.example.com/ sha256=abcdef"); + ADD(1, "element 0.66.1 http://quum.example.com/ sha256=abcdef"); + ADD(0, "element 0.66.1 http://quux.example.com/ sha256=abcde"); + + /* Three votes for A, three votes for B */ + ADD(0, "clownshoes 22alpha1 http://quumble.example.com/ blake2=foob"); + ADD(1, "clownshoes 22alpha1 http://quumble.example.com/ blake2=foob"); + ADD(2, "clownshoes 22alpha1 http://quumble.example.com/ blake2=foob"); + ADD(3, "clownshoes 22alpha1 http://quumble.example.com/ blake2=fooz"); + ADD(4, "clownshoes 22alpha1 http://quumble.example.com/ blake2=fooz"); + ADD(5, "clownshoes 22alpha1 http://quumble.example.com/ blake2=fooz"); + + /* Three votes for A, two votes for B */ + ADD(1, "clownshoes 22alpha3 http://quumble.example.com/ blake2=foob"); + ADD(2, "clownshoes 22alpha3 http://quumble.example.com/ blake2=foob"); + ADD(3, "clownshoes 22alpha3 http://quumble.example.com/ blake2=fooz"); + ADD(4, "clownshoes 22alpha3 http://quumble.example.com/ blake2=fooz"); + ADD(5, "clownshoes 22alpha3 http://quumble.example.com/ blake2=fooz"); + + /* Four votes for A, two for B. */ + ADD(0, "clownshoes 22alpha4 http://quumble.example.com/ blake2=foob"); + ADD(1, "clownshoes 22alpha4 http://quumble.example.com/ blake2=foob"); + ADD(2, "clownshoes 22alpha4 http://quumble.example.cam/ blake2=fooa"); + ADD(3, "clownshoes 22alpha4 http://quumble.example.cam/ blake2=fooa"); + ADD(4, "clownshoes 22alpha4 http://quumble.example.cam/ blake2=fooa"); + ADD(5, "clownshoes 22alpha4 http://quumble.example.cam/ blake2=fooa"); + + /* Five votes for A ... all from the same guy. Three for B. */ + ADD(0, "cbc 99.1.11.1.1 http://example.com/cbc/ cubehash=ahooy sha512=m"); + ADD(1, "cbc 99.1.11.1.1 http://example.com/cbc/ cubehash=ahooy sha512=m"); + ADD(3, "cbc 99.1.11.1.1 http://example.com/cbc/ cubehash=ahooy sha512=m"); + ADD(2, "cbc 99.1.11.1.1 http://example.com/ cubehash=ahooy"); + ADD(2, "cbc 99.1.11.1.1 http://example.com/ cubehash=ahooy"); + ADD(2, "cbc 99.1.11.1.1 http://example.com/ cubehash=ahooy"); + ADD(2, "cbc 99.1.11.1.1 http://example.com/ cubehash=ahooy"); + ADD(2, "cbc 99.1.11.1.1 http://example.com/ cubehash=ahooy"); + + /* As above but new replaces old: no two match. */ + ADD(0, "cbc 99.1.11.1.2 http://example.com/cbc/ cubehash=ahooy sha512=m"); + ADD(1, "cbc 99.1.11.1.2 http://example.com/cbc/ cubehash=ahooy sha512=m"); + ADD(1, "cbc 99.1.11.1.2 http://example.com/cbc/x cubehash=ahooy sha512=m"); + ADD(2, "cbc 99.1.11.1.2 http://example.com/cbc/ cubehash=ahooy sha512=m"); + ADD(2, "cbc 99.1.11.1.2 http://example.com/ cubehash=ahooy"); + ADD(2, "cbc 99.1.11.1.2 http://example.com/ cubehash=ahooy"); + ADD(2, "cbc 99.1.11.1.2 http://example.com/ cubehash=ahooy"); + ADD(2, "cbc 99.1.11.1.2 http://example.com/ cubehash=ahooy"); + ADD(2, "cbc 99.1.11.1.2 http://example.com/ cubehash=ahooy"); + + + res = compute_consensus_package_lines(votes); + tt_assert(res); + tt_str_op(res, ==, + "package cbc 99.1.11.1.1 http://example.com/cbc/ cubehash=ahooy sha512=m\n" + "package clownshoes 22alpha3 http://quumble.example.com/ blake2=fooz\n" + "package clownshoes 22alpha4 http://quumble.example.cam/ blake2=fooa\n" + "package element 0.66.1 http://quux.example.com/ sha256=abcdef\n" + "package mystic 99y http://foobar.example.com/ sha256=blahblah\n" + ); + + #undef ADD + #undef BAD + #undef GOOD + done: + SMARTLIST_FOREACH(votes, networkstatus_t *, ns, + { smartlist_free(ns->package_lines); tor_free(ns); }); + tor_free(res); + } + #define DIR_LEGACY(name) \ { #name, test_dir_ ## name , TT_FORK, NULL, NULL } @@@ -2981,8 -3102,7 +3127,9 @@@ struct testcase_t dir_tests[] = DIR_LEGACY(clip_unmeasured_bw_kb_alt), DIR(fmt_control_ns, 0), DIR(http_handling, 0), + DIR(purpose_needs_anonymity, 0), + DIR(fetch_type, 0), + DIR(packages, 0), END_OF_TESTCASES };

1 0

[tor/master] Correctly handle OutboundBindAddress again.
by nickm＠torproject.org 30 Jan '15

30 Jan '15

commit d1e52d9a2a26c1bf9f80b237e692c72517c30495 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 30 07:29:23 2015 -0500 Correctly handle OutboundBindAddress again. ca5ba2956bcd4b5ee1e526ccf5914f52fe6e6d51 broke this; bug not in any released Tor. Also fix a typo. Fixes 14541 and 14527. Reported by qbi. --- src/or/config.c | 2 +- src/or/connection.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 05b4d14..f24b19a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1617,7 +1617,7 @@ options_act(const or_options_t *old_options) } if (parse_outbound_addresses(options, 0, &msg) < 0) { - log_warn(LD_BUG, "Failed parsing oubound bind addresses: %s", msg); + log_warn(LD_BUG, "Failed parsing outbound bind addresses: %s", msg); tor_free(msg); return -1; } diff --git a/src/or/connection.c b/src/or/connection.c index b7dfb1d..0ce4f72 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1728,12 +1728,11 @@ connection_connect(connection_t *conn, const char *address, !tor_addr_is_null(&options->OutboundBindAddressIPv6_)) ext_addr = &options->OutboundBindAddressIPv6_; if (ext_addr) { - socklen_t ext_addr_len = 0; memset(&bind_addr_ss, 0, sizeof(bind_addr_ss)); bind_addr_len = tor_addr_to_sockaddr(ext_addr, 0, (struct sockaddr *) &bind_addr_ss, sizeof(bind_addr_ss)); - if (ext_addr_len == 0) { + if (bind_addr_len == 0) { log_warn(LD_NET, "Error converting OutboundBindAddress %s into sockaddr. " "Ignoring.", fmt_and_decorate_addr(ext_addr));

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 30 Jan '15

30 Jan '15

commit 421d2a8fc1a169cd60f46fd4b942fff2f16005c5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 30 12:15:10 2015 +0000 Update translations for gettor_completed --- hr_HR/gettor.po | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/hr_HR/gettor.po b/hr_HR/gettor.po index 3f749db..9fd8bae 100644 --- a/hr_HR/gettor.po +++ b/hr_HR/gettor.po @@ -5,13 +5,14 @@ # Translators: # Ana B, 2013 # cisterna, 2013 +# skiddiep <lyricaltumor(a)gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" -"Last-Translator: Ana B\n" +"PO-Revision-Date: 2015-01-30 12:11+0000\n" +"Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,11 +22,11 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "Pozdrav, Ovo je \"DobijTor\" robot." +msgstr "Pozdrav, ovo je \"DobijTor\" robot." #: lib/gettor/i18n.py:29 msgid "Thank you for your request." -msgstr "Hvala na zahtjevu." +msgstr "Hvala Vam na zahtjevu." #: lib/gettor/i18n.py:31 msgid "" @@ -82,7 +83,7 @@ msgstr "Molim Vas da odgovorite na ovaj mail, i navedete jedno ime paketa bilo g msgid "" "OBTAINING LOCALIZED VERSIONS OF TOR\n" "===================================" -msgstr "DOBAVLJAM LOKALIZIRANE VERZIJE TORA\n==================================" +msgstr "DOBAVLJAM LOKALIZIRANE VERZIJE TOR-a\n==================================" #: lib/gettor/i18n.py:67 msgid "" @@ -90,14 +91,14 @@ msgid "" "language you want in the address you send the mail to:\n" "\n" " gettor+fa(a)torproject.org" -msgstr "Da biste dobili verziju Tora prevedenu na Vaš jezik, naznačite koji\njezik želite u adresi na koju šaljete mail:\n\ngettor+fa@torproject.org" +msgstr "Da biste dobili verziju Tor-a prevedenu na Vaš jezik, naznačite koji\njezik želite u adresi na koju šaljete mail:\n\ngettor+fa@torproject.org" #: lib/gettor/i18n.py:72 msgid "" "This example will give you the requested package in a localized\n" "version for Farsi (Persian). Check below for a list of supported language\n" "codes. " -msgstr "Ovaj primjer dat će Vam traženi paket u lokaliziranoj\nverziji za Farsi (perzijski). U nastavku provjerite listu podržanih jezičnih\nkodova." +msgstr "Ovaj primjer će Vam dati traženi paket u lokaliziranoj\nverziji za Farsi (perzijski). U nastavku provjerite listu podržanih jezičnih\nkodova." #: lib/gettor/i18n.py:76 msgid " List of supported locales:" @@ -120,11 +121,11 @@ msgid "" " gettor+pl(a)torproject.org: Polish\n" " gettor+ru(a)torproject.org: Russian\n" " gettor+zh(a)torproject.org: Chinese" -msgstr "gettor+ar(a)torproject.org: arapski⏎\ngettor+de(a)torproject.org: njemački⏎\ngettor+en(a)torproject.org: engleski⏎\ngettor+es(a)torproject.org: španjolski⏎\ngettor+fa(a)torproject.org: farsi (Iran)⏎\ngettor+fr(a)torproject.org: francuski⏎\ngettor+it(a)torproject.org: talijanski⏎\ngettor+nl(a)torproject.org: nizozemski⏎\ngettor+pl(a)torproject.org: poljski⏎\ngettor+ru(a)torproject.org: ruski⏎\ngettor+zh(a)torproject.org: kineski" +msgstr "gettor+ar(a)torproject.org: arapski\ngettor+de(a)torproject.org: njemački\ngettor+en(a)torproject.org: engleski\ngettor+es(a)torproject.org: španjolski\ngettor+fa(a)torproject.org: farsi (Iran)\ngettor+fr(a)torproject.org: francuski\ngettor+it(a)torproject.org: talijanski\ngettor+nl(a)torproject.org: nizozemski\ngettor+pl(a)torproject.org: poljski\ngettor+ru(a)torproject.org: ruski\ngettor+zh(a)torproject.org: kineski" #: lib/gettor/i18n.py:92 msgid "If you select no language, you will receive the English version." -msgstr "Ako ne odaberete jezik, dobit ćete englesku inačicu" +msgstr "Ako ne odaberete jezik, dobiti ćete englesku inačicu." #: lib/gettor/i18n.py:94 msgid "" @@ -137,7 +138,7 @@ msgid "" "If your bandwith is low or your provider doesn't allow you to\n" "receive large attachments in your email, GetTor can send you several\n" "small packages instead of one big one." -msgstr "Ako je Vaša propusnost niska ili Vaš provider ne dozvoljava da primate\nveće privitke u svom emailu, GetTor Vam može poslati više\nmalih paketa umjesto jednog velikog." +msgstr "Ako je Vaša propusnost niska ili Vaš provider ne dozvoljava da primate\nveće privitke u svom email-u, GetTor Vam može poslati više\nmalih paketa umjesto jednog velikog." #: lib/gettor/i18n.py:101 msgid "" @@ -152,7 +153,7 @@ msgstr "Uključite ključnu riječ 'split' u novi red, samu. (Ovaj dio je \nvaž msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." -msgstr "Ako pošaljete ovaj tekst u emailu za GetTor, Tor preglednički paket bit će Vam poslan u nizu privitaka veličine 1.4 MB." +msgstr "Ako pošaljete ovaj tekst u emailu za GetTor, Tor preglednički paket će Vam biti poslan u nizu privitaka veličine 1.4 MB." #: lib/gettor/i18n.py:110 msgid "" @@ -169,13 +170,13 @@ msgid "" "2.) Unzip all files ending in \".z\". If you saved all attachments to\n" "a fresh folder before, simply unzip all files in that folder. If you don't\n" "know how to unzip the .z files, please see the UNPACKING THE FILES section." -msgstr "2.)Otpakirajte sve datoteke koje završavaju sa \".z\" Ako ste prije toga spremili sve privitke\nu novi folder, otpakirajte sve datoteke u tom folderu. Ako ne znate\nkako otpakirati .z datoteke, pogledajte odjeljak OTPAKIRAVANJE DATOTEKA." +msgstr "2.)Otpakirajte sve datoteke koje završavaju sa \".z\" Ako ste prije toga spremili sve privitke u novi folder, jednostavno otpakirajte sve datoteke u tom folderu. Ako ne znate kako otpakirati .z datoteke, pogledajte odjeljak OTPAKIRAVANJE DATOTEKA." #: lib/gettor/i18n.py:119 msgid "" "3.) Verify all files as described in the mail you received with \n" "each package. (gpg --verify)" -msgstr "3.) Verificirajte sve datoteke kako je opisano u emailu koji ste primili sa svakim paketom. (gpg --verify)" +msgstr "3.) Verificirajte sve datoteke kako je opisano u email-u koji ste primili sa svakim paketom. (gpg --verify)" #: lib/gettor/i18n.py:122 msgid "" @@ -193,7 +194,7 @@ msgstr "5.) Nakon otpakiravanja, trebali biste vidjeti novu \".exe\" datoteku u #: lib/gettor/i18n.py:130 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" -msgstr "6.) To je sve. Gotovi ste. Hvala na korištenju Tora i zabavite se!" +msgstr "6.) To je sve. Gotovi ste. Hvala što koristite Tor i zabavite se!" #: lib/gettor/i18n.py:132 msgid "" @@ -215,14 +216,14 @@ msgid "" "tool as follows after unpacking the zip file:\n" "\n" " gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" -msgstr "POTVRDITE POTPIS\n===============\nAko Vaše računalo ima instaliran GnuPG, koristite gpg naredbeni\nredak kako slijedi nakon otpakiravanja zip datoteke:\n\ngpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" +msgstr "POTVRDITE POTPIS\n===============\nAko Vaše računalo ima instaliran GnuPG, koristite gpg naredbeni redak kako slijedi nakon otpakiravanja zip datoteke:\n\ngpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" #: lib/gettor/i18n.py:148 msgid "" "The output should look somewhat like this:\n" "\n" " gpg: Good signature from 'Erinn Clark <...>'" -msgstr "Output bi trebao izgledati nekako ovako:\n\ngpg: Valjan potpis od 'Erinn Clark <...>'" +msgstr "Rezultat bi trebao izgledati nekako ovako:\n\ngpg: Good signature from 'Erinn Clark <...>'" #: lib/gettor/i18n.py:152 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 30 Jan '15

30 Jan '15

commit 70056c159dd0acce6dfe776f8119df053240f5c4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 30 12:15:06 2015 +0000 Update translations for gettor --- hr_HR/gettor.po | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/hr_HR/gettor.po b/hr_HR/gettor.po index 3f749db..9fd8bae 100644 --- a/hr_HR/gettor.po +++ b/hr_HR/gettor.po @@ -5,13 +5,14 @@ # Translators: # Ana B, 2013 # cisterna, 2013 +# skiddiep <lyricaltumor(a)gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" -"Last-Translator: Ana B\n" +"PO-Revision-Date: 2015-01-30 12:11+0000\n" +"Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,11 +22,11 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "Pozdrav, Ovo je \"DobijTor\" robot." +msgstr "Pozdrav, ovo je \"DobijTor\" robot." #: lib/gettor/i18n.py:29 msgid "Thank you for your request." -msgstr "Hvala na zahtjevu." +msgstr "Hvala Vam na zahtjevu." #: lib/gettor/i18n.py:31 msgid "" @@ -82,7 +83,7 @@ msgstr "Molim Vas da odgovorite na ovaj mail, i navedete jedno ime paketa bilo g msgid "" "OBTAINING LOCALIZED VERSIONS OF TOR\n" "===================================" -msgstr "DOBAVLJAM LOKALIZIRANE VERZIJE TORA\n==================================" +msgstr "DOBAVLJAM LOKALIZIRANE VERZIJE TOR-a\n==================================" #: lib/gettor/i18n.py:67 msgid "" @@ -90,14 +91,14 @@ msgid "" "language you want in the address you send the mail to:\n" "\n" " gettor+fa(a)torproject.org" -msgstr "Da biste dobili verziju Tora prevedenu na Vaš jezik, naznačite koji\njezik želite u adresi na koju šaljete mail:\n\ngettor+fa@torproject.org" +msgstr "Da biste dobili verziju Tor-a prevedenu na Vaš jezik, naznačite koji\njezik želite u adresi na koju šaljete mail:\n\ngettor+fa@torproject.org" #: lib/gettor/i18n.py:72 msgid "" "This example will give you the requested package in a localized\n" "version for Farsi (Persian). Check below for a list of supported language\n" "codes. " -msgstr "Ovaj primjer dat će Vam traženi paket u lokaliziranoj\nverziji za Farsi (perzijski). U nastavku provjerite listu podržanih jezičnih\nkodova." +msgstr "Ovaj primjer će Vam dati traženi paket u lokaliziranoj\nverziji za Farsi (perzijski). U nastavku provjerite listu podržanih jezičnih\nkodova." #: lib/gettor/i18n.py:76 msgid " List of supported locales:" @@ -120,11 +121,11 @@ msgid "" " gettor+pl(a)torproject.org: Polish\n" " gettor+ru(a)torproject.org: Russian\n" " gettor+zh(a)torproject.org: Chinese" -msgstr "gettor+ar(a)torproject.org: arapski⏎\ngettor+de(a)torproject.org: njemački⏎\ngettor+en(a)torproject.org: engleski⏎\ngettor+es(a)torproject.org: španjolski⏎\ngettor+fa(a)torproject.org: farsi (Iran)⏎\ngettor+fr(a)torproject.org: francuski⏎\ngettor+it(a)torproject.org: talijanski⏎\ngettor+nl(a)torproject.org: nizozemski⏎\ngettor+pl(a)torproject.org: poljski⏎\ngettor+ru(a)torproject.org: ruski⏎\ngettor+zh(a)torproject.org: kineski" +msgstr "gettor+ar(a)torproject.org: arapski\ngettor+de(a)torproject.org: njemački\ngettor+en(a)torproject.org: engleski\ngettor+es(a)torproject.org: španjolski\ngettor+fa(a)torproject.org: farsi (Iran)\ngettor+fr(a)torproject.org: francuski\ngettor+it(a)torproject.org: talijanski\ngettor+nl(a)torproject.org: nizozemski\ngettor+pl(a)torproject.org: poljski\ngettor+ru(a)torproject.org: ruski\ngettor+zh(a)torproject.org: kineski" #: lib/gettor/i18n.py:92 msgid "If you select no language, you will receive the English version." -msgstr "Ako ne odaberete jezik, dobit ćete englesku inačicu" +msgstr "Ako ne odaberete jezik, dobiti ćete englesku inačicu." #: lib/gettor/i18n.py:94 msgid "" @@ -137,7 +138,7 @@ msgid "" "If your bandwith is low or your provider doesn't allow you to\n" "receive large attachments in your email, GetTor can send you several\n" "small packages instead of one big one." -msgstr "Ako je Vaša propusnost niska ili Vaš provider ne dozvoljava da primate\nveće privitke u svom emailu, GetTor Vam može poslati više\nmalih paketa umjesto jednog velikog." +msgstr "Ako je Vaša propusnost niska ili Vaš provider ne dozvoljava da primate\nveće privitke u svom email-u, GetTor Vam može poslati više\nmalih paketa umjesto jednog velikog." #: lib/gettor/i18n.py:101 msgid "" @@ -152,7 +153,7 @@ msgstr "Uključite ključnu riječ 'split' u novi red, samu. (Ovaj dio je \nvaž msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." -msgstr "Ako pošaljete ovaj tekst u emailu za GetTor, Tor preglednički paket bit će Vam poslan u nizu privitaka veličine 1.4 MB." +msgstr "Ako pošaljete ovaj tekst u emailu za GetTor, Tor preglednički paket će Vam biti poslan u nizu privitaka veličine 1.4 MB." #: lib/gettor/i18n.py:110 msgid "" @@ -169,13 +170,13 @@ msgid "" "2.) Unzip all files ending in \".z\". If you saved all attachments to\n" "a fresh folder before, simply unzip all files in that folder. If you don't\n" "know how to unzip the .z files, please see the UNPACKING THE FILES section." -msgstr "2.)Otpakirajte sve datoteke koje završavaju sa \".z\" Ako ste prije toga spremili sve privitke\nu novi folder, otpakirajte sve datoteke u tom folderu. Ako ne znate\nkako otpakirati .z datoteke, pogledajte odjeljak OTPAKIRAVANJE DATOTEKA." +msgstr "2.)Otpakirajte sve datoteke koje završavaju sa \".z\" Ako ste prije toga spremili sve privitke u novi folder, jednostavno otpakirajte sve datoteke u tom folderu. Ako ne znate kako otpakirati .z datoteke, pogledajte odjeljak OTPAKIRAVANJE DATOTEKA." #: lib/gettor/i18n.py:119 msgid "" "3.) Verify all files as described in the mail you received with \n" "each package. (gpg --verify)" -msgstr "3.) Verificirajte sve datoteke kako je opisano u emailu koji ste primili sa svakim paketom. (gpg --verify)" +msgstr "3.) Verificirajte sve datoteke kako je opisano u email-u koji ste primili sa svakim paketom. (gpg --verify)" #: lib/gettor/i18n.py:122 msgid "" @@ -193,7 +194,7 @@ msgstr "5.) Nakon otpakiravanja, trebali biste vidjeti novu \".exe\" datoteku u #: lib/gettor/i18n.py:130 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" -msgstr "6.) To je sve. Gotovi ste. Hvala na korištenju Tora i zabavite se!" +msgstr "6.) To je sve. Gotovi ste. Hvala što koristite Tor i zabavite se!" #: lib/gettor/i18n.py:132 msgid "" @@ -215,14 +216,14 @@ msgid "" "tool as follows after unpacking the zip file:\n" "\n" " gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" -msgstr "POTVRDITE POTPIS\n===============\nAko Vaše računalo ima instaliran GnuPG, koristite gpg naredbeni\nredak kako slijedi nakon otpakiravanja zip datoteke:\n\ngpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" +msgstr "POTVRDITE POTPIS\n===============\nAko Vaše računalo ima instaliran GnuPG, koristite gpg naredbeni redak kako slijedi nakon otpakiravanja zip datoteke:\n\ngpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" #: lib/gettor/i18n.py:148 msgid "" "The output should look somewhat like this:\n" "\n" " gpg: Good signature from 'Erinn Clark <...>'" -msgstr "Output bi trebao izgledati nekako ovako:\n\ngpg: Valjan potpis od 'Erinn Clark <...>'" +msgstr "Rezultat bi trebao izgledati nekako ovako:\n\ngpg: Good signature from 'Erinn Clark <...>'" #: lib/gettor/i18n.py:152 msgid ""

1 0

[tor-browser-bundle/master] Bug 14526: Merge of #8405 breaks nightly builds
by gk＠torproject.org 30 Jan '15

30 Jan '15

commit ad82b1ef6f99a8468e6e02c0977546a23bd0149c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 30 11:27:17 2015 +0000 Bug 14526: Merge of #8405 breaks nightly builds --- gitian/descriptors/linux/gitian-tor.yml | 3 ++- gitian/descriptors/mac/gitian-tor.yml | 3 ++- gitian/descriptors/windows/gitian-tor.yml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index f9795ea..87f3f10 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -80,7 +80,8 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - else # 0.2.6 and master + elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; + then git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 9cedf67..a772a74 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -58,7 +58,8 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - else # 0.2.6 and master + elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; + then git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index dce98f8..9cbbb86 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -58,7 +58,8 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - else # 0.2.6 and master + elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; + then git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src

1 0

[tor-browser-bundle/master] Bump NoScript version in nightlies
by gk＠torproject.org 30 Jan '15

30 Jan '15

commit ab91d616e7eb015b1ca54e3130be85c302963d09 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 30 09:21:35 2015 +0000 Bump NoScript version in nightlies --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 4be76d8..16519f5 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -61,7 +61,7 @@ GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.10-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.11-sm+fn+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -91,7 +91,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=e1670ebc03810f82f61179fa158085df86b8f2a01d63ea16fa3f031242e4ec42 +NOSCRIPT_HASH=568122b4834baf2113648317baf294879700178df157780a9c89582280338ba8 HTTPSE_HASH=a42812dbd4b0103600ac5dce0e5f1366e8a7a7267e18743f5cd1e152615964e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 30 Jan '15

30 Jan '15

commit 77854a82ab713d93b49d2a1b3ede44dd3694f504 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 30 02:16:10 2015 +0000 Update translations for torbutton-torbuttondtd --- sk/torbutton.dtd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sk/torbutton.dtd b/sk/torbutton.dtd index 8831c83..9a3522d 100644 --- a/sk/torbutton.dtd +++ b/sk/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "Nastavenia Súkromia a Bezpečnosti"> <!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> <!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> <!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> @@ -144,14 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries"> <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> -<!ENTITY torbutton.prefs.priv_caption "Privacy Settings"> +<!ENTITY torbutton.prefs.priv_caption "Nastavenia Súkromia"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "Level Bezpečnosti"> +<!ENTITY torbutton.prefs.sec_low "Nízky (pôvodné)"> +<!ENTITY torbutton.prefs.sec_med_low "Stredný-nízky"> +<!ENTITY torbutton.prefs.sec_med_high "Stredný-Vysoký"> +<!ENTITY torbutton.prefs.sec_high "Vysoký"> +<!ENTITY torbutton.prefs.sec_custom "Vlastné parametre">

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 30 Jan '15

30 Jan '15

commit 9ffba082e70119b707750391e36ed428a7ca4771 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 30 02:16:07 2015 +0000 Update translations for torbutton-torbuttonproperties --- sk/torbutton.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sk/torbutton.properties b/sk/torbutton.properties index 182f327..9b9429a 100644 --- a/sk/torbutton.properties +++ b/sk/torbutton.properties @@ -48,10 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Never ask me again # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now +canvas.siteprompt=Táto stánka (%S) sa pokúsila rozbaliť HTML5 dáta canvas obázku, ktore sú možné použiť na identifikáciu vášho počítača.\n\nMal by Tor Browser povoliť tejto stránke rozbaliť HTML5 dáta canvas obázku? +canvas.notNow=Nie teraz canvas.notNowAccessKey=N -canvas.allow=Allow in the future +canvas.allow=Povoliť v budúcnosti canvas.allowAccessKey=A -canvas.never=Never for this site (recommended) +canvas.never=Nikdy pre túto stánku (odporúčané) canvas.neverAccessKey=e

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 30 Jan '15

30 Jan '15

commit 4b703cdd38df602ceff6f2da0c59a6d08934935f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 30 02:15:56 2015 +0000 Update translations for tails-misc_completed --- sk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sk.po b/sk.po index 05e438b..ac2e169 100644 --- a/sk.po +++ b/sk.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-14 16:01+0100\n" -"PO-Revision-Date: 2015-01-30 01:43+0000\n" +"PO-Revision-Date: 2015-01-30 01:51+0000\n" "Last-Translator: FooBar <thewired(a)riseup.net>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n"

1 0