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

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 15 Oct '18

15 Oct '18

commit 447300ce50be8c82b8df393b8f29738947707d9d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 15 16:15:21 2018 +0000 Update translations for donatepages-messagespot --- locale/el/LC_MESSAGES/messages.po | 67 +++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 16 deletions(-) diff --git a/locale/el/LC_MESSAGES/messages.po b/locale/el/LC_MESSAGES/messages.po index 3e75fc221..bc8a0dae5 100644 --- a/locale/el/LC_MESSAGES/messages.po +++ b/locale/el/LC_MESSAGES/messages.po @@ -1366,6 +1366,8 @@ msgid "" "If you want your donation refunded, please tell us by emailing giving(at)torproject.org." msgstr "" +"Αν θέλετε να σας επιστραφεί η δωρεά σας, παρακαλούμε να μας ενημερώσετε με " +"email στο giving(at)torproject.org." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:463 msgid "" @@ -1373,10 +1375,14 @@ msgid "" "amount you donated, your full name, the payment method you used and your " "country of origin." msgstr "" +"Για να επεξεργαστούμε το αίτημα σας για επιστροφή χρημάτων, θα πρέπει να " +"γνωρίζουμε την ημερομηνία της δωρεάς σας, το ποσό που δωρίσατε, το πλήρες " +"όνομα σας, τον τρόπο πληρωμής που χρησιμοποιήσατε και τη χώρα προέλευσής " +"σας." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:465 msgid "Please also tell us why you're asking for a refund." -msgstr "" +msgstr "Παρακαλούμε, επίσης, να μας πείτε γιατί ζητάτε επιστροφή χρημάτων." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:467 msgid "" @@ -1384,24 +1390,28 @@ msgid "" " to be made in a specific way, so we may need additional information from " "you in order to process yours." msgstr "" +"Λάβετε υπόψη ότι μερικές μέθοδοι πληρωμής δεν υποστηρίζουν επιστροφές " +"χρημάτων ή απαιτούν να γίνονται με συγκεκριμένο τρόπο, επομένως ίσως " +"χρειαστούμε επιπλέον πληροφορίες από εσάς για να επεξεργαστούμε τη δική σας." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:473 msgid "Can I donate by mail?" -msgstr "" +msgstr "Μπορώ να δωρίσω μέσω ταχυδρομείου;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:477 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:583 msgid "Yes." -msgstr "" +msgstr "Ναι." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:479 msgid "" "Our mailing address is The Tor Project, P.O. Box 4903, Seattle WA 98194, USA" msgstr "" +"Η διεύθυνσή μας είναι The Tor Project, P.O. Box 4903, Seattle WA 98194, USA" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:485 msgid "Do you accept cash donations?" -msgstr "" +msgstr "Δέχεστε δωρεές σε μετρητά;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:489 msgid "Yes" @@ -1437,16 +1447,20 @@ msgid "" "If you want help figuring out the process, write us at giving(at)torproject.org</a>." msgstr "" +"Αν θέλετε βοήθεια με τη διαδικασία, γράψτε μας στη διεύθυνση giving(at)torproject.org</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:511 msgid "Can I become a Tor Project member?" -msgstr "" +msgstr "Μπορώ να γίνω μέλος του Tor Project;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:515 msgid "" "Right now, we don't have a membership program, but we may set one up in the " "future." msgstr "" +"Αυτή τη στιγμή, δεν έχουμε πρόγραμμα συμμετοχής, αλλά μπορεί να κάνουμε στο " +"μέλλον." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:517 msgid "" @@ -1455,10 +1469,14 @@ msgid "" "href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">this is a " "good place to start</a>." msgstr "" +"Αν θέλετε να ασχοληθείτε με το Tor Project, <a class=\"hyperlinks links\" " +"target=\"_blank\" " +"href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">αυτό είναι" +" ένα καλό μέρος για να ξεκινήσετε</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:523 msgid "How can I get a Tor t-shirt or stickers?" -msgstr "" +msgstr "Πώς μπορώ να πάρω μια κοντομάνικη μπλούζα ή αυτοκόλλητα;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:527 msgid "" @@ -1472,6 +1490,8 @@ msgid "" "If I want to stay in touch with the Tor Project, what's the best way for me " "to do that?" msgstr "" +"Αν θέλω να μείνω σε επαφή με το Tor Project, ποιος είναι ο καλύτερος τρόπος " +"για να το κάνω;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:537 msgid "" @@ -1482,6 +1502,12 @@ msgid "" " links\" target=\"_blank\" href=\"https://twitter.com/torproject\">follow us" " on Twitter</a>." msgstr "" +"Μπορείτε να εγγραφείτε για να λαμβάνετε το <a class=\"hyperlinks links\" " +"target=\"_blank\" href=\"https://newsletter.torproject.org/\">Tor News</a>, " +"να διαβάζετε το <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://blog.torproject.org/\">Tor Blog</a> ή να μας <a " +"class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://twitter.com/torproject\">ακολουθήσετε στο Twitter</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:543 msgid "" @@ -1501,6 +1527,8 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:555 msgid "Can I donate my airline miles, flight vouchers, or hotel points?" msgstr "" +"Μπορώ να δωρίσω τα μίλια μου των αεροπορικών εταιρειών, τα κουπόνια πτήσης ή" +" τους ποντους ξενοδοχείων;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:561 msgid "" @@ -1525,7 +1553,7 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:579 msgid "Can I donate my time?" -msgstr "" +msgstr "Μπορώ να δωρίσω το χρόνο μου;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:585 msgid "" @@ -1533,14 +1561,17 @@ msgid "" "href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">list of " "areas where we would love your help</a>." msgstr "" +"Εδώ είναι μια <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">λίστα από " +"τομείς στους οποίους θα θέλαμε πολύ τη βοήθειά σας</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:591 msgid "I would like my company to support Tor." -msgstr "" +msgstr "Θα ήθελα η εταιρεία μου να υποστηρίξει το Tor." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:593 msgid "What can we do to help?" -msgstr "" +msgstr "Τι μπορούμε να κάνουμε για να βοηθήσουμε;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:597 msgid "" @@ -1570,19 +1601,21 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:609 msgid "You don't support my preferred way to donate." -msgstr "" +msgstr "Δεν υποστηρίζετε τον προτιμώμενο τρόπο δωρεάς μου." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:611 msgid "Can I recommend a new donation method to you?" -msgstr "" +msgstr "Μπορώ να σας συστήσω μια νέα μέθοδο δωρεάς;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:615 msgid "Sure." -msgstr "" +msgstr "Βεβαίως." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:617 msgid "Just mail us at giving(at)torproject.org</a>." msgstr "" +"Απλά στείλτε μας mail στο giving(at)torproject.org</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:623 msgid "" @@ -1592,11 +1625,11 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:627 msgid "We do reserve the right to reject a donation." -msgstr "" +msgstr "Διατηρούμε το δικαίωμα να μπορούμε να απορρίψουμε μια δωρεά." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:629 msgid "To date though, we haven't exercised that right." -msgstr "" +msgstr "Μέχρι σήμερα όμως δεν έχουμε ασκήσει αυτό το δικαίωμα." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:631 msgid "We are happy that a broad range of people use and support Tor." @@ -1604,17 +1637,19 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:637 msgid "I have more questions." -msgstr "" +msgstr "Έχω περισσότερες ερωτήσεις." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:639 msgid "How can I get answers?" -msgstr "" +msgstr "Πώς μπορώ να πάρω απαντήσεις;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:643 msgid "" "Feel free to send questions to frontdesk(at)rt.torproject.org." msgstr "" +"Μη διστάσετε να στείλετε ερωτήσεις στο frontdesk(at)rt.torproject.org." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:645 msgid ""

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 15 Oct '18

15 Oct '18

commit b45624945d3617a327cf044e4237c26d471c5a4d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 15 15:45:21 2018 +0000 Update translations for donatepages-messagespot --- locale/el/LC_MESSAGES/messages.po | 51 +++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 7 deletions(-) diff --git a/locale/el/LC_MESSAGES/messages.po b/locale/el/LC_MESSAGES/messages.po index 1920fcbc6..3e75fc221 100644 --- a/locale/el/LC_MESSAGES/messages.po +++ b/locale/el/LC_MESSAGES/messages.po @@ -1117,6 +1117,9 @@ msgid "" "required to process your credit card payment, including your billing " "address." msgstr "" +"Αν δωρίσετε με πιστωτική κάρτα, θα σας ζητηθούν ορισμένες πληροφορίες που " +"απαιτούνται για την επεξεργασία της πληρωμής με πιστωτική κάρτα, " +"συμπεριλαμβανομένης της διεύθυνσης χρέωσης σας." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:329 msgid "" @@ -1129,26 +1132,33 @@ msgid "" "We don't ask for information beyond what's required by the payment " "processor." msgstr "" +"Δεν ζητάμε πληροφορίες πέραν αυτών που απαιτούνται από τον επεξεργαστή " +"πληρωμής." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:337 msgid "Why is there a minimum donation?" -msgstr "" +msgstr "Γιατί υπάρχει ελάχιστη δωρεά;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:341 msgid "" "People who have stolen credit card information often donate to nonprofits as" " a way of testing whether the card works." msgstr "" +"Άνθρωποι που έχουν κλέψει πληροφορίες πιστωτικής κάρτας συχνά δωρίζουν σε μη" +" κερδοσκοπικούς οργανισμούς για να ελέγξουν αν λειτουργεί η κάρτα." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:343 msgid "" "These people typically use a very small amount for their testing, and we've " "found that setting a $1 minimum donation seems to deter them." msgstr "" +"Αυτοί οι άνθρωποι χρησιμοποιούν συνήθως ένα πολύ μικρό ποσό για τις δοκιμές " +"τους, και διαπιστώσαμε ότι ο καθορισμός ελάχιστης δωρεάς ύψους $1 φαίνεται " +"να τους αποτρέπει." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:349 msgid "Is there a maximum donation?" -msgstr "" +msgstr "Υπάρχει μέγιστη δωρεά;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:353 msgid "" @@ -1160,7 +1170,7 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:359 msgid "Can I donate via bitcoin?" -msgstr "" +msgstr "Μπορώ να δωρίσω μέσω bitcoin;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:363 msgid "" @@ -1168,12 +1178,17 @@ msgid "" "href=\"https://www.torproject.org/donate/donate-options.html.en\">bitcoin " "via BitPay</a>." msgstr "" +"Ναι! Δεχόμαστε <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/donate/donate-options.html.en\">Bitcoin " +"μέσω του BitPay</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:369 msgid "" "If I want my donation to be anonymous, what is the best way for me to " "donate?" msgstr "" +"Αν θέλω η δωρεά μου να είναι ανώνυμη, ποιος είναι ο καλύτερος τρόπος για να " +"δωρίσω;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:373 msgid "" @@ -1181,22 +1196,30 @@ msgid "" "href=\"https://www.torproject.org/donate/donate-" "options.html.en#cash\">sending us a postal money order</a>." msgstr "" +"Μπορείτε να κάνετε δωρεά <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/donate/donate-" +"options.html.en#cash\">στέλνοντας μας ταχυδρομική επιταγή</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:375 msgid "" "You can donate via bitcoin if you have bitcoin set up in a way that " "preserves your anonymity." msgstr "" +"Μπορείτε να κάνετε δωρεά μέσω bitcoin αν έχετε ρυθμίσει το bitcoin κατά " +"τρόπο που να διατηρεί την ανωνυμία σας." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:377 msgid "You can buy cash gift cards and mail them to us." msgstr "" +"Μπορείτε να αγοράσετε δωρο-κάρτες μετρητών και να μας τις ταχυδρομήσετε." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:379 msgid "" "There are probably other ways to donate anonymously that we haven't thought " "of-- maybe you will :)" msgstr "" +"Υπάρχουν πιθανώς άλλοι τρόποι να κάνετε δωρεά ανώνυμα που δεν τους έχουμε " +"σκεφτεί -- ίσως θα τους σκεφτείτε εσείς :)" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:386 msgid "" @@ -1238,23 +1261,27 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:404 msgid "What does that mean?" -msgstr "" +msgstr "Τι σημαίνει αυτό?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:408 msgid "Yes, that's right." -msgstr "" +msgstr "Ναι, σωστά." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:410 msgid "" "If you donate to the Tor Project, there will be some people at the Tor " "Project who know about your donation." msgstr "" +"Αν δωρίσετε στο Tor Project, θα υπάρξουν κάποιοι άνθρωποι στο Tor Project " +"που θα γνωρίζουν σχετικά με τη δωρεά σας." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:412 msgid "" "However, we will never publicly identify you as a donor, unless you have " "given us permission to do so." msgstr "" +"Ωστόσο, δεν θα σας αναφέρουμε ποτέ δημοσίως ως δωρητή, εκτός αν μας έχετε " +"δώσει την άδεια να το κάνουμε." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:414 msgid "" @@ -1262,12 +1289,17 @@ msgid "" "do anything else that would publicly identify you as someone who has " "donated." msgstr "" +"Αυτό σημαίνει ότι δεν θα δημοσιεύσουμε το όνομα σας στην ιστοσελίδα μας, δεν" +" θα σας ευχαριστούμε στο Twitter ούτε θα κάνουμε οτιδήποτε άλλο που θα σας " +"αναγνώριζε δημοσίως ως κάποιον που έχει δωρίσει." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:416 msgid "" "If we decide we would like to publicly name you as a donor, we will ask you " "first, and will not do it until and unless you say it's okay." msgstr "" +"Αν αποφασίσουμε ότι θα θέλαμε να σας αναφέρουμε δημοσίως ως δωρητή, θα σας " +"ρωτήσουμε πρώτα και δεν θα το κάνουμε αν δεν πείτε ότι είναι εντάξει." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:422 msgid "" @@ -1302,6 +1334,8 @@ msgid "" "What if I don't want to use credit card or PayPal? Is there another way I " "can donate?" msgstr "" +"85/5000\n" +"Τι γίνεται αν δεν θέλω να χρησιμοποιήσω πιστωτική κάρτα ή PayPal; Υπάρχει κάποιος άλλος τρόπος να δωρίσω;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:440 msgid "" @@ -1309,10 +1343,13 @@ msgid "" "options.html.en\" class=\"hyperlinks links\" target=\"_blank\">other ways " "you can donate.</a>" msgstr "" +"Ναι! Εδώ είναι μια λίστα με <a href=\"https://www.torproject.org/donate" +"/donate-options.html.en\" class=\"hyperlinks links\" " +"target=\"_blank\">άλλους τρόπους που μπορείτε να δωρίσετε.</a>" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:447 msgid "What is your donor privacy policy?" -msgstr "" +msgstr "Ποια είναι η πολιτική απορρήτου δωρητών σας;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:451 msgid "" @@ -1322,7 +1359,7 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:457 msgid "What is your refund policy?" -msgstr "" +msgstr "Ποια είναι η πολιτική επιστροφής χρημάτων;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:461 msgid ""

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 15 Oct '18

15 Oct '18

commit f46c537926efef4c7cb254a5035e5dca3f7823f3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 15 15:15:24 2018 +0000 Update translations for donatepages-messagespot --- locale/el/LC_MESSAGES/messages.po | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/locale/el/LC_MESSAGES/messages.po b/locale/el/LC_MESSAGES/messages.po index 98531c492..1920fcbc6 100644 --- a/locale/el/LC_MESSAGES/messages.po +++ b/locale/el/LC_MESSAGES/messages.po @@ -952,10 +952,12 @@ msgstr "" msgid "" "How much money does the Tor Project spend annually, and what is it used for?" msgstr "" +"Πόσα χρήματα δαπανώνται ετησίως από το Tor Project και για τι " +"χρησιμοποιούνται;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:227 msgid "The Tor Project spends about $2.5 million annually." -msgstr "" +msgstr "Το Tor Project δαπανά περίπου 2,5 εκατομμύρια δολάρια ετησίως." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:229 #, php-format @@ -978,7 +980,7 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:239 msgid "Is my donation tax-deductible?" -msgstr "" +msgstr "Η δωρεά μου εκπίπτει από τη φορολογία;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:243 msgid "" @@ -1003,11 +1005,11 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:263 msgid "If I am not in the United States, can I still donate?" -msgstr "" +msgstr "Αν δεν είμαι στις Ηνωμένες Πολιτείες, μπορώ ακόμα να δωρίσω;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:267 msgid "Yes, definitely." -msgstr "" +msgstr "Ναι, φυσικά." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:269 msgid "" @@ -1020,11 +1022,13 @@ msgid "" "Can I donate to a specific project, or restrict my donation to a particular " "purpose?" msgstr "" +"Μπορώ να δωρίσω σε ένα συγκεκριμένο project ή να περιορίσω τη δωρεά μου σε " +"συγκεκριμένο σκοπό;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:279 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:559 msgid "No, sorry." -msgstr "" +msgstr "Όχι, συγγνώμη." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:281 msgid "" @@ -1044,6 +1048,7 @@ msgid "" "However, we would be very happy to hear your ideas and feedback about our " "work." msgstr "" +"Ωστόσο, θα χαρούμε να ακούσουμε τις ιδέες και τα σχόλιά σας για το έργο μας." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:287 msgid "" @@ -1053,37 +1058,47 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:293 msgid "Can I donate while using Tor Browser?" -msgstr "" +msgstr "Μπορώ να δωρίσω ενώ χρησιμοποιώ τον Tor Browser;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:297 msgid "Yes! In our testing, donation works via Tor Browser." -msgstr "" +msgstr "Ναι! Στις δοκιμές μας, η δωρεά λειτουργεί μέσω του Tor Browser." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:299 msgid "" "If you run into problems, please contact giving(at)torproject.org." msgstr "" +"Αν αντιμετωπίσετε προβλήματα, παρακαλώ επικοινωνήστε με το giving(at)torproject.org." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:303 msgid "" "For users logging in to Paypal: some people had no problem donating via " "PayPal while using Tor Browser." msgstr "" +"Για τους χρήστες που πραγματοποιούν είσοδο στο Paypal: μερικοί άνθρωποι δεν " +"είχαν πρόβλημα να δωρίσουν μέσω του PayPal ενώ χρησιμοποιούσαν τον Tor " +"Browser." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:305 msgid "" "In past years, some people couldn't complete the donation process, and one " "person had their PayPal account temporarily frozen." msgstr "" +"Τα τελευταία χρόνια, μερικοί άνθρωποι δεν μπόρεσαν να ολοκληρώσουν τη " +"διαδικασία δωρεάς και ένα άτομο είχε προσωρινό πάγωμα του PayPal λογαριασμού" +" του." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:307 msgid "If you run into any problems donating via PayPal, please let us know." msgstr "" +"Αν αντιμετωπίσετε κάποιο πρόβλημα με τη δωρεά μέσω του PayPal, παρακαλούμε " +"να μας ενημερώσετε." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:313 msgid "How can I donate via debit or credit card?" -msgstr "" +msgstr "Πώς μπορώ να δωρίσω μέσω χρεωστικής ή πιστωτικής κάρτας;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:317 msgid "" @@ -1094,7 +1109,7 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:323 msgid "Why do you ask for my address and similar information?" -msgstr "" +msgstr "Γιατί ζητάτε τη διεύθυνσή μου και παρόμοιες πληροφορίες;" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:327 msgid ""

1 0

[tor/maint-0.2.9] Revise our assertion and bug macros to work with -Wparentheses
by nickm＠torproject.org 15 Oct '18

15 Oct '18

commit bb465be085ff8d1640f1d1c0bbb65605d85b5528 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 11:39:37 2018 -0400 Revise our assertion and bug macros to work with -Wparentheses On GCC and Clang, there's a feature to warn you about bad conditionals like "if (a = b)", which should be "if (a == b)". However, they don't warn you if there are extra parentheses around "a = b". Unfortunately, the tor_assert() macro and all of its kin have been passing their inputs through stuff like PREDICT_UNLIKELY(expr) or PREDICT_UNLIKELY(!(expr)), both of which expand to stuff with more parentheses around "expr", thus suppressing these warnings. To fix this, this patch introduces new macros that do not wrap expr. They're only used when GCC or Clang is enabled (both define __GNUC__), since they require GCC's "({statement expression})" syntax extension. They're only used when we're building the unit-test variant of the object files, since they suppress the branch-prediction hints. I've confirmed that tor_assert(), tor_assert_nonfatal(), tor_assert_nonfatal_once(), BUG(), and IF_BUG_ONCE() all now give compiler warnings when their argument is an assignment expression. Fixes bug 27709. Bugfix on 0.0.6, where we first introduced the "tor_assert()" macro. --- changes/bug27709 | 4 ++++ src/common/util_bug.h | 53 ++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 44 insertions(+), 13 deletions(-) diff --git a/changes/bug27709 b/changes/bug27709 new file mode 100644 index 000000000..49e87cbb0 --- /dev/null +++ b/changes/bug27709 @@ -0,0 +1,4 @@ + o Minor bugfixes (code safety): + - Rewrite our assertion macros so that they no longer suppress + the compiler's -Wparentheses warnings on their inputs. Fixes bug 27709; + bugfix on 0.0.6. diff --git a/src/common/util_bug.h b/src/common/util_bug.h index 069580691..22ec37d38 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -29,6 +29,31 @@ #error "Sorry; we don't support building with NDEBUG." #endif +#if defined(TOR_UNIT_TESTS) && defined(__GNUC__) +/* We define this GCC macro as a replacement for PREDICT_UNLIKELY() in this + * header, so that in our unit test builds, we'll get compiler warnings about + * stuff like tor_assert(n = 5). + * + * The key here is that (e) is wrapped in exactly one layer of parentheses, + * and then passed right to a conditional. If you do anything else to the + * expression here, or introduce any more parentheses, the compiler won't + * help you. + */ +#define ASSERT_PREDICT_UNLIKELY_(e) \ + ({ \ + int tor__assert_tmp_value__; \ + if (e) \ + tor__assert_tmp_value__ = 1; \ + else \ + tor__assert_tmp_value__ = 0; \ + tor__assert_tmp_value__; \ + }) +#define ASSERT_PREDICT_LIKELY_(e) ASSERT_PREDICT_UNLIKELY_(e) +#else +#define ASSERT_PREDICT_UNLIKELY_(e) PREDICT_UNLIKELY(e) +#define ASSERT_PREDICT_LIKELY_(e) PREDICT_LIKELY(e) +#endif + /* Sometimes we don't want to use assertions during branch coverage tests; it * leads to tons of unreached branches which in reality are only assertions we * didn't hit. */ @@ -40,7 +65,8 @@ /** Like assert(3), but send assertion failures to the log as well as to * stderr. */ #define tor_assert(expr) STMT_BEGIN \ - if (PREDICT_UNLIKELY(!(expr))) { \ + if (ASSERT_PREDICT_LIKELY_(expr)) { \ + } else { \ tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, #expr); \ abort(); \ } STMT_END @@ -77,7 +103,7 @@ #define tor_assert_nonfatal_unreached_once() tor_assert(0) #define tor_assert_nonfatal_once(cond) tor_assert((cond)) #define BUG(cond) \ - (PREDICT_UNLIKELY(cond) ? \ + (ASSERT_PREDICT_UNLIKELY_(cond) ? \ (tor_assertion_failed_(SHORT_FILE__,__LINE__,__func__,"!("#cond")"), \ abort(), 1) \ : 0) @@ -86,14 +112,15 @@ #define tor_assert_nonfatal(cond) ((void)(cond)) #define tor_assert_nonfatal_unreached_once() STMT_NIL #define tor_assert_nonfatal_once(cond) ((void)(cond)) -#define BUG(cond) (PREDICT_UNLIKELY(cond) ? 1 : 0) +#define BUG(cond) (ASSERT_PREDICT_UNLIKELY_(cond) ? 1 : 0) #else /* Normal case, !ALL_BUGS_ARE_FATAL, !DISABLE_ASSERTS_IN_UNIT_TESTS */ #define tor_assert_nonfatal_unreached() STMT_BEGIN \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, NULL, 0); \ STMT_END #define tor_assert_nonfatal(cond) STMT_BEGIN \ - if (PREDICT_UNLIKELY(!(cond))) { \ - tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 0); \ + if (ASSERT_PREDICT_LIKELY_(cond)) { \ + } else { \ + tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 0); \ } \ STMT_END #define tor_assert_nonfatal_unreached_once() STMT_BEGIN \ @@ -105,13 +132,14 @@ STMT_END #define tor_assert_nonfatal_once(cond) STMT_BEGIN \ static int warning_logged__ = 0; \ - if (!warning_logged__ && PREDICT_UNLIKELY(!(cond))) { \ + if (ASSERT_PREDICT_LIKELY_(cond)) { \ + } else if (!warning_logged__) { \ warning_logged__ = 1; \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 1); \ } \ STMT_END #define BUG(cond) \ - (PREDICT_UNLIKELY(cond) ? \ + (ASSERT_PREDICT_UNLIKELY_(cond) ? \ (tor_bug_occurred_(SHORT_FILE__,__LINE__,__func__,"!("#cond")",0), 1) \ : 0) #endif @@ -120,17 +148,17 @@ #define IF_BUG_ONCE__(cond,var) \ if (( { \ static int var = 0; \ - int bool_result = (cond); \ - if (PREDICT_UNLIKELY(bool_result) && !var) { \ + int bool_result = !!(cond); \ + if (bool_result && !var) { \ var = 1; \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, \ "!("#cond")", 1); \ } \ - PREDICT_UNLIKELY(bool_result); } )) + bool_result; } )) #else #define IF_BUG_ONCE__(cond,var) \ static int var = 0; \ - if (PREDICT_UNLIKELY(cond) ? \ + if ((cond) ? \ (var ? 1 : \ (var=1, \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, \ @@ -148,7 +176,7 @@ */ #define IF_BUG_ONCE(cond) \ - IF_BUG_ONCE__((cond), \ + IF_BUG_ONCE__(ASSERT_PREDICT_UNLIKELY_(cond), \ IF_BUG_ONCE_VARNAME__(__LINE__)) /** Define this if you want Tor to crash when any problem comes up, @@ -170,4 +198,3 @@ void tor_set_failed_assertion_callback(void (*fn)(void)); #endif #endif -

1 0

[tor/maint-0.2.9] Merge branch 'bug27709_029' into maint-0.2.9
by nickm＠torproject.org 15 Oct '18

15 Oct '18

commit b113399658934f3a4526387a63429ec4377ca8be Merge: 717507e3b 5e582c7ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 15 10:34:39 2018 -0400 Merge branch 'bug27709_029' into maint-0.2.9 changes/bug27709 | 4 ++++ src/common/util_bug.h | 57 +++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 48 insertions(+), 13 deletions(-)

1 0

[tor/maint-0.2.9] Explain a bit more about branch prediction in the unit-test case
by nickm＠torproject.org 15 Oct '18

15 Oct '18

commit 5e582c7ffafd9075373131e5e55b69507f54206e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 15 10:16:34 2018 -0400 Explain a bit more about branch prediction in the unit-test case --- src/common/util_bug.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/common/util_bug.h b/src/common/util_bug.h index 22ec37d38..f3e5b7c96 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -38,6 +38,10 @@ * and then passed right to a conditional. If you do anything else to the * expression here, or introduce any more parentheses, the compiler won't * help you. + * + * We only do this for the unit-test build case because it interferes with + * the likely-branch labeling. Note below that in the other case, we define + * these macros to just be synonyms for PREDICT_(UN)LIKELY. */ #define ASSERT_PREDICT_UNLIKELY_(e) \ ({ \

1 0

[tor/maint-0.3.3] Revise our assertion and bug macros to work with -Wparentheses
by nickm＠torproject.org 15 Oct '18

15 Oct '18

commit bb465be085ff8d1640f1d1c0bbb65605d85b5528 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 11:39:37 2018 -0400 Revise our assertion and bug macros to work with -Wparentheses On GCC and Clang, there's a feature to warn you about bad conditionals like "if (a = b)", which should be "if (a == b)". However, they don't warn you if there are extra parentheses around "a = b". Unfortunately, the tor_assert() macro and all of its kin have been passing their inputs through stuff like PREDICT_UNLIKELY(expr) or PREDICT_UNLIKELY(!(expr)), both of which expand to stuff with more parentheses around "expr", thus suppressing these warnings. To fix this, this patch introduces new macros that do not wrap expr. They're only used when GCC or Clang is enabled (both define __GNUC__), since they require GCC's "({statement expression})" syntax extension. They're only used when we're building the unit-test variant of the object files, since they suppress the branch-prediction hints. I've confirmed that tor_assert(), tor_assert_nonfatal(), tor_assert_nonfatal_once(), BUG(), and IF_BUG_ONCE() all now give compiler warnings when their argument is an assignment expression. Fixes bug 27709. Bugfix on 0.0.6, where we first introduced the "tor_assert()" macro. --- changes/bug27709 | 4 ++++ src/common/util_bug.h | 53 ++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 44 insertions(+), 13 deletions(-) diff --git a/changes/bug27709 b/changes/bug27709 new file mode 100644 index 000000000..49e87cbb0 --- /dev/null +++ b/changes/bug27709 @@ -0,0 +1,4 @@ + o Minor bugfixes (code safety): + - Rewrite our assertion macros so that they no longer suppress + the compiler's -Wparentheses warnings on their inputs. Fixes bug 27709; + bugfix on 0.0.6. diff --git a/src/common/util_bug.h b/src/common/util_bug.h index 069580691..22ec37d38 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -29,6 +29,31 @@ #error "Sorry; we don't support building with NDEBUG." #endif +#if defined(TOR_UNIT_TESTS) && defined(__GNUC__) +/* We define this GCC macro as a replacement for PREDICT_UNLIKELY() in this + * header, so that in our unit test builds, we'll get compiler warnings about + * stuff like tor_assert(n = 5). + * + * The key here is that (e) is wrapped in exactly one layer of parentheses, + * and then passed right to a conditional. If you do anything else to the + * expression here, or introduce any more parentheses, the compiler won't + * help you. + */ +#define ASSERT_PREDICT_UNLIKELY_(e) \ + ({ \ + int tor__assert_tmp_value__; \ + if (e) \ + tor__assert_tmp_value__ = 1; \ + else \ + tor__assert_tmp_value__ = 0; \ + tor__assert_tmp_value__; \ + }) +#define ASSERT_PREDICT_LIKELY_(e) ASSERT_PREDICT_UNLIKELY_(e) +#else +#define ASSERT_PREDICT_UNLIKELY_(e) PREDICT_UNLIKELY(e) +#define ASSERT_PREDICT_LIKELY_(e) PREDICT_LIKELY(e) +#endif + /* Sometimes we don't want to use assertions during branch coverage tests; it * leads to tons of unreached branches which in reality are only assertions we * didn't hit. */ @@ -40,7 +65,8 @@ /** Like assert(3), but send assertion failures to the log as well as to * stderr. */ #define tor_assert(expr) STMT_BEGIN \ - if (PREDICT_UNLIKELY(!(expr))) { \ + if (ASSERT_PREDICT_LIKELY_(expr)) { \ + } else { \ tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, #expr); \ abort(); \ } STMT_END @@ -77,7 +103,7 @@ #define tor_assert_nonfatal_unreached_once() tor_assert(0) #define tor_assert_nonfatal_once(cond) tor_assert((cond)) #define BUG(cond) \ - (PREDICT_UNLIKELY(cond) ? \ + (ASSERT_PREDICT_UNLIKELY_(cond) ? \ (tor_assertion_failed_(SHORT_FILE__,__LINE__,__func__,"!("#cond")"), \ abort(), 1) \ : 0) @@ -86,14 +112,15 @@ #define tor_assert_nonfatal(cond) ((void)(cond)) #define tor_assert_nonfatal_unreached_once() STMT_NIL #define tor_assert_nonfatal_once(cond) ((void)(cond)) -#define BUG(cond) (PREDICT_UNLIKELY(cond) ? 1 : 0) +#define BUG(cond) (ASSERT_PREDICT_UNLIKELY_(cond) ? 1 : 0) #else /* Normal case, !ALL_BUGS_ARE_FATAL, !DISABLE_ASSERTS_IN_UNIT_TESTS */ #define tor_assert_nonfatal_unreached() STMT_BEGIN \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, NULL, 0); \ STMT_END #define tor_assert_nonfatal(cond) STMT_BEGIN \ - if (PREDICT_UNLIKELY(!(cond))) { \ - tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 0); \ + if (ASSERT_PREDICT_LIKELY_(cond)) { \ + } else { \ + tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 0); \ } \ STMT_END #define tor_assert_nonfatal_unreached_once() STMT_BEGIN \ @@ -105,13 +132,14 @@ STMT_END #define tor_assert_nonfatal_once(cond) STMT_BEGIN \ static int warning_logged__ = 0; \ - if (!warning_logged__ && PREDICT_UNLIKELY(!(cond))) { \ + if (ASSERT_PREDICT_LIKELY_(cond)) { \ + } else if (!warning_logged__) { \ warning_logged__ = 1; \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 1); \ } \ STMT_END #define BUG(cond) \ - (PREDICT_UNLIKELY(cond) ? \ + (ASSERT_PREDICT_UNLIKELY_(cond) ? \ (tor_bug_occurred_(SHORT_FILE__,__LINE__,__func__,"!("#cond")",0), 1) \ : 0) #endif @@ -120,17 +148,17 @@ #define IF_BUG_ONCE__(cond,var) \ if (( { \ static int var = 0; \ - int bool_result = (cond); \ - if (PREDICT_UNLIKELY(bool_result) && !var) { \ + int bool_result = !!(cond); \ + if (bool_result && !var) { \ var = 1; \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, \ "!("#cond")", 1); \ } \ - PREDICT_UNLIKELY(bool_result); } )) + bool_result; } )) #else #define IF_BUG_ONCE__(cond,var) \ static int var = 0; \ - if (PREDICT_UNLIKELY(cond) ? \ + if ((cond) ? \ (var ? 1 : \ (var=1, \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, \ @@ -148,7 +176,7 @@ */ #define IF_BUG_ONCE(cond) \ - IF_BUG_ONCE__((cond), \ + IF_BUG_ONCE__(ASSERT_PREDICT_UNLIKELY_(cond), \ IF_BUG_ONCE_VARNAME__(__LINE__)) /** Define this if you want Tor to crash when any problem comes up, @@ -170,4 +198,3 @@ void tor_set_failed_assertion_callback(void (*fn)(void)); #endif #endif -

1 0

[tor/maint-0.3.3] Explain a bit more about branch prediction in the unit-test case
by nickm＠torproject.org 15 Oct '18

15 Oct '18

commit 5e582c7ffafd9075373131e5e55b69507f54206e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 15 10:16:34 2018 -0400 Explain a bit more about branch prediction in the unit-test case --- src/common/util_bug.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/common/util_bug.h b/src/common/util_bug.h index 22ec37d38..f3e5b7c96 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -38,6 +38,10 @@ * and then passed right to a conditional. If you do anything else to the * expression here, or introduce any more parentheses, the compiler won't * help you. + * + * We only do this for the unit-test build case because it interferes with + * the likely-branch labeling. Note below that in the other case, we define + * these macros to just be synonyms for PREDICT_(UN)LIKELY. */ #define ASSERT_PREDICT_UNLIKELY_(e) \ ({ \

1 0

[tor/maint-0.3.3] Merge branch 'bug27709_029' into maint-0.2.9
by nickm＠torproject.org 15 Oct '18

15 Oct '18

commit b113399658934f3a4526387a63429ec4377ca8be Merge: 717507e3b 5e582c7ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 15 10:34:39 2018 -0400 Merge branch 'bug27709_029' into maint-0.2.9 changes/bug27709 | 4 ++++ src/common/util_bug.h | 57 +++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 48 insertions(+), 13 deletions(-)

1 0

[tor/maint-0.3.4] Revise our assertion and bug macros to work with -Wparentheses
by nickm＠torproject.org 15 Oct '18

15 Oct '18

commit bb465be085ff8d1640f1d1c0bbb65605d85b5528 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 11:39:37 2018 -0400 Revise our assertion and bug macros to work with -Wparentheses On GCC and Clang, there's a feature to warn you about bad conditionals like "if (a = b)", which should be "if (a == b)". However, they don't warn you if there are extra parentheses around "a = b". Unfortunately, the tor_assert() macro and all of its kin have been passing their inputs through stuff like PREDICT_UNLIKELY(expr) or PREDICT_UNLIKELY(!(expr)), both of which expand to stuff with more parentheses around "expr", thus suppressing these warnings. To fix this, this patch introduces new macros that do not wrap expr. They're only used when GCC or Clang is enabled (both define __GNUC__), since they require GCC's "({statement expression})" syntax extension. They're only used when we're building the unit-test variant of the object files, since they suppress the branch-prediction hints. I've confirmed that tor_assert(), tor_assert_nonfatal(), tor_assert_nonfatal_once(), BUG(), and IF_BUG_ONCE() all now give compiler warnings when their argument is an assignment expression. Fixes bug 27709. Bugfix on 0.0.6, where we first introduced the "tor_assert()" macro. --- changes/bug27709 | 4 ++++ src/common/util_bug.h | 53 ++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 44 insertions(+), 13 deletions(-) diff --git a/changes/bug27709 b/changes/bug27709 new file mode 100644 index 000000000..49e87cbb0 --- /dev/null +++ b/changes/bug27709 @@ -0,0 +1,4 @@ + o Minor bugfixes (code safety): + - Rewrite our assertion macros so that they no longer suppress + the compiler's -Wparentheses warnings on their inputs. Fixes bug 27709; + bugfix on 0.0.6. diff --git a/src/common/util_bug.h b/src/common/util_bug.h index 069580691..22ec37d38 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -29,6 +29,31 @@ #error "Sorry; we don't support building with NDEBUG." #endif +#if defined(TOR_UNIT_TESTS) && defined(__GNUC__) +/* We define this GCC macro as a replacement for PREDICT_UNLIKELY() in this + * header, so that in our unit test builds, we'll get compiler warnings about + * stuff like tor_assert(n = 5). + * + * The key here is that (e) is wrapped in exactly one layer of parentheses, + * and then passed right to a conditional. If you do anything else to the + * expression here, or introduce any more parentheses, the compiler won't + * help you. + */ +#define ASSERT_PREDICT_UNLIKELY_(e) \ + ({ \ + int tor__assert_tmp_value__; \ + if (e) \ + tor__assert_tmp_value__ = 1; \ + else \ + tor__assert_tmp_value__ = 0; \ + tor__assert_tmp_value__; \ + }) +#define ASSERT_PREDICT_LIKELY_(e) ASSERT_PREDICT_UNLIKELY_(e) +#else +#define ASSERT_PREDICT_UNLIKELY_(e) PREDICT_UNLIKELY(e) +#define ASSERT_PREDICT_LIKELY_(e) PREDICT_LIKELY(e) +#endif + /* Sometimes we don't want to use assertions during branch coverage tests; it * leads to tons of unreached branches which in reality are only assertions we * didn't hit. */ @@ -40,7 +65,8 @@ /** Like assert(3), but send assertion failures to the log as well as to * stderr. */ #define tor_assert(expr) STMT_BEGIN \ - if (PREDICT_UNLIKELY(!(expr))) { \ + if (ASSERT_PREDICT_LIKELY_(expr)) { \ + } else { \ tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, #expr); \ abort(); \ } STMT_END @@ -77,7 +103,7 @@ #define tor_assert_nonfatal_unreached_once() tor_assert(0) #define tor_assert_nonfatal_once(cond) tor_assert((cond)) #define BUG(cond) \ - (PREDICT_UNLIKELY(cond) ? \ + (ASSERT_PREDICT_UNLIKELY_(cond) ? \ (tor_assertion_failed_(SHORT_FILE__,__LINE__,__func__,"!("#cond")"), \ abort(), 1) \ : 0) @@ -86,14 +112,15 @@ #define tor_assert_nonfatal(cond) ((void)(cond)) #define tor_assert_nonfatal_unreached_once() STMT_NIL #define tor_assert_nonfatal_once(cond) ((void)(cond)) -#define BUG(cond) (PREDICT_UNLIKELY(cond) ? 1 : 0) +#define BUG(cond) (ASSERT_PREDICT_UNLIKELY_(cond) ? 1 : 0) #else /* Normal case, !ALL_BUGS_ARE_FATAL, !DISABLE_ASSERTS_IN_UNIT_TESTS */ #define tor_assert_nonfatal_unreached() STMT_BEGIN \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, NULL, 0); \ STMT_END #define tor_assert_nonfatal(cond) STMT_BEGIN \ - if (PREDICT_UNLIKELY(!(cond))) { \ - tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 0); \ + if (ASSERT_PREDICT_LIKELY_(cond)) { \ + } else { \ + tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 0); \ } \ STMT_END #define tor_assert_nonfatal_unreached_once() STMT_BEGIN \ @@ -105,13 +132,14 @@ STMT_END #define tor_assert_nonfatal_once(cond) STMT_BEGIN \ static int warning_logged__ = 0; \ - if (!warning_logged__ && PREDICT_UNLIKELY(!(cond))) { \ + if (ASSERT_PREDICT_LIKELY_(cond)) { \ + } else if (!warning_logged__) { \ warning_logged__ = 1; \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 1); \ } \ STMT_END #define BUG(cond) \ - (PREDICT_UNLIKELY(cond) ? \ + (ASSERT_PREDICT_UNLIKELY_(cond) ? \ (tor_bug_occurred_(SHORT_FILE__,__LINE__,__func__,"!("#cond")",0), 1) \ : 0) #endif @@ -120,17 +148,17 @@ #define IF_BUG_ONCE__(cond,var) \ if (( { \ static int var = 0; \ - int bool_result = (cond); \ - if (PREDICT_UNLIKELY(bool_result) && !var) { \ + int bool_result = !!(cond); \ + if (bool_result && !var) { \ var = 1; \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, \ "!("#cond")", 1); \ } \ - PREDICT_UNLIKELY(bool_result); } )) + bool_result; } )) #else #define IF_BUG_ONCE__(cond,var) \ static int var = 0; \ - if (PREDICT_UNLIKELY(cond) ? \ + if ((cond) ? \ (var ? 1 : \ (var=1, \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, \ @@ -148,7 +176,7 @@ */ #define IF_BUG_ONCE(cond) \ - IF_BUG_ONCE__((cond), \ + IF_BUG_ONCE__(ASSERT_PREDICT_UNLIKELY_(cond), \ IF_BUG_ONCE_VARNAME__(__LINE__)) /** Define this if you want Tor to crash when any problem comes up, @@ -170,4 +198,3 @@ void tor_set_failed_assertion_callback(void (*fn)(void)); #endif #endif -

1 0