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

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 17 Sep '18

17 Sep '18

commit b7b0986f57578f1122d19668574eca75a4960a68 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 17 04:19:15 2018 +0000 Update translations for support-portal --- contents+de.po | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/contents+de.po b/contents+de.po index 18cdfe05f..40f28d1b5 100644 --- a/contents+de.po +++ b/contents+de.po @@ -580,6 +580,8 @@ msgid "" "<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Green onion " "with a padlock\">" msgstr "" +"<img class=\"\" src=\"/static/images/padlock-onion.png\" alt=\"Green onion " +"with a padlock\">" #: http//localhost/tbb/tbb-18/ #: (content/tbb/tbb-18/contents+en.lrquestion.description) @@ -1661,6 +1663,8 @@ msgid "" "<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"New " "Circuit for this Site\">" msgstr "" +"<img class=\"\" src=\"/static/images/new-circuit-display.png\" alt=\"New " +"Circuit for this Site\">" #: http//localhost/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.description) @@ -3569,6 +3573,8 @@ msgid "" "<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Check for Tor " "Browser Update\">" msgstr "" +"<img class=\"\" src=\"/static/images/update-tb.png\" alt=\"Check for Tor " +"Browser Update\">" #: http//localhost/onionservices/onionservices-1/ #: (content/onionservices/onionservices-1/contents+en.lrquestion.description) @@ -3595,6 +3601,8 @@ msgid "" "<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Tor " "Browser Menu\">" msgstr "" +"<img class=\"\" src=\"/static/images/menu-new-identity.png\" alt=\"Tor " +"Browser Menu\">" #: http//localhost/operators/operators-7/ #: (content/operators/operators-7/contents+en.lrquestion.description) @@ -4252,7 +4260,7 @@ msgstr "" #: http//localhost/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Onion icon\">" -msgstr "" +msgstr "<img class=\"\" src=\"/static/images/onion-website.png\" alt=\"Onion icon\">" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description)

1 0

[tor/master] Add tortls.h includes to expose critical macro. Fix #27734.
by nickm＠torproject.org 17 Sep '18

17 Sep '18

commit b729bc202c74113c69d2b50521194a7dd4b5d5a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Sep 16 22:08:02 2018 -0400 Add tortls.h includes to expose critical macro. Fix #27734. --- src/core/or/protover.c | 1 + src/test/test_protover.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/core/or/protover.c b/src/core/or/protover.c index 70606af41..0f6f0e79f 100644 --- a/src/core/or/protover.c +++ b/src/core/or/protover.c @@ -26,6 +26,7 @@ #include "core/or/or.h" #include "core/or/protover.h" #include "feature/nodelist/routerparse.h" +#include "lib/tls/tortls.h" #ifndef HAVE_RUST diff --git a/src/test/test_protover.c b/src/test/test_protover.c index 8da1e9d8a..123faccda 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -10,6 +10,7 @@ #include "core/or/or.h" #include "core/or/connection_or.h" +#include "lib/tls/tortls.h" static void test_protover_parse(void *arg)

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 16 Sep '18

16 Sep '18

commit be6999cbf902a5db1b970eb3bd3e5f0801fda478 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 16 21:45:33 2018 +0000 Update translations for https_everywhere_completed --- ka/ssl-observatory.dtd | 100 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/ka/ssl-observatory.dtd b/ka/ssl-observatory.dtd new file mode 100644 index 000000000..d15bb7cf5 --- /dev/null +++ b/ka/ssl-observatory.dtd @@ -0,0 +1,100 @@ + +<!ENTITY ssl-observatory.popup.details "ááá¢ááááá áá áááá€áááááªáááá£á á ááá€áá áááªáá"> +<!ENTITY ssl-observatory.popup.later "ášááááá®áá ááááááááááá"> +<!ENTITY ssl-observatory.popup.no "áá á"> + +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere-á¡ ášáá£á«ááá ášáá¢áááááá¡ ááŠááá©ááá +áá áá£ááá áá, áááŠááá£áá á¡áá á¢áá€áááá¢áááá¡ ááááááááááá +SSL-Observatory-ášá. áá¡á£á á áááá¡ á©áá ááá?"> + + + +<!ENTITY ssl-observatory.popup.title +"áááááá§áááá¡ HTTPS Everywhere-áá SSL-Observatory?`"> + +<!ENTITY ssl-observatory.popup.yes "áááá®"> + + + +<!ENTITY ssl-observatory.prefs.adv_priv_opts1 +"áááá¡ á©áá ááá á£á¡áá€á áá®áá, ááá áá ááá¢áá +áááááááá ááááá ááá ááá ááªáá£áá á¥á¡áááá¡ ááááá§áááááá¡áá¡:"> + +<!ENTITY ssl-observatory.prefs.adv_priv_opts2 +"á£á¡áá€á áá®áá, ááá áá ááá ááá ááªáá£áá á¥á¡áááá á¡áá áááááááá¡áá¡, á ááááá¡ááª áááá©ááá á¡áááá£ááá ášááá á¥á¡áááá¡ á¡áá ááá áá¡ á¡áá®ááááá:"> + +<!ENTITY ssl-observatory.prefs.alt_roots +"áááááááááá áá ášáááá¬áááá á¡áá á¢áá€áááá¢áááá¡, á áááááááª á®ááááá¬áá áááá á«áá áá£áá á¡áá á¢áá€áááá¢áááá¡ á£á©ááá£áá ááááªáááááá¡ áááá ."> + +<!ENTITY ssl-observatory.prefs.alt_roots_tooltip +"áá¡ á£á¡áá€á áá®áá (áá ááá áá ááá áá) ááá¡á á©áá ááá, áá£ áá áá§ááááá ááá¢áá áááááááá áááá ááá ááá ááªáá£á á¥á¡ááá¡ áá Kaspersky-áá¡ ááá¢áááá á£á¡á£á áá ááá áááá¡, á ááááááª áááá áááááááá¡ áá¥áááá¡ ááá¢áá ááá¢ášá TLS-áá áá¥á¡áá¡á áá ááá ááá á«áá áá£áá á¡áá á¢áá€áááá¢áá¡ ááááááªáááá¡ á¡áášá£áááááá ááááááááááááá¡. áá¡áááá¡á á¥á¡áááá á¡áá áááááááá¡ ášáááá®ááááášá, áá£ á©áá áá£ááá, ášáááááá ášáá¡áá«ááá á®ááá£áá ááá®ááá¡ á¡ááá¢áááá¡ áá¡ https:// ááá¡áááá áááá, á áááááááª áá áá áá¥á¡áá áá§á ááááá®á£áááá£áá, áááááªááá£áá á¡áá á¢áá€áááá¢áááá¡ á£áááááá£á áááááá áááááááááá á. áá¡á á áá, áá¡ ááá áááá¢á á áááá£ááá¡á®ááááá ááááá áá£ááá."> + +<!ENTITY ssl-observatory.prefs.anonymous "á¡áá á¢áá€áááá¢áááá¡ Tor-áá ášáááá¬áááá áááááááá¡ áááááŠááááááá¡ áá¡áá ááááááá"> +<!ENTITY ssl-observatory.prefs.anonymous_unavailable +"á¡áá á¢áá€áááá¢áááá¡ Tor-áá ášáááá¬áááá áááááááá¡ áááááŠááááááá¡ áá¡áá ááááááá (á¡áááá áááá¡ Tor)"> +<!ENTITY ssl-observatory.prefs.anonymous_tooltip +"áá¡ ááá áááá¢á á á¡áááá áááá¡ Tor-áá¡ ááá§áááááá¡á áá ááášááááá¡"> + +<!ENTITY ssl-observatory.prefs.asn +"á áááá¡ááª áá®áá á¡áá á¢áá€áááá¢á¡ áá®ááááá, áááá®á¡áááá Observatory-á¡ ááá¢áá ááá¢áá¡ á áááá áááá¬ááááááááá á®áá á áááá áááá£áá"> + +<!ENTITY ssl-observatory.prefs.asn_tooltip +"ášáááááá ááááŠááá áá ááááááááááá âáááááááá ááááá á¡áá¡á¢áááá¡ ááááá áâ áá¥áááá á¥á¡áááá¡áááá¡. áá¡ áááááá®ááá ááá HTTPS-áá ááá¢ááááá ášáá¢áááááá¡ ášáá©áá áááá¡á áá áááá¡ áááááááášá, áá¡ ášáá¢ááááá á®áá áá áááááááá áááá¡ áá áááá¡ áá á¡áá ááá¡ á¥á¡áááááááá, á¡áááááááª á®ášáá áá áááááá¡á®áááá."> + +<!ENTITY ssl-observatory.prefs.show_cert_warning +"ááá€á áá®áááááá¡ á©áááááá, á ááªá Observatory ááŠáááá©ááá¡ ááá£á¥áááá£á á¡áá á¢áá€áááá¢á¡, á ááááá¡ááª áá áá£ááá á áá ášáááŠá£áááá¡"> + +<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip +"ášáááááá á¬áá ááááááá á¡áá á¢áá€áááá¢ááá ááááááá¬ááááá ááá£á¥áááá£áá áªáááááá á¡áá á¢áá€áááá¢áááá¡ á¡ááášá. á¡ááá¬á£á®áá áá, á©ááá ááá ášááááá ááááá, á áá áá£á¡á¢áá ááááááªáááá á§áááá ááá£á¥áááá£á á¡áá á¢áá€áááá¢á¡, áááá áá áá£ áá®ááááá ááá€á áá®áááááá¡, áá¡ áááá¡ ááááášáááááá áá¥áááá, á áá á ááŠááª á áááá ááá áá."> + +<!ENTITY ssl-observatory.prefs.done "ášáá¡á á£áááá£ááá"> + +<!ENTITY ssl-observatory.prefs.explanation +"HTTPS Everywhere áá§ááááá¡ EFF-á¡ SSL-Observatory-á¡. ášáááááá á¡á á£ááááá áá á á áá: (1) +ááááááááá HTTPS-á¡áá á¢áá€áááá¢áááá¡ áá¡áááá Observatory-ášá, á ááª áááá®ááá ááá +ááŠááááá©áááá âášá£ááááááá¡â ášáá¢ááááá áá áááááá ááá ááá¢áá ááá¢áááášáá áá¡ á£á¡áá€á áá®áááá; áá (2) áááŠááá ášáá¢á§áááááááá¡, ááá£áªáááá áááášáá áááá¡áá¡ áá áá¥áááá¡ áá áá£ááá áá ášáá¢áááá¡áá¡."> + + + +<!ENTITY ssl-observatory.prefs.explanation2 + +"ááááááááá, á áááá¡ááª áá¬ááááá https://www.something.com á¡ááá¢á¡, áááááááááááá +á¡áá á¢áá€áááá¢á Observatory-ášá ááá£áááááá¡, á áá áááŠááª áá¬ááá á¡ááá¢á¡ www.something.com, +áááá áá áá ááááá©ááááá áá¡ áá£ ááá áá¬ááá áá á ááááá áááá áá áááááá®á£áá. +ááá¬áá áááááá á¡áááá®áááá áááááá¢áá áá ááá©áááááááá:"> + +<!ENTITY ssl-observatory.prefs.hide "ááááá¢ááááá ááá áááá¢á áááá¡ ááááááá"> + +<!ENTITY ssl-observatory.prefs.nonanon +"á¡áá á¢áá€áááá¢áááá¡ ášáááá¬áááá ááášááááª áá á ááªá Tor áá áá á®ááááá¡áá¬ááááá"> + +<!ENTITY ssl-observatory.prefs.nonanon_tooltip +"á©ááá áááááª ášááááªááááá áááááááá¡ ááá€áá ááá¡, áá£ááªá áá¡ áááááááá á£á¡áá€á áá®áá"> + +<!ENTITY ssl-observatory.prefs.priv_dns +"á¡áá á¢áá€áááá¢áááá¡ áááááááááá áá ááááááá¬áááá áá áá¡áá¯áá á DNS-á¡áá®áááááá¡áááá¡"> + +<!ENTITY ssl-observatory.prefs.priv_dns_tooltip +"áá£ áá áá¥áááá ááááášáá£áá, Observatory áá á©ááá¬áá á¡ á¡áá á¢áá€áááá¢ááá¡ áá ááá¡áá®áááááááá¡áááá¡, á áááááááª áá áá£ášáááááá DNS-á¡áá¡á¢áááá."> + +<!ENTITY ssl-observatory.prefs.show "ááááá¢ááááá ááá áááá¢á áááá¡ á©áááááá"> + +<!ENTITY ssl-observatory.prefs.title "SSL Observatory ááá áááá¢á ááá"> + +<!ENTITY ssl-observatory.prefs.use "áá¡á£á á Observatory-á¡ ááááá§ááááá?"> +<!ENTITY ssl-observatory.warning.title "ááá€á áá®ááááá EFF-á¡ SSL-Observatory-áááá"> +<!ENTITY ssl-observatory.warning.showcert "á¡áá á¢áá€áááá¢áááá¡ á¯ááááá¡ á©áááááá"> +<!ENTITY ssl-observatory.warning.okay "ááá¡áááááá"> +<!ENTITY ssl-observatory.warning.text "EFF-á¡ SSL Observatory á¬áá áááááááá ááá€á áá®ááááá HTTPS-á¡áá á¢áá€áááá¢(áá)áá¡ ášáá¡áá®áá, áááªááá£áá á¡ááá¢áá¡áááá¡:"> +<!ENTITY ssl-observatory.warning.defense "áá£ ášáá¡á£áá á®áá á á¡ááá¢áá¡ ááááá áášáá, á¡áá¡á£á áááá áá¥áááá, ášááªáááá áá¥áááá ááá ááá, á£á¡áá€á áá®á áááášáá áá¡ ááá ááááášá. (áá ááá€á áá®áááááá¡ ááááá ááá ášáá¡áá«ááááááá âSSL-Observatory-áá¡â á©áááá ááá, HTTPS Everywhere-áá¡ ááá áááá¢á áááá¡ áá áášá)."> + +<!ENTITY ssl-observatory.prefs.self_signed +"á¬áá ááááá áá ášáááá¬áááá ááááá®ááááá¬áá ááá á¡áá á¢áá€áááá¢áááá¡"> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"á¡áá¡á£á ááááá; ááášáá€áá áá¡ á®áá áááááá á®ášáá áá, ááááá®ááááá¬áá ááá á¡áá á¢áá€áááá¢áááá¡ ášáááá®ááááášá">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 16 Sep '18

16 Sep '18

commit 33dfc61111ca9fa21218343d5c6e7cdec0484727 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 16 21:45:27 2018 +0000 Update translations for https_everywhere --- ka/ssl-observatory.dtd | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ka/ssl-observatory.dtd b/ka/ssl-observatory.dtd index 842492032..d15bb7cf5 100644 --- a/ka/ssl-observatory.dtd +++ b/ka/ssl-observatory.dtd @@ -64,10 +64,10 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.prefs.explanation2 -"For example, when you visit https://www.something.com, the certificate -received by the Observatory will indicate that somebody visited -www.something.com, but not who visited the site, or what specific page they -looked at. Mouseover the options for further details:"> +"მაგალითად, როდესაც ეწვევით https://www.something.com საიტს, გადაგზავნილი +სერტიფიკატი Observatory-ში მიუთითებს, რომ ვიღაც ეწვია საიტს www.something.com, +მაგრამ არ გამოჩნდება ის თუ ვინ ეწვია ან რომელი გვერდი მოინახულა. +დაწვრილებით სანახავად გადაატარეთ მაჩვენებელი:"> <!ENTITY ssl-observatory.prefs.hide "დამატებითი პარამეტრების დამალვა"> @@ -78,23 +78,23 @@ looked at. Mouseover the options for further details:"> "ჩვენ მაინც შევეცდებით ვინაობის დაფარვას, თუმცა ეს ნაკლებად უსაფრთხოა"> <!ENTITY ssl-observatory.prefs.priv_dns -"Submit and check certificates for non-public DNS names"> +"სერტიფიკატების გადაგზავნა და გადამოწმება არასაჯარო DNS-სახელებისთვის"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip -"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system."> +"თუ არ იქნება მონიშნული, Observatory არ ჩაიწერს სერტიფიკატებს იმ დასახელებებისთვის, რომლებიც არ მუშავდება DNS-სისტემით."> <!ENTITY ssl-observatory.prefs.show "დამატებითი პარამეტრების ჩვენება"> <!ENTITY ssl-observatory.prefs.title "SSL Observatory პარამეტრები"> -<!ENTITY ssl-observatory.prefs.use "Use the Observatory?"> -<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory"> +<!ENTITY ssl-observatory.prefs.use "გსურთ Observatory-ს გამოყენება?"> +<!ENTITY ssl-observatory.warning.title "გაფრთხილება EFF-ს SSL-Observatory-იდან"> <!ENTITY ssl-observatory.warning.showcert "სერტიფიკატების ჯაჭვის ჩვენება"> <!ENTITY ssl-observatory.warning.okay "გასაგებია"> -<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificate(s) for this site:"> -<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection. (These warnings can be disabled in the "SSL Observatory" tab of the HTTPS Everywhere preferences dialog.)"> +<!ENTITY ssl-observatory.warning.text "EFF-ს SSL Observatory წარმოადგინა გაფრთხილება HTTPS-სერტიფიკატ(ებ)ის შესახებ, მოცემული საიტისთვის:"> +<!ENTITY ssl-observatory.warning.defense "თუ შესული ხართ საიტის ანგარიშზე, სასურველი იქნება, შეცვლოთ თქვენი პაროლი, უსაფრთხო კავშირის პირობებში. (ამ გაფრთხილების გამორთვა შესაძლებელია „SSL-Observatory-ის“ ჩანართზე, HTTPS Everywhere-ის პარამეტრების არეში)."> <!ENTITY ssl-observatory.prefs.self_signed "წარდგენა და შემოწმება თვითხელმოწერილი სერტიფიკატების"> <!ENTITY ssl-observatory.prefs.self_signed_tooltip -"This is recommended; cryptographic problems are especially common in self-signed embedded devices"> +"სასურველია; დაშიფვრის ხარვეზები ხშირია, თვითხელმოწერილი სერტიფიკატების შემთხვევაში">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 16 Sep '18

16 Sep '18

commit 868757f1e6d1f87a84aa2fc9ee4d75562518d877 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 16 21:15:28 2018 +0000 Update translations for https_everywhere --- ka/ssl-observatory.dtd | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ka/ssl-observatory.dtd b/ka/ssl-observatory.dtd index 908b54ab6..842492032 100644 --- a/ka/ssl-observatory.dtd +++ b/ka/ssl-observatory.dtd @@ -53,10 +53,9 @@ to turn it on?">--> <!ENTITY ssl-observatory.prefs.done "შესრულებულია"> <!ENTITY ssl-observatory.prefs.explanation -"HTTPS Everywhere can use EFF's SSL Observatory. This does two things: (1) -sends copies of HTTPS certificates to the Observatory, to help us -detect 'man in the middle' attacks and improve the Web's security; and (2) -lets us warn you about insecure connections or attacks on your browser."> +"HTTPS Everywhere იყენებს EFF-ს SSL-Observatory-ს. შედეგად სრულდება ორი რამ: (1) +იგზავნება HTTPS-სერტიფიკატების ასლები Observatory-ში, რაც გვეხმარება +აღმოვაჩინოთ „შუამავლის“ შეტევები და გავზარდოთ ინტერნეტკავშირის უსაფრთხოება; და (2) ვიღებთ შეტყობინებას, დაუცველი კავშირებისას ან თქვენს ბრაუზერზე შეტევისას."> <!--<!ENTITY ssl-observatory.prefs.explanation2 "When you visit https://www.example.com, the Observatory will learn that

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 16 Sep '18

16 Sep '18

commit 1275787da12c71edcda326ac0ac374a6fb11a9ac Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 16 20:45:28 2018 +0000 Update translations for https_everywhere --- ka/ssl-observatory.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ka/ssl-observatory.dtd b/ka/ssl-observatory.dtd index 32414c996..908b54ab6 100644 --- a/ka/ssl-observatory.dtd +++ b/ka/ssl-observatory.dtd @@ -42,13 +42,13 @@ to turn it on?">--> "როდესაც ახალ სერტიფიკატს იხილავთ, მოახსენეთ Observatory-ს ინტერნეტის რომელ მომწოდებელთან ხართ მიერთებული"> <!ENTITY ssl-observatory.prefs.asn_tooltip -"This will fetch and send the "Autonomous System number" of your network. This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common."> +"შედეგად მიიღება და გაიგზავნება „თვითმმართველი სისტემის ნომერი“ თქვენი ქსელისთვის. ეს დაგვეხმარება HTTPS-ზე მიტანილი შეტევების შეჩერებასა და იმის დადგენაში, ეს შეტევები ხომ არ მომდინარეობს ირანის ან სირიის ქსელებიდან, საიდანაც ხშირია თავდასხმები."> <!ENTITY ssl-observatory.prefs.show_cert_warning "გაფრთხილების ჩვენება, როცა Observatory აღმოაჩენს გაუქმებულ სერტიფიკატს, რომელსაც ბრაუზერი არ შეზღუდავს"> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip -"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong."> +"შედეგად წარდგენილი სერტიფიკატები გადამოწმდება გაუქმებული ცნობილი სერტიფიკატების სიაში. სამწუხაროდ, ჩვენ ვერ შეგპირდებით, რომ ზუსტად ამოვიცნობთ ყველა გაუქმებულ სერტიფიკატს, მაგრამ თუ იხილავთ გაფრთხილებას, ეს იმის მანიშნებელი იქნება, რომ რაღაც რიგზე ვერაა."> <!ENTITY ssl-observatory.prefs.done "შესრულებულია">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 16 Sep '18

16 Sep '18

commit 4012db87d502ab8fb20c6f7072903f1f6b7245f5 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 16 18:45:27 2018 +0000 Update translations for https_everywhere --- eu/https-everywhere.dtd | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/eu/https-everywhere.dtd b/eu/https-everywhere.dtd index dad8d43fb..105526943 100644 --- a/eu/https-everywhere.dtd +++ b/eu/https-everywhere.dtd @@ -2,7 +2,7 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "Weba enkriptatu! Automatikoki erabili HTTPS segurtasuna leku askotan."> <!ENTITY https-everywhere.about.version "Bertsioa"> -<!ENTITY https-everywhere.about.rulesets_version "Arauen multzoaren bertsioa:"> +<!ENTITY https-everywhere.about.rulesets_version "Arau-multzoaren bertsioa:"> <!ENTITY https-everywhere.about.add_new_rule "Arau berria gehitu"> <!ENTITY https-everywhere.menu.donate_eff_imperative "EFFri dohaintza eman"> @@ -14,22 +14,22 @@ <!ENTITY https-everywhere.options.generalSettings "Ezarpen Orokorrak"> <!ENTITY https-everywhere.options.advancedSettings "Ezarpen Aurreratuak"> -<!ENTITY https-everywhere.options.updateChannels "Update Channels"> -<!ENTITY https-everywhere.options.enableMixedRulesets "Gaitu nahasitako arauen multzoak"> +<!ENTITY https-everywhere.options.updateChannels "Eguneraketa kanalak"> +<!ENTITY https-everywhere.options.enableMixedRulesets "Gaitu nahasitako arau-multzoak"> <!ENTITY https-everywhere.options.showDevtoolsTab "Erakutsi Devtools fitxa"> -<!ENTITY https-everywhere.options.autoUpdateRulesets "Auto-eguneratu arauen multzoak"> -<!ENTITY https-everywhere.options.updateChannelsWarning "Warning: Adding update channels can cause attackers to hijack your browser. Only edit this section if you know what you're doing!"> -<!ENTITY https-everywhere.options.addUpdateChannel "Add Update Channel"> -<!ENTITY https-everywhere.options.enterUpdateChannelName "Enter update channel name"> +<!ENTITY https-everywhere.options.autoUpdateRulesets "Auto-eguneratu arau-multzoak"> +<!ENTITY https-everywhere.options.updateChannelsWarning "Adi: Eguneraketa kanalak gehitzea erasotzaileak zure nabigatzailea bahitzea eragin dezake. Atal hau editatu ezazu zer egiten ari zaren ondo baldin badakizu soilik!"> +<!ENTITY https-everywhere.options.addUpdateChannel "Eguneraketa kanala gehitu"> +<!ENTITY https-everywhere.options.enterUpdateChannelName "Sartu eguneraketa kanalaren izena"> <!ENTITY https-everywhere.options.delete "Delete"> -<!ENTITY https-everywhere.options.update "Update"> -<!ENTITY https-everywhere.options.storedRulesetsVersion "Stored rulesets version: "> -<!ENTITY https-everywhere.options.updatesLastChecked "Updates last checked: "> -<!ENTITY https-everywhere.options.updatesLastCheckedNever "never"> +<!ENTITY https-everywhere.options.update "Eguneratu"> +<!ENTITY https-everywhere.options.storedRulesetsVersion "Gordetako arau-multzoen bertsioa:"> +<!ENTITY https-everywhere.options.updatesLastChecked "Eguneraketak azkenengoz egiaztatuta:"> +<!ENTITY https-everywhere.options.updatesLastCheckedNever "inoiz"> <!ENTITY https-everywhere.prefs.export_settings "Esportatu Ezarpenak"> <!ENTITY https-everywhere.prefs.reset_defaults "Lehenetsiak berrezarri"> -<!ENTITY https-everywhere.prefs.reset_defaults_message "Honek arauen multzo bakoitza bere egoera lehenetsira berrasieratuko du. Jarraitu?"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "Honek arau-multzo bakoitza bere egoera lehenetsira berrasieratuko du. Jarraitu?"> <!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere noticed you were navigating to a non-HTTPS page, and tried to send you to the HTTPS version instead. The HTTPS version is unavailable. Most likely this site does not support HTTPS, but it is also possible that an attacker is blocking the HTTPS version. If you wish to view the unencrypted version of this page, you can still do so by disabling the 'Block all unencrypted requests' option in your HTTPS Everywhere extension. Be aware that disabling this option could make your browser vulnerable to network-based downgrade attacks on websites you visit."> <!ENTITY https-everywhere.cancel.he_blocking_network "network-based downgrade attacks">

1 0

[tor/master] Don't try to link C from rust doctests for nss detection
by nickm＠torproject.org 16 Sep '18

16 Sep '18

commit a8ac21fbb5f22b68ffa019b575085c142293bc40 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Sep 16 14:34:31 2018 -0400 Don't try to link C from rust doctests for nss detection This is really annoying, since we can't use cfg(test) for doctests. --- src/rust/Cargo.toml | 6 ++++++ src/rust/crypto/Cargo.toml | 6 ++++++ src/rust/external/Cargo.toml | 6 ++++++ src/rust/protover/Cargo.toml | 6 +++++- src/rust/protover/protover.rs | 14 ++++++++++++-- src/rust/smartlist/Cargo.toml | 6 ++++++ src/rust/tor_allocate/Cargo.toml | 6 ++++++ src/rust/tor_log/Cargo.toml | 5 +++++ src/rust/tor_rust/Cargo.toml | 6 ++++++ src/rust/tor_util/Cargo.toml | 6 ++++++ src/test/test_rust.sh | 1 + 11 files changed, 65 insertions(+), 3 deletions(-) diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml index 4bbadbe53..e399dbb33 100644 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@ -23,3 +23,9 @@ default = [] test-c-from-rust = [ "crypto/test-c-from-rust", ] + +# We have to define a feature here because doctests don't get cfg(test), +# and we need to disable some C dependencies when running the doctests +# because of the various linker issues. See +# https://github.com/rust-lang/rust/issues/45599 +test_linking_hack = [] diff --git a/src/rust/crypto/Cargo.toml b/src/rust/crypto/Cargo.toml index d68ac48e2..6ebfe0dc1 100644 --- a/src/rust/crypto/Cargo.toml +++ b/src/rust/crypto/Cargo.toml @@ -30,3 +30,9 @@ rand_core = { version = "=0.2.0-pre.0", default-features = false } # execute with `cargo test`. Due to numerous linker issues (#25386), this is # currently disabled by default. test-c-from-rust = [] + +# We have to define a feature here because doctests don't get cfg(test), +# and we need to disable some C dependencies when running the doctests +# because of the various linker issues. See +# https://github.com/rust-lang/rust/issues/45599 +test_linking_hack = [] diff --git a/src/rust/external/Cargo.toml b/src/rust/external/Cargo.toml index 60ec03be4..4735144ee 100644 --- a/src/rust/external/Cargo.toml +++ b/src/rust/external/Cargo.toml @@ -14,3 +14,9 @@ name = "external" path = "lib.rs" crate_type = ["rlib", "staticlib"] +[features] +# We have to define a feature here because doctests don't get cfg(test), +# and we need to disable some C dependencies when running the doctests +# because of the various linker issues. See +# https://github.com/rust-lang/rust/issues/45599 +test_linking_hack = [] diff --git a/src/rust/protover/Cargo.toml b/src/rust/protover/Cargo.toml index a8480e142..2f7783e76 100644 --- a/src/rust/protover/Cargo.toml +++ b/src/rust/protover/Cargo.toml @@ -4,6 +4,11 @@ version = "0.0.1" name = "protover" [features] +# We have to define a feature here because doctests don't get cfg(test), +# and we need to disable some C dependencies when running the doctests +# because of the various linker issues. See +# https://github.com/rust-lang/rust/issues/45599 +test_linking_hack = [] [dependencies] libc = "=0.2.39" @@ -27,4 +32,3 @@ path = "../tor_log" name = "protover" path = "lib.rs" crate_type = ["rlib", "staticlib"] - diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 7b3f808cb..8417d8595 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -10,7 +10,6 @@ use std::str::FromStr; use std::string::String; use external::c_tor_version_as_new_as; -use external::c_tor_is_using_nss; use errors::ProtoverError; use protoset::ProtoSet; @@ -125,6 +124,17 @@ impl From<Protocol> for UnknownProtocol { } } +#[cfg(feature="test_linking_hack")] +fn have_linkauth_v1() -> bool { + true +} + +#[cfg(not(feature="test_linking_hack"))] +fn have_linkauth_v1() -> bool { + use external::c_tor_is_using_nss; + ! c_tor_is_using_nss() +} + /// Get a CStr representation of current supported protocols, for /// passing to C, or for converting to a `&str` for Rust. /// @@ -142,7 +152,7 @@ impl From<Protocol> for UnknownProtocol { /// // C_RUST_COUPLED: protover.c `protover_get_supported_protocols` pub(crate) fn get_supported_protocols_cstr() -> &'static CStr { - if c_tor_is_using_nss() { + if ! have_linkauth_v1() { cstr!("Cons=1-2 \ Desc=1-2 \ DirCache=1-2 \ diff --git a/src/rust/smartlist/Cargo.toml b/src/rust/smartlist/Cargo.toml index 6ddcbee8e..4ecdf5086 100644 --- a/src/rust/smartlist/Cargo.toml +++ b/src/rust/smartlist/Cargo.toml @@ -11,3 +11,9 @@ name = "smartlist" path = "lib.rs" crate_type = ["rlib", "staticlib"] +[features] +# We have to define a feature here because doctests don't get cfg(test), +# and we need to disable some C dependencies when running the doctests +# because of the various linker issues. See +# https://github.com/rust-lang/rust/issues/45599 +test_linking_hack = [] diff --git a/src/rust/tor_allocate/Cargo.toml b/src/rust/tor_allocate/Cargo.toml index 468425f11..7bb3b9887 100644 --- a/src/rust/tor_allocate/Cargo.toml +++ b/src/rust/tor_allocate/Cargo.toml @@ -11,3 +11,9 @@ name = "tor_allocate" path = "lib.rs" crate_type = ["rlib", "staticlib"] +[features] +# We have to define a feature here because doctests don't get cfg(test), +# and we need to disable some C dependencies when running the doctests +# because of the various linker issues. See +# https://github.com/rust-lang/rust/issues/45599 +test_linking_hack = [] diff --git a/src/rust/tor_log/Cargo.toml b/src/rust/tor_log/Cargo.toml index 9d06299c0..1aa9be061 100644 --- a/src/rust/tor_log/Cargo.toml +++ b/src/rust/tor_log/Cargo.toml @@ -9,6 +9,11 @@ path = "lib.rs" crate_type = ["rlib", "staticlib"] [features] +# We have to define a feature here because doctests don't get cfg(test), +# and we need to disable some C dependencies when running the doctests +# because of the various linker issues. See +# https://github.com/rust-lang/rust/issues/45599 +test_linking_hack = [] [dependencies] libc = "0.2.39" diff --git a/src/rust/tor_rust/Cargo.toml b/src/rust/tor_rust/Cargo.toml index 86fad3ee7..1523ee0dd 100644 --- a/src/rust/tor_rust/Cargo.toml +++ b/src/rust/tor_rust/Cargo.toml @@ -14,3 +14,9 @@ path = "../tor_util" [dependencies.protover] path = "../protover" +[features] +# We have to define a feature here because doctests don't get cfg(test), +# and we need to disable some C dependencies when running the doctests +# because of the various linker issues. See +# https://github.com/rust-lang/rust/issues/45599 +test_linking_hack = [] diff --git a/src/rust/tor_util/Cargo.toml b/src/rust/tor_util/Cargo.toml index a606a280b..51e4bd9c5 100644 --- a/src/rust/tor_util/Cargo.toml +++ b/src/rust/tor_util/Cargo.toml @@ -17,3 +17,9 @@ path = "../tor_log" [dependencies] libc = "=0.2.39" +[features] +# We have to define a feature here because doctests don't get cfg(test), +# and we need to disable some C dependencies when running the doctests +# because of the various linker issues. See +# https://github.com/rust-lang/rust/issues/45599 +test_linking_hack = [] diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 4afc84285..a1a56af48 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -10,6 +10,7 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do cd "${abs_top_builddir:-../../..}/src/rust" && \ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ + --features "test_linking_hack" \ ${EXTRA_CARGO_OPTIONS} \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 fi

1 0

[tor/master] Merge branch 'bug25573-034-typefix'
by nickm＠torproject.org 16 Sep '18

16 Sep '18

commit 078debb0ded16e7f8d79d5aa6f4184ae5ad44ff9 Merge: 991bec67e 7fd61cf53 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Sep 16 13:46:12 2018 -0400 Merge branch 'bug25573-034-typefix' src/test/test_relaycell.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix duplicate declaration of pathbias_count_valid_cells.
by nickm＠torproject.org 16 Sep '18

16 Sep '18

commit 7fd61cf536543283353b618d5bba9a1db637ed14 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Sep 16 13:45:43 2018 -0400 Fix duplicate declaration of pathbias_count_valid_cells. --- src/test/test_relaycell.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c index 3f84ee830..ee495cada 100644 --- a/src/test/test_relaycell.c +++ b/src/test/test_relaycell.c @@ -31,8 +31,8 @@ void connection_free_minimal(connection_t*); int connected_cell_format_payload(uint8_t *payload_out, const tor_addr_t *addr, uint32_t ttl); -int pathbias_count_valid_cells(origin_circuit_t *circ, - cell_t *cell); +void pathbias_count_valid_cells(origin_circuit_t *circ, + cell_t *cell); half_edge_t *connection_half_edge_find_stream_id( const smartlist_t *half_conns, streamid_t stream_id); @@ -1072,4 +1072,3 @@ struct testcase_t relaycell_tests[] = { { "streamwrap", test_halfstream_wrap, TT_FORK, NULL, NULL }, END_OF_TESTCASES }; -

1 0