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

[tor/release-0.4.3] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 11 Feb '20

11 Feb '20

commit 00fe214729b935adc522883fa84b399429fefa74 Merge: 0c90fc37e 0ff3e8f4a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:53:00 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" merge, since the exceptions.txt file is already fixed in this branch.

1 0

[tor/release-0.4.3] Remove a redundant practracker exception line in maint-0.4.1
by nickm＠torproject.org 11 Feb '20

11 Feb '20

commit 0ff3e8f4a0fd5b661e999c0a81ceb1c55e7456c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:52:23 2020 -0500 Remove a redundant practracker exception line in maint-0.4.1 This will our "git push" hook not complain about pushing from maint-0.4.1. --- scripts/maint/practracker/exceptions.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 726dc9c3e..eaa98f0f2 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -88,7 +88,6 @@ problem function-size /src/core/or/circuitlist.c:circuits_handle_oom() 117 problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 110 problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 114 problem file-size /src/core/or/circuitpadding.c 3040 -problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 107 problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 113 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_relay_hide_intro_circuits() 104 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_client_hide_rend_circuits() 112

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 11 Feb '20

11 Feb '20

commit 1719ab275f0f4320e1afaf4c871df159aaf5c4b5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 11 13:53:24 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+el.po | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/contents+el.po b/contents+el.po index e47e48a52f..9bff55acd0 100644 --- a/contents+el.po +++ b/contents+el.po @@ -10,6 +10,7 @@ # erinm, 2019 # IDRASSI Mounir <mounir.idrassi(a)idrix.fr>, 2019 # LaScapigliata <ditri2000(a)hotmail.com>, 2019 +# Dimitris Adamakis <gt.dimitris(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -17,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-15 12:00+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: LaScapigliata <ditri2000(a)hotmail.com>, 2019\n" +"Last-Translator: Dimitris Adamakis <gt.dimitris(a)gmail.com>, 2020\n" "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -655,19 +656,20 @@ msgstr "" #: lego/templates/banner.html:2 lego/templates/banner.html:4 #: templates/banner.html:2 templates/banner.html:4 msgid "Close banner" -msgstr "" +msgstr "Κλείσιμο του banner" #: lego/templates/banner.html:10 templates/banner.html:10 msgid "Tracking, surveillance, and censorship are widespread online." msgstr "" +"Η παρακολούθηση, η επιτήρηση και η λογοκρισία είναι ευρέως διαδεδομένες." #: lego/templates/banner.html:14 templates/banner.html:14 msgid "TAKE BACK THE INTERNET WITH TOR" -msgstr "" +msgstr "ΕΠΙΣΤΡΕΨΤΕ ΣΤΟ ΔΙΑΔΙΚΤΥΟ ΜΕ ΤΟ TOR" #: lego/templates/banner.html:18 templates/banner.html:18 msgid "DONATE NOW" -msgstr "" +msgstr "ΔΩΡΙΣTΕ ΤΩΡΑ" #: lego/templates/banner.html:19 templates/banner.html:19 msgid "Give today, and Mozilla will match your donation." @@ -685,6 +687,8 @@ msgid "" "Download Tor Browser to experience real private browsing without tracking, " "surveillance, or censorship." msgstr "" +"Κάντε λήψη του Tor Browser για να ζήσετε τη πραγματική ιδιωτική περιήγηση " +"χωρίς παρακολούθηση, επιτήρηση ή λογοκρισία." #: lego/templates/footer.html:27 templates/footer.html:27 msgid "Our mission:" @@ -709,7 +713,7 @@ msgstr "Εγγραφείτε στο Newsletter μας" #: lego/templates/footer.html:55 templates/footer.html:55 msgid "Get monthly updates and opportunities from the Tor Project:" -msgstr "" +msgstr "Λάβετε μηνιαίες ενημερώσεις και ευκαιρίες από το Tor Project" #: lego/templates/footer.html:56 templates/footer.html:56 msgid "Sign up" @@ -785,7 +789,7 @@ msgstr "Tor" #: lego/templates/secure-connections.html:32 msgid "POTENTIALLY VISIBLE DATA" -msgstr "" +msgstr "ΠΙΘΑΝΩΣ ΟΡΑΤΑ ΔΕΔΟΜΕΝΑ" #: lego/templates/secure-connections.html:37 msgid "Site.com" @@ -1143,6 +1147,8 @@ msgstr "" msgid "" "Defend yourself against tracking and surveillance. Circumvent censorship." msgstr "" +"Προστατεύστε τον εαυτό σας από την παρακολούθηση και την επιτήρηση. " +"Παράκαμψη λογοκρισίας." #: templates/home.html:7 msgid "Block Trackers" @@ -1400,15 +1406,15 @@ msgstr "" #: templates/macros/question.html:12 msgid "Contributors to this page:" -msgstr "" +msgstr "Συνεισφέροντες σε αυτή τη σελίδα:" #: templates/macros/question.html:14 msgid "Edit this page" -msgstr "" +msgstr "Επεξεργασία αυτής της σελίδας" #: templates/macros/question.html:15 msgid "Suggest Feedback" -msgstr "" +msgstr "Προτείνετε σχόλια" #: templates/macros/question.html:16 msgid "Permalink"

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 11 Feb '20

11 Feb '20

commit 23e737f7962609e52ebe8313a755bfedcda630b7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 11 13:50:24 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+el.po | 48 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/contents+el.po b/contents+el.po index 29bf3f7178..6d95688bc0 100644 --- a/contents+el.po +++ b/contents+el.po @@ -935,6 +935,10 @@ msgid "" " fact that you are using Tor, but may slow down the connection compared to " "using ordinary Tor relays." msgstr "" +"Η χρήση γεφυρών σε συνδυασμό με τις συνδετικές μεταφορές 'pluggable " +"transports' βοηθά στο να μην καταλάβουν ότι χρησιμοποιείτε το Tor, αλλά " +"μπορεί να επιβραδύνει τη σύνδεση σε σύγκριση με τη χρήση συνηθισμένων ρελέ " +"του Tor." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1066,6 +1070,9 @@ msgid "" "In 'Bridges' section, check the box 'Use a bridge', then, select 'Provide a " "bridge I know' and enter each bridge address on a separate line." msgstr "" +"Στην ενότητα \"Γέφυρες\", επιλέξτε το πλαίσιο \"Χρήση γέφυρας\", και στη " +"συνέχεια, επιλέξτε \"Παροχή μιας γέφυρας που γνωρίζω\" και εισάγετε κάθε " +"διεύθυνση γέφυρας σε ξεχωριστή γραμμή." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1080,7 +1087,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.title) msgid "MANAGING IDENTITIES" -msgstr "" +msgstr "ΔΙΑΧΕΙΡΙΣΗ ΤΑΥΤΟΤΗΤΩΝ" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.description) @@ -1196,7 +1203,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### LOGGING IN OVER TOR" -msgstr "" +msgstr "### ΣΥΝΔΕΣΗ ΣΕ ΠΕΡΙΒΑΛΛΟΝ OVER TOR" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1269,7 +1276,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### CHANGING IDENTITIES AND CIRCUITS" -msgstr "" +msgstr "### ΑΛΛΑΓΗ ΤΑΥΤΟΤΗΤΩΝ ΚΑΙ ΚΥΚΛΩΜΑΤΩΝ" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1321,7 +1328,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### NEW TOR CIRCUIT FOR THIS SITE" -msgstr "" +msgstr "### ΝΕΟ TOR ΚΥΚΛΩΜΑ ΓΙΑ ΑΥΤΗ ΤΗΝ ΣΕΛΙΔΑ" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1673,7 +1680,7 @@ msgstr "" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "###### Safest" -msgstr "" +msgstr "###### Ασφαλέστερο" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -2195,6 +2202,8 @@ msgid "" "Note that your operating system’s standard \"Uninstall\" utility is not " "used." msgstr "" +"* Σημειώστε ότι η συυνηθισμένη λειτουργία \"Απεγκατάσταση\" του λειτουργικού" +" σας συστήματος δεν χρησιμοποιείται." #: https//tb-manual.torproject.org/known-issues/ #: (content/known-issues/contents+en.lrtopic.title) @@ -2392,6 +2401,8 @@ msgstr "" #: (content/make-tor-portable/contents+en.lrtopic.body) msgid "3. Download the macOS `.dmg` file and save it directly to your media." msgstr "" +"3. Κάντε λήψη του αρχείου macOS `.dmg` και αποθηκεύστε το απευθείας στο μέσο" +" σας." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) @@ -2399,37 +2410,42 @@ msgid "" "5. When the download is complete, click the `.dmg` file and begin the " "installation process." msgstr "" +"5. Όταν ολοκληρωθεί η λήψη, κάντε κλικ στο αρχείο `.dmg` και ξεκινήστε τη " +"διαδικασία εγκατάστασης." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) msgid "" "3. Download the Linux `.tar.xz` file and save it directly to your media." msgstr "" +"3. Κάντε λήψη του αρχείου `.tar.xz` του Linux και αποθηκεύστε το απευθείας " +"στο μέσο σας." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) msgid "" "5. When the download is complete, extract the archive onto the media as " "well." -msgstr "" +msgstr "5. Όταν ολοκληρωθεί η λήψη, αποσυμπιέστε το αρχείο και στα μέσα." #: lego/templates/banner.html:3 lego/templates/banner.html:5 #: templates/banner.html:3 templates/banner.html:5 msgid "Close banner" -msgstr "" +msgstr "Κλείσιμο του banner" #: lego/templates/banner.html:11 templates/banner.html:11 msgid "Tracking, surveillance, and censorship are widespread online." msgstr "" +"Η παρακολούθηση, η επιτήρηση και η λογοκρισία είναι ευρέως διαδεδομένες." #: lego/templates/banner.html:20 templates/banner.html:20 msgid "TAKE BACK THE INTERNET WITH TOR" -msgstr "" +msgstr "ΕΠΙΣΤΡΕΨΤΕ ΣΤΟ ΔΙΑΔΙΚΤΥΟ ΜΕ ΤΟ TOR" #: lego/templates/banner.html:33 lego/templates/banner.html:35 #: templates/banner.html:33 templates/banner.html:35 msgid "DONATE NOW" -msgstr "" +msgstr "ΔΩΡΙΣTΕ ΤΩΡΑ" #: lego/templates/banner.html:37 templates/banner.html:37 msgid "Give today, and Mozilla will match your donation." @@ -2446,6 +2462,8 @@ msgid "" "Download Tor Browser to experience real private browsing without tracking, " "surveillance, or censorship." msgstr "" +"Κάντε λήψη του Tor Browser για να ζήσετε τη πραγματική ιδιωτική περιήγηση " +"χωρίς παρακολούθηση, επιτήρηση ή λογοκρισία." #: lego/templates/footer.html:28 templates/footer.html:28 msgid "Our mission:" @@ -2484,7 +2502,7 @@ msgstr "Εγγραφείτε στο Newsletter μας" #: lego/templates/footer.html:67 templates/footer.html:67 msgid "Get monthly updates and opportunities from the Tor Project:" -msgstr "" +msgstr "Λάβετε μηνιαίες ενημερώσεις και ευκαιρίες από το Tor Project" #: lego/templates/footer.html:68 templates/footer.html:68 msgid "Sign up" @@ -2568,7 +2586,7 @@ msgstr "Tor" #: lego/templates/secure-connections.html:32 #: templates/secure-connections.html:32 msgid "POTENTIALLY VISIBLE DATA" -msgstr "" +msgstr "ΠΙΘΑΝΩΣ ΟΡΑΤΑ ΔΕΔΟΜΕΝΑ" #: lego/templates/secure-connections.html:37 #: templates/secure-connections.html:37 @@ -2623,6 +2641,8 @@ msgstr "Αν χρησιμοποιείται Tor ή όχι." msgid "" "Defend yourself against tracking and surveillance. Circumvent censorship." msgstr "" +"Προστατεύστε τον εαυτό σας από την παρακολούθηση και την επιτήρηση. " +"Παράκαμψη λογοκρισίας." #: templates/layout.html:11 msgid "Tor Project | Tor Browser Manual" @@ -2634,15 +2654,15 @@ msgstr "Θέματα" #: templates/macros/topic.html:22 msgid "Contributors to this page:" -msgstr "" +msgstr "Συνεισφέροντες σε αυτή τη σελίδα:" #: templates/macros/topic.html:24 msgid "Edit this page" -msgstr "" +msgstr "Επεξεργασία αυτής της σελίδας" #: templates/macros/topic.html:25 msgid "Suggest Feedback" -msgstr "" +msgstr "Προτείνετε σχόλια" #: templates/macros/topic.html:26 msgid "Permalink"

1 0

[tor/master] Check for leading zeros in tor_inet_aton()
by nickm＠torproject.org 11 Feb '20

11 Feb '20

commit 777d90fa23785b5a9847a6667889a33fafb3a701 Author: Neel Chauhan <neel(a)neelc.org> Date: Mon Jan 6 20:12:11 2020 -0800 Check for leading zeros in tor_inet_aton() --- src/lib/net/.may_include | 3 ++- src/lib/net/inaddr.c | 21 +++++++++++++++++++++ src/test/test_addr.c | 31 +++++++++++++++++++++++++------ 3 files changed, 48 insertions(+), 7 deletions(-) diff --git a/src/lib/net/.may_include b/src/lib/net/.may_include index e4368f799..6e9af9737 100644 --- a/src/lib/net/.may_include +++ b/src/lib/net/.may_include @@ -14,4 +14,5 @@ lib/net/*.h lib/string/*.h lib/subsys/*.h lib/testsupport/*.h -lib/malloc/*.h \ No newline at end of file +lib/malloc/*.h +lib/smartlist_core/*.h diff --git a/src/lib/net/inaddr.c b/src/lib/net/inaddr.c index a655ca6ad..7ae376b11 100644 --- a/src/lib/net/inaddr.c +++ b/src/lib/net/inaddr.c @@ -11,7 +11,9 @@ #include "lib/net/inaddr.h" #include "lib/cc/torint.h" +#include "lib/container/smartlist.h" #include "lib/log/util_bug.h" +#include "lib/malloc/malloc.h" #include "lib/net/inaddr_st.h" #include "lib/string/compat_ctype.h" #include "lib/string/compat_string.h" @@ -39,8 +41,27 @@ tor_inet_aton(const char *str, struct in_addr *addr) { unsigned a,b,c,d; char more; + bool is_octal = false; + smartlist_t *sl = NULL; + if (tor_sscanf(str, "%3u.%3u.%3u.%3u%c", &a, &b, &c, &d, &more) != 4) return 0; + + /* Parse the octets and check them for leading zeros. */ + sl = smartlist_new(); + smartlist_split_string(sl, str, ".", 0, 0); + SMARTLIST_FOREACH(sl, const char *, octet, { + is_octal = (strlen(octet) > 1 && octet[0] == '0'); + if (is_octal) { + break; + } + }); + SMARTLIST_FOREACH(sl, char *, octet, tor_free(octet)); + smartlist_free(sl); + + if (is_octal) + return 0; + if (a > 255) return 0; if (b > 255) return 0; if (c > 255) return 0; diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 04380d1cc..3ca5d7986 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -659,12 +659,7 @@ test_addr_ip6_helpers(void *arg) tt_int_op(tor_addr_family(&t1),OP_EQ,AF_INET); tt_int_op(tor_addr_to_ipv4h(&t1),OP_EQ,0x01010202); r=tor_addr_parse_mask_ports("3.4.16.032:1-2",0,&t1, &mask, &port1, &port2); - tt_int_op(r, OP_EQ, AF_INET); - tt_int_op(mask,OP_EQ,32); - tt_int_op(tor_addr_family(&t1),OP_EQ,AF_INET); - tt_int_op(tor_addr_to_ipv4h(&t1),OP_EQ,0x03041020); - tt_uint_op(port1, OP_EQ, 1); - tt_uint_op(port2, OP_EQ, 2); + tt_int_op(r, OP_EQ, -1); r=tor_addr_parse_mask_ports("1.1.2.3/255.255.128.0",0,&t1, &mask,NULL,NULL); tt_int_op(r, OP_EQ, AF_INET); tt_int_op(mask,OP_EQ,17); @@ -1653,6 +1648,29 @@ test_addr_rfc6598(void *arg) ; } +#define TEST_ADDR_ATON(a, rv) STMT_BEGIN \ + struct in_addr addr; \ + tt_int_op(tor_inet_aton(a, &addr), OP_EQ, rv); \ + STMT_END; + +static void +test_addr_octal(void *arg) +{ + (void)arg; + + /* Test non-octal IP addresses. */ + TEST_ADDR_ATON("0.1.2.3", 1); + TEST_ADDR_ATON("1.0.2.3", 1); + TEST_ADDR_ATON("1.2.3.0", 1); + + /* Test octal IP addresses. */ + TEST_ADDR_ATON("01.1.2.3", 0); + TEST_ADDR_ATON("1.02.3.4", 0); + TEST_ADDR_ATON("1.2.3.04", 0); + done: + ; +} + #ifndef COCCI #define ADDR_LEGACY(name) \ { #name, test_addr_ ## name , 0, NULL, NULL } @@ -1671,5 +1689,6 @@ struct testcase_t addr_tests[] = { { "is_loopback", test_addr_is_loopback, 0, NULL, NULL }, { "make_null", test_addr_make_null, 0, NULL, NULL }, { "rfc6598", test_addr_rfc6598, 0, NULL, NULL }, + { "octal", test_addr_octal, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] Merge branch 'ticket32362_squashed'
by nickm＠torproject.org 11 Feb '20

11 Feb '20

commit 384a771fccb0b0ab8b95122815b33ef26bf042e8 Merge: d9a70ba21 777d90fa2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:47:19 2020 -0500 Merge branch 'ticket32362_squashed' src/lib/net/.may_include | 3 ++- src/lib/net/inaddr.c | 21 +++++++++++++++++++++ src/test/test_addr.c | 31 +++++++++++++++++++++++++------ 3 files changed, 48 insertions(+), 7 deletions(-) diff --cc src/lib/net/inaddr.c index 0d20d8890,7ae376b11..d50ac2440 --- a/src/lib/net/inaddr.c +++ b/src/lib/net/inaddr.c @@@ -37,10 -39,29 +39,29 @@@ int tor_inet_aton(const char *str, struct in_addr *addr) { - unsigned a,b,c,d; + unsigned a, b, c, d; char more; + bool is_octal = false; + smartlist_t *sl = NULL; + if (tor_sscanf(str, "%3u.%3u.%3u.%3u%c", &a, &b, &c, &d, &more) != 4) return 0; + + /* Parse the octets and check them for leading zeros. */ + sl = smartlist_new(); + smartlist_split_string(sl, str, ".", 0, 0); + SMARTLIST_FOREACH(sl, const char *, octet, { + is_octal = (strlen(octet) > 1 && octet[0] == '0'); + if (is_octal) { + break; + } + }); + SMARTLIST_FOREACH(sl, char *, octet, tor_free(octet)); + smartlist_free(sl); + + if (is_octal) + return 0; + if (a > 255) return 0; if (b > 255) return 0; if (c > 255) return 0;

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 11 Feb '20

11 Feb '20

commit 3eeafdc337e67f5ba80f313a37b265b51fd9378a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 11 13:45:46 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/el/LC_MESSAGES/messages.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/locale/el/LC_MESSAGES/messages.po b/locale/el/LC_MESSAGES/messages.po index 0f459b3c96..20fa0030fc 100644 --- a/locale/el/LC_MESSAGES/messages.po +++ b/locale/el/LC_MESSAGES/messages.po @@ -11,10 +11,11 @@ # Sofia K., 2019 # A Papac <ap909219(a)protonmail.com>, 2019 # Panagiotis Vasilopoulos, 2019 +# Dimitris Adamakis <gt.dimitris(a)gmail.com>, 2020 # msgid "" msgstr "" -"Last-Translator: Panagiotis Vasilopoulos, 2019\n" +"Last-Translator: Dimitris Adamakis <gt.dimitris(a)gmail.com>, 2020\n" "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -22,6 +23,7 @@ msgstr "" #: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:101 msgid "Tracking, surveillance, and censorship are widespread online." msgstr "" +"Η παρακολούθηση, η επιτήρηση και η λογοκρισία είναι ευρέως διαδεδομένες." #: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:105 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:43

1 0

[tor/master] Remove contrib/dist/rc.subr
by nickm＠torproject.org 11 Feb '20

11 Feb '20

commit 9879eae17e7b64b05622edf02c77a0de05037e7f Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Jan 28 20:32:40 2020 +0800 Remove contrib/dist/rc.subr --- changes/ticket31576 | 3 +++ contrib/README | 2 +- contrib/dist/rc.subr | 43 ------------------------------------------- contrib/include.am | 1 - 4 files changed, 4 insertions(+), 45 deletions(-) diff --git a/changes/ticket31576 b/changes/ticket31576 new file mode 100644 index 000000000..ab984cf3d --- /dev/null +++ b/changes/ticket31576 @@ -0,0 +1,3 @@ + o Removed features: + - Stop shipping contrib/dist/rc.subr file, as it is not being used on + FreeBSD anymore. Closes issue 31576. diff --git a/contrib/README b/contrib/README index 735fcf4c9..a56065f97 100644 --- a/contrib/README +++ b/contrib/README @@ -29,7 +29,7 @@ should probably use src/tools/tor-resolve instead. dist/ -- Scripts and files for use when packaging Tor ----------------------------------------------------- -torctl, rc.subr, and tor.sh are init scripts for use with SysV-style init +torctl and tor.sh are init scripts for use with SysV-style init tools. Everybody likes to write init scripts differently, it seems. tor.service is a sample service file for use with systemd. diff --git a/contrib/dist/rc.subr b/contrib/dist/rc.subr deleted file mode 100644 index d757e8952..000000000 --- a/contrib/dist/rc.subr +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# $FreeBSD: ports/security/tor-devel/files/tor.in,v 1.1 2006/02/17 22:21:25 mnag Exp $ -# -# (rc.subr written by Peter Thoenen for Net/FreeBSD) -# -# REQUIRE: NETWORKING SERVERS USR -# BEFORE: LOGIN -# -# Add the following lines to /etc/rc.conf to enable tor -# -# tor_enable (bool): Set to "NO" by default -# Set it to "YES" to enable tor -# tor_conf (str): Points to your tor conf file -# Default: /usr/local/etc/tor/torrc -# tor_user (str): Tor Daemon user. Default _tor -# - -. /etc/rc.subr - -name="tor" -rcvar=${name}_enable - -load_rc_config ${name} - -: ${tor_enable="NO"} -: ${tor_conf="/usr/local/etc/tor/torrc"} -: ${tor_user="_tor"} -: ${tor_pidfile="/var/run/tor/tor.pid"} -: ${tor_logfile="/var/log/tor"} -: ${tor_datadir="/var/run/tor"} - -required_files=${tor_conf} -required_dirs=${tor_datadir} -command="/usr/local/bin/${name}" -command_args="-f ${tor_conf} --pidfile ${tor_pidfile} --runasdaemon 1 --datadirectory ${tor_datadir} --user ${tor_user}" -extra_commands="log" -log_cmd="${name}_log" - -tor_log() { - cat ${tor_logfile} -} - -run_rc_command "$1" diff --git a/contrib/include.am b/contrib/include.am index 784f5427b..60783dc43 100644 --- a/contrib/include.am +++ b/contrib/include.am @@ -2,7 +2,6 @@ EXTRA_DIST+= \ contrib/README \ contrib/client-tools/torify \ - contrib/dist/rc.subr \ contrib/dist/tor.service.in \ contrib/operator-tools/tor-exit-notice.html \ contrib/or-tools/exitlist \

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1690/head'
by nickm＠torproject.org 11 Feb '20

11 Feb '20

commit d9a70ba21262ee92b53eae791171433e2142a902 Merge: 48bf3aec2 9879eae17 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 08:45:25 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1690/head' changes/ticket31576 | 3 +++ contrib/README | 2 +- contrib/dist/rc.subr | 43 ------------------------------------------- contrib/include.am | 1 - 4 files changed, 4 insertions(+), 45 deletions(-)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 11 Feb '20

11 Feb '20

commit 01b305d80c28de85795d7202a0da2b3ee9c9cfe8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 11 13:45:30 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+el.po | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/contents+el.po b/contents+el.po index 9873805bdf..4af39631c6 100644 --- a/contents+el.po +++ b/contents+el.po @@ -7,6 +7,7 @@ # K_gk <kgkotsopoulou(a)gmail.com>, 2019 # A Papac <ap909219(a)protonmail.com>, 2019 # Emma Peel, 2020 +# Dimitris Adamakis <gt.dimitris(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -14,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-11 12:15+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Emma Peel, 2020\n" +"Last-Translator: Dimitris Adamakis <gt.dimitris(a)gmail.com>, 2020\n" "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -10467,20 +10468,21 @@ msgstr "# service cron restart" #: lego/templates/banner.html:3 lego/templates/banner.html:5 #: templates/banner.html:3 templates/banner.html:5 msgid "Close banner" -msgstr "" +msgstr "Κλείσιμο του banner" #: lego/templates/banner.html:11 templates/banner.html:11 msgid "Tracking, surveillance, and censorship are widespread online." msgstr "" +"Η παρακολούθηση, η επιτήρηση και η λογοκρισία είναι ευρέως διαδεδομένες." #: lego/templates/banner.html:20 templates/banner.html:20 msgid "TAKE BACK THE INTERNET WITH TOR" -msgstr "" +msgstr "ΕΠΙΣΤΡΕΨΤΕ ΣΤΟ ΔΙΑΔΙΚΤΥΟ ΜΕ ΤΟ TOR" #: lego/templates/banner.html:33 lego/templates/banner.html:35 #: templates/banner.html:33 templates/banner.html:35 msgid "DONATE NOW" -msgstr "" +msgstr "ΔΩΡΙΣTΕ ΤΩΡΑ" #: lego/templates/banner.html:37 templates/banner.html:37 msgid "Give today, and Mozilla will match your donation." @@ -10497,6 +10499,8 @@ msgid "" "Download Tor Browser to experience real private browsing without tracking, " "surveillance, or censorship." msgstr "" +"Κάντε λήψη του Tor Browser για να ζήσετε τη πραγματική ιδιωτική περιήγηση " +"χωρίς παρακολούθηση, επιτήρηση ή λογοκρισία." #: lego/templates/footer.html:28 templates/footer.html:28 msgid "Our mission:" @@ -10535,7 +10539,7 @@ msgstr "Εγγραφείτε στο Newsletter μας" #: lego/templates/footer.html:66 templates/footer.html:66 msgid "Get monthly updates and opportunities from the Tor Project:" -msgstr "" +msgstr "Λάβετε μηνιαίες ενημερώσεις και ευκαιρίες από το Tor Project" #: lego/templates/footer.html:67 templates/footer.html:67 msgid "Sign up" @@ -10611,7 +10615,7 @@ msgstr "Tor" #: lego/templates/secure-connections.html:32 msgid "POTENTIALLY VISIBLE DATA" -msgstr "" +msgstr "ΠΙΘΑΝΩΣ ΟΡΑΤΑ ΔΕΔΟΜΕΝΑ" #: lego/templates/secure-connections.html:37 msgid "Site.com" @@ -10676,6 +10680,8 @@ msgstr "" msgid "" "Defend yourself against tracking and surveillance. Circumvent censorship." msgstr "" +"Προστατεύστε τον εαυτό σας από την παρακολούθηση και την επιτήρηση. " +"Παράκαμψη λογοκρισίας." #: templates/onion-services.html:27 msgid "Onionize any website" @@ -10763,7 +10769,7 @@ msgstr "" #: templates/two-columns-page.html:27 msgid "Contributors to this page:" -msgstr "" +msgstr "Συνεισφέροντες σε αυτή τη σελίδα:" #: templates/two-columns-page.html:29 msgid "Back to previous page: " @@ -10771,7 +10777,7 @@ msgstr "" #: templates/two-columns-page.html:29 msgid "Edit this page" -msgstr "" +msgstr "Επεξεργασία αυτής της σελίδας" #: templates/user-research.html:31 msgid "Become a Community User Researcher"

1 0