[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot
commit 000558c5663e8e5548622d47222101768ecb4f7d Author: Translation commit bot Date: Wed Feb 13 08:15:26 2019 + Update translations for donatepages-messagespot --- locale/ro/LC_MESSAGES/messages.po | 65 +++ 1 file changed, 52 insertions(+), 13 deletions(-) diff --git a/locale/ro/LC_MESSAGES/messages.po b/locale/ro/LC_MESSAGES/messages.po index 75335720b..be0bba0f7 100644 --- a/locale/ro/LC_MESSAGES/messages.po +++ b/locale/ro/LC_MESSAGES/messages.po @@ -73,6 +73,9 @@ msgid "" "links\" target=\"_blank\" href=\"https://www.paypal.com/webapps/mpp/ua"; "/privacy-full\">policies, especially if you have privacy concerns." msgstr "" +"VÄ recomandÄm sÄ vÄ familiarizaÈi cu https://www.paypal.com/webapps/mpp/ua/privacy-"; +"full\">policile sale, mai ales dacÄ aveÈi probleme de confidenÈialitate." #: tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:74 msgid "" @@ -80,29 +83,42 @@ msgid "" " learn your name, the amount you donated, your email address, phone number " "and/or mailing address, as well as any other information you provide." msgstr "" +"Când donaÈi pentru Tor Project, în funcÈie de mecanismul pe care îl " +"utilizaÈi, vÄ putem afla numele, suma pe care aÈi donat-o, adresa dvs. de " +"e-mail, numÄrul de telefon Èi/sau adresa de corespondenÈÄ, precum Èi orice " +"alte informaÈii pe care le furnizaÈi." #: tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:76 msgid "" "We may also learn incidental data such as the date and time of your " "donation." msgstr "" +"De asemenea, putem afla informaÈii accidentale, cum ar fi data Èi ora " +"donaÈiei." #: tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:78 msgid "" "The Tor Project will never have access to your financial data, such as your " "credit card information.We aim to be careful with your information." msgstr "" +"Tor Project nu va avea niciodatÄ acces la datele dvs. financiare, cum ar fi " +"informaÈiile despre cardul dvs. de credit. Dorim sÄ fim atenÈi cu " +"informaÈiile dvs." #: tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:83 msgid "" "If you have provided your email address, we will email you once to thank you" " and give you a receipt." msgstr "" +"DacÄ aÈi furnizat adresa dvs. de e-mail, vÄ vom trimite un e-mail o singurÄ " +"datÄ pentru a vÄ mulÈumi Èi pentru a vÄ trimite chitanÈa." #: tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:85 msgid "" "If you opt in during the donation process, we may email you again in future." msgstr "" +"DacÄ vÄ Ã®nscrieÈi în timpul procesului de donaÈie, este posibil ca în viitor" +" sÄ vÄ mai trimitem e-mail." #: tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:87 msgid "" @@ -111,27 +127,39 @@ msgid "" "target=\"_blank\" href=\"https://www.irs.gov/pub/irs-"; "pdf/f990ezb.pdf\">Schedule B of the Form 990." msgstr "" +"DacÄ donaÈi mai mult de 5.000 de dolari Èi vÄ cunoaÈtem numele Èi adresa, " +"trebuie sÄ Ã®l dezvÄluim cÄtre IRS în https://www.irs.gov/pub/irs-"; +"pdf/f990ezb.pdf\">Schema B a Formularului 990." #: tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:89 msgid "" "But, that information is redacted from the publicly-available version of our" " Form 990." msgstr "" +"Dar, aceste informaÈii sunt redactate în versiunea disponibilÄ public a " +"Formularului 990." #: tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:91 msgid "" "We will never publicly identify you as a donor without your permission." msgstr "" +"Nu vÄ vom identifica niciodatÄ Ã®n mod public ca donator fÄrÄ permisiunea " +"dvs." #: tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:96 msgid "We do not publish, sell, trade, or rent any information about you." msgstr "" +"Nu publicÄm, nu vindem, nu schimbÄm sau nu închiriem nicio informaÈie despre" +" dvs." #: tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:98 msgid "" "For our records, we retain your name, the amount of your donation, the date " "of the donation, and your contact information." msgstr "" +"Pentru înregistrÄrile noastre, vÄ pÄstrÄm numele, suma donaÈiei, data " +"donaÈiei Èi informaÈiile dvs. de contact." #: tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:100 msgid "" @@ -139,22 +167,27 @@ msgid "" "who need it to do their work, for example by thanking you or mailing you a " "t-shirt." msgstr "" +"Accesul la aceste informaÈii este restricÈionat în cadrul Tor Project " +"persoanelor care au nevoie de ele pentru a-Èi face munca,
[tor-commits] [translation/tba-torbrowserstringsdtd_completed] Update translations for tba-torbrowserstringsdtd_completed
commit bc88f6029b97274f969f41a56f3ff51d71c1e6ce Author: Translation commit bot Date: Wed Feb 13 08:17:25 2019 + Update translations for tba-torbrowserstringsdtd_completed --- is/android_strings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/is/android_strings.dtd b/is/android_strings.dtd index 071526008..932e8ac2a 100644 --- a/is/android_strings.dtd +++ b/is/android_strings.dtd @@ -9,7 +9,7 @@ - + @@ -17,7 +17,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd
commit 44ead665e032322322ac99ca4ee3e0f84872fbf3 Author: Translation commit bot Date: Wed Feb 13 08:17:20 2019 + Update translations for tba-torbrowserstringsdtd --- is/android_strings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/is/android_strings.dtd b/is/android_strings.dtd index 071526008..932e8ac2a 100644 --- a/is/android_strings.dtd +++ b/is/android_strings.dtd @@ -9,7 +9,7 @@ - + @@ -17,7 +17,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
commit 18fab3864073f967bee1dced2c479bd1046121e1 Author: Translation commit bot Date: Wed Feb 13 08:19:12 2019 + Update translations for torbutton-browseronboardingproperties --- is/browserOnboarding.properties | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/is/browserOnboarding.properties b/is/browserOnboarding.properties index 893ce908e..4fedc9242 100644 --- a/is/browserOnboarding.properties +++ b/is/browserOnboarding.properties @@ -14,8 +14,8 @@ onboarding.tour-tor-privacy.button=Fara á Tor-netið onboarding.tour-tor-network=Tor-netið onboarding.tour-tor-network.title=Farðu um ómiðstýrt netkerfi. -onboarding.tour-tor-network.description=Tor-vafrinn tengir þig við Tor-netið sem rekið er af þúsundum sjálfboðaliða um vÃða veröld. ÃlÃkt VPN, þá er enginn einn punktur sem getur brugðist eða miðlægt firirbæri sem þú þarft að treysta til að geta notað netið án afskipta annarra. -onboarding.tour-tor-network.button=Farðu à birtingu rása +onboarding.tour-tor-network.description=Tor-vafrinn tengir þig við Tor-netið sem rekið er af þúsundum sjálfboðaliða um vÃða veröld. ÃlÃkt VPN, þá er enginn einn punktur sem getur brugðist eða miðlægt fyrirbæri sem þú þarft að treysta til að geta notað netið án afskipta annarra. +onboarding.tour-tor-network.button=Fara à birtingu rása onboarding.tour-tor-circuit-display=Birting rása onboarding.tour-tor-circuit-display.title=Skoðaðu slóðina þÃna @@ -29,12 +29,12 @@ onboarding.tour-tor-security.button=Yfirfara stillingar onboarding.tour-tor-expect-differences=Ãbendingar fyrir upplifunina onboarding.tour-tor-expect-differences.title=Gerður ráð fyrir að eitthvað verði öðruvÃsi. -onboarding.tour-tor-expect-differences.description=Vegna allra öryggis- og gagnaverndareiginleika Tor, þá gæti upplifun þÃn af vafri á internetinu orðið eilÃtið öðruvÃsi en annars. Hlutirnir gerast kannski aðeins hægar og það fer eftir öryggisstillingunum þÃnum hvort sum atriði virki eða birtist yfirhöfuð. Ãú gætir lÃka lent à þvà að vera reglulega spurð(ur) hvort þú sért mannvera eða vélmenni. -onboarding.tour-tor-expect-differences.button=Skoðaðu algengar spurningar - FAQ +onboarding.tour-tor-expect-differences.description=Vegna allra öryggis- og gagnaverndareiginleika Tor, þá gæti upplifun þÃn af vafri á internetinu orðið eilÃtið öðruvÃsi en annars væri. Hlutirnir gerast kannski aðeins hægar og það fer eftir öryggisstillingunum þÃnum hvort sum atriði virki eða birtist yfirhöfuð. Ãú gætir lÃka lent à þvà að vera reglulega spurð(ur) hvort þú sért mannvera eða vélmenni. +onboarding.tour-tor-expect-differences.button=Skoða algengar spurningar - FAQ onboarding.tour-tor-onion-services=Onion-þjónustur onboarding.tour-tor-onion-services.title=Fáðu viðbótaröryggi. -onboarding.tour-tor-onion-services.description=Onion-þjónustur eru vefsvæði sem enda á .onion viðskeyti, vefsvæði sem gefa útgefendum efnis og þeim sem skoða það aukna vernd gagnvart ritskoðun. Onion-þjónustur gera öllum kleift að birta efni eða eigin þjónustu nafnlaust. Smelltu hr fyrir neðan til að skoða onion-vefsvæði DuckDuckGo. +onboarding.tour-tor-onion-services.description=Onion-þjónustur eru vefsvæði sem enda á .onion viðskeyti, vefsvæði sem gefa útgefendum efnis og þeim sem skoða það aukna vernd gagnvart ritskoðun. Onion-þjónustur gera öllum kleift að birta efni eða eigin þjónustu nafnlaust. Smelltu hér fyrir neðan til að skoða onion-vefsvæði DuckDuckGo. onboarding.tour-tor-onion-services.button=Heimsækja Onion-vef # Circuit Display onboarding. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed
commit f3ca8ea2f2a433abaa637242ebfc45988da48d98 Author: Translation commit bot Date: Wed Feb 13 08:19:18 2019 + Update translations for torbutton-browseronboardingproperties_completed --- is/browserOnboarding.properties | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/is/browserOnboarding.properties b/is/browserOnboarding.properties index 893ce908e..4fedc9242 100644 --- a/is/browserOnboarding.properties +++ b/is/browserOnboarding.properties @@ -14,8 +14,8 @@ onboarding.tour-tor-privacy.button=Fara á Tor-netið onboarding.tour-tor-network=Tor-netið onboarding.tour-tor-network.title=Farðu um ómiðstýrt netkerfi. -onboarding.tour-tor-network.description=Tor-vafrinn tengir þig við Tor-netið sem rekið er af þúsundum sjálfboðaliða um vÃða veröld. ÃlÃkt VPN, þá er enginn einn punktur sem getur brugðist eða miðlægt firirbæri sem þú þarft að treysta til að geta notað netið án afskipta annarra. -onboarding.tour-tor-network.button=Farðu à birtingu rása +onboarding.tour-tor-network.description=Tor-vafrinn tengir þig við Tor-netið sem rekið er af þúsundum sjálfboðaliða um vÃða veröld. ÃlÃkt VPN, þá er enginn einn punktur sem getur brugðist eða miðlægt fyrirbæri sem þú þarft að treysta til að geta notað netið án afskipta annarra. +onboarding.tour-tor-network.button=Fara à birtingu rása onboarding.tour-tor-circuit-display=Birting rása onboarding.tour-tor-circuit-display.title=Skoðaðu slóðina þÃna @@ -29,12 +29,12 @@ onboarding.tour-tor-security.button=Yfirfara stillingar onboarding.tour-tor-expect-differences=Ãbendingar fyrir upplifunina onboarding.tour-tor-expect-differences.title=Gerður ráð fyrir að eitthvað verði öðruvÃsi. -onboarding.tour-tor-expect-differences.description=Vegna allra öryggis- og gagnaverndareiginleika Tor, þá gæti upplifun þÃn af vafri á internetinu orðið eilÃtið öðruvÃsi en annars. Hlutirnir gerast kannski aðeins hægar og það fer eftir öryggisstillingunum þÃnum hvort sum atriði virki eða birtist yfirhöfuð. Ãú gætir lÃka lent à þvà að vera reglulega spurð(ur) hvort þú sért mannvera eða vélmenni. -onboarding.tour-tor-expect-differences.button=Skoðaðu algengar spurningar - FAQ +onboarding.tour-tor-expect-differences.description=Vegna allra öryggis- og gagnaverndareiginleika Tor, þá gæti upplifun þÃn af vafri á internetinu orðið eilÃtið öðruvÃsi en annars væri. Hlutirnir gerast kannski aðeins hægar og það fer eftir öryggisstillingunum þÃnum hvort sum atriði virki eða birtist yfirhöfuð. Ãú gætir lÃka lent à þvà að vera reglulega spurð(ur) hvort þú sért mannvera eða vélmenni. +onboarding.tour-tor-expect-differences.button=Skoða algengar spurningar - FAQ onboarding.tour-tor-onion-services=Onion-þjónustur onboarding.tour-tor-onion-services.title=Fáðu viðbótaröryggi. -onboarding.tour-tor-onion-services.description=Onion-þjónustur eru vefsvæði sem enda á .onion viðskeyti, vefsvæði sem gefa útgefendum efnis og þeim sem skoða það aukna vernd gagnvart ritskoðun. Onion-þjónustur gera öllum kleift að birta efni eða eigin þjónustu nafnlaust. Smelltu hr fyrir neðan til að skoða onion-vefsvæði DuckDuckGo. +onboarding.tour-tor-onion-services.description=Onion-þjónustur eru vefsvæði sem enda á .onion viðskeyti, vefsvæði sem gefa útgefendum efnis og þeim sem skoða það aukna vernd gagnvart ritskoðun. Onion-þjónustur gera öllum kleift að birta efni eða eigin þjónustu nafnlaust. Smelltu hér fyrir neðan til að skoða onion-vefsvæði DuckDuckGo. onboarding.tour-tor-onion-services.button=Heimsækja Onion-vef # Circuit Display onboarding. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage
commit c57e4bbd329da936390ea8eada05639e377a1d0a Author: Translation commit bot Date: Wed Feb 13 08:45:06 2019 + Update translations for abouttor-homepage --- is/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/aboutTor.dtd b/is/aboutTor.dtd index 0a259108c..266cbe106 100644 --- a/is/aboutTor.dtd +++ b/is/aboutTor.dtd @@ -7,7 +7,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot
commit ce86895d2d864ae7fd4994b65e817a5c7f25e222 Author: Translation commit bot Date: Wed Feb 13 08:45:31 2019 + Update translations for donatepages-messagespot --- locale/ro/LC_MESSAGES/messages.po | 108 +- 1 file changed, 61 insertions(+), 47 deletions(-) diff --git a/locale/ro/LC_MESSAGES/messages.po b/locale/ro/LC_MESSAGES/messages.po index be0bba0f7..b4cdbe48f 100644 --- a/locale/ro/LC_MESSAGES/messages.po +++ b/locale/ro/LC_MESSAGES/messages.po @@ -295,23 +295,23 @@ msgstr "donaÈie de minim $2" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:209 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:209 msgid "$ other" -msgstr "" +msgstr "alte $" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:216 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:216 msgid "Choose your gift as a token of our thanks." -msgstr "" +msgstr "AlegeÈi-vÄ cadoul ca semn al mulÈumirii noastre." #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:223 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:223 msgid "No thanks, I don't want a gift." -msgstr "" +msgstr "Nu mulÈumesc, nu doresc un cadou." #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:225 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:225 #, php-format msgid "I would prefer 100% of my donation to go to the Tor Project's work." -msgstr "" +msgstr "AÈ prefera ca 100% din donaÈia mea sÄ ajungÄ la lucrarea Tor Project." #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:236 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:236 @@ -324,15 +324,17 @@ msgid "" "A collection of our favorite logo stickers for decorating your stuff and " "covering your cams." msgstr "" +"O colecÈie din autocolantele noastre favorite pentru a vÄ decora lucrurile " +"Èi pentru a vÄ acoperi camerele web." #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:253 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:253 msgid "t-shirt" -msgstr "" +msgstr "tricou" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:259 msgid "$15" -msgstr "" +msgstr "$15" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:261 msgid "OFF" @@ -384,12 +386,12 @@ msgstr "" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:330 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:324 msgid "how do you want to DONATE?" -msgstr "" +msgstr "cum doriÈi sÄ DONAÈI?" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:336 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:330 msgid "Credit Card" -msgstr "" +msgstr "Credit Card" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:352 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:346 @@ -399,27 +401,27 @@ msgstr "" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:356 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:350 msgid "* required fields" -msgstr "" +msgstr "* câmpuri obligatorii" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:361 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:355 msgid "First Name" -msgstr "" +msgstr "Prenume" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:365 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:359 msgid "Last Name" -msgstr "" +msgstr "Nume" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:371 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:365 msgid "Street Address" -msgstr "" +msgstr "Strada" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:375 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:369 msgid "Apt." -msgstr "" +msgstr "Apt." #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:385 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:379 @@ -
[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
commit 98cf93392911c073bc943b17983612f8d3c8e43f Author: Translation commit bot Date: Wed Feb 13 08:45:14 2019 + Update translations for abouttor-homepage_completed --- is/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/aboutTor.dtd b/is/aboutTor.dtd index 0a259108c..266cbe106 100644 --- a/is/aboutTor.dtd +++ b/is/aboutTor.dtd @@ -7,7 +7,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot
commit 05fc47dee9ec30d29ab18447df271330647f65aa Author: Translation commit bot Date: Wed Feb 13 09:15:26 2019 + Update translations for donatepages-messagespot --- locale/ro/LC_MESSAGES/messages.po | 117 ++ 1 file changed, 107 insertions(+), 10 deletions(-) diff --git a/locale/ro/LC_MESSAGES/messages.po b/locale/ro/LC_MESSAGES/messages.po index b4cdbe48f..5b429420d 100644 --- a/locale/ro/LC_MESSAGES/messages.po +++ b/locale/ro/LC_MESSAGES/messages.po @@ -781,20 +781,25 @@ msgid "" "href=\"https://www.torproject.org/download/download-easy.html.en\";>Tor " "Browser, which enables people to browse the internet anonymously." msgstr "" +"Produsul principal al Tor Project este https://www.torproject.org/download/download-easy.html.en\";>Tor " +"Browser, care permite utilizatorilor sÄ navigheze anonim pe internet." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:74 msgid "" "The Tor Project is a 501(c)3 tax-exempt non-profit organization based in " "Boston, Massachusetts." msgstr "" +"Proiectul Tor este o organizaÈie non-profit cu scutirea de taxe 501 (c) 3, " +"cu sediul în Boston, Massachusetts." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:76 msgid "It was founded in 2006." -msgstr "" +msgstr "A fost fondatÄ Ã®n 2006." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:82 msgid "Who works for the Tor Project, and what do they do?" -msgstr "" +msgstr "Cine lucreazÄ pentru Tor Project Èi ce fac ei?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:86 msgid "" @@ -803,11 +808,17 @@ msgid "" "cryptographers, computer scientists, and privacy advocates, and most are not" " paid by the Tor Project." msgstr "" +"Mii de oameni din întreaga lume sprijinÄ activ Tor Project, inclusiv " +"dezvoltatori, designeri, operatori de releu, cercetÄtori, criptologi, oameni" +" de ÈtiinÈÄ Èi avocaÈi de confidenÈialitate, iar majoritatea nu sunt plÄtiÈi" +" de Tor Project." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:88 msgid "" "The paid staff of the Tor Project is very small: about 47 people in total." msgstr "" +"Personalul plÄtit al Tor Project este foarte mic: aproximativ 47 de persoane" +" în total." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:90 msgid "" @@ -816,30 +827,40 @@ msgid "" "href=\"https://www.torproject.org/about/corepeople.html.en\";>Core People page." msgstr "" +"PuteÈi citi despre cei care contribuie la Tor Project pe https://www.torproject.org/about/corepeople.html.en\";>pagina Core People." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:95 msgid "Who uses Tor?" -msgstr "" +msgstr "Cine foloseÈte Tor?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:99 msgid "" "The vast majority of Tor users are ordinary people who want control of their" " privacy online or people whose internet use is censored." msgstr "" +"Marea majoritate a utilizatorilor Tor sunt oameni obiÈnuiÈi care doresc " +"controlul confidenÈialitÄÈii lor online sau persoane la care internetul este" +" cenzurat." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:101 msgid "" "Other Tor users are journalists, human rights defenders, domestic violence " "survivors, policymakers, diplomats, and academic and research institutions." msgstr "" +"AlÈi utilizatori Tor sunt jurnaliÈti, apÄrÄtori ai drepturilor omului, " +"supravieÈuitori ai violenÈei domestice, politicieni, diplomaÈi Èi instituÈii" +" academice Èi de cercetare." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:107 msgid "Can anyone use Tor?" -msgstr "" +msgstr "Tor poate fi folosit de oricine?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:111 msgid "Yes! Tor is free, and anyone can use it." -msgstr "" +msgstr "Da! Tor este gratuit Èi oricine îl poate folosi." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:113 msgid "" @@ -847,6 +868,9 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en\";>download Tor Browser." msgstr "" +"Pentru a începe, va trebui sÄ https://www.torproject.org/projects/torbrowser.html.en\";>descÄrcaÈi Tor Browser." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:115 msgid "" @@ -858,14 +882,21 @@ msgid "" "OS X and https://www.torproject.org/projects/torbrowser.html.en#linux\";>Linux." msgstr "" +"VÄ oferim instrucÈiuni cu privire la modul de descÄrcare pentru https://www.torproject.org/projects/t
[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot
commit e7c7f2df4a5682208668adb42132134b7ad50ce0 Author: Translation commit bot Date: Wed Feb 13 09:45:27 2019 + Update translations for donatepages-messagespot --- locale/ro/LC_MESSAGES/messages.po | 101 -- 1 file changed, 86 insertions(+), 15 deletions(-) diff --git a/locale/ro/LC_MESSAGES/messages.po b/locale/ro/LC_MESSAGES/messages.po index 5b429420d..ca1502936 100644 --- a/locale/ro/LC_MESSAGES/messages.po +++ b/locale/ro/LC_MESSAGES/messages.po @@ -1143,15 +1143,18 @@ msgid "" "Tor Project's independence and ensure the sustainability of the products and" " services we provide." msgstr "" +"Astfel, vÄ solicitÄm sÄ vÄ ajutaÈi financiar, sÄ creÈteÈi independenÈa Tor " +"Project Èi sÄ vÄ asiguraÈi de durabilitatea produselor Èi serviciilor pe " +"care le furnizÄm." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:224 msgid "" "How much money does the Tor Project spend annually, and what is it used for?" -msgstr "" +msgstr "CâÈi bani cheltuieÈte anual Tor Project Èi la ce se utilizeazÄ?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:228 msgid "The Tor Project spends about $4 million annually." -msgstr "" +msgstr "Tor Project cheltuie anual aproximativ 4 milioane $." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:230 #, php-format @@ -1159,32 +1162,40 @@ msgid "" "About 80% of the Tor Project's spending goes to staffing, mostly software " "engineers." msgstr "" +"Aproximativ 80% din cheltuielile cu Tor Project sunt folosite de personal, " +"în special de inginerii software." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:232 msgid "" "About 10% goes towards administrative costs such as accounting and legal " "costs and bank fees." msgstr "" +"Aproximativ 10% se referÄ la costuri administrative, cum ar fi costurile " +"contabile Èi juridice Èi comisioanele bancare." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:234 msgid "" "The remaining 10% is spent on travel, meetings and conferences, which are " "important for Tor because the Tor community is global." msgstr "" +"Restul de 10% sunt cheltuiÈi pentru cÄlÄtorii, întâlniri Èi conferinÈe, care" +" sunt importante pentru Tor, deoarece comunitatea Tor este globalÄ." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:240 msgid "Is my donation tax-deductible?" -msgstr "" +msgstr "DonaÈia mea este deductibilÄ?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:244 msgid "" "If you pay taxes in the United States, your donation to Tor is tax " "deductible to the full extent required by law." msgstr "" +"DacÄ plÄtiÈi impozite în Statele Unite, donaÈia dvs. cÄtre Tor este " +"deductibilÄ la platÄ, în mÄsura în care acest lucru este impus de lege." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:246 msgid "Following is information you may need for reporting purposes:" -msgstr "" +msgstr "UrmÄtoarele informaÈii sunt necesare pentru raportare:" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:251 msgid "" @@ -1196,31 +1207,43 @@ msgid "" " Phone number: 206-420-3136\n" " Contact person: Isabela Bagueros, Executive Director" msgstr "" +"NUmÄrul ID pentru taxa Tor Project (EIN #): 20-8096820\n" +" Adresa:\n" +" The Tor Project, Inc.\n" +" 217 First Avenue South #4903\n" +" Seattle, WA 98194\n" +" NUmÄr de telefon: 206-420-3136\n" +" PersoanÄ de contact: Isabela Bagueros, Director Executiv" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:264 msgid "If I am not in the United States, can I still donate?" -msgstr "" +msgstr "DacÄ nu sunt din Statele Unite, pot face o donaÈie?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:268 msgid "Yes, definitely." -msgstr "" +msgstr "Da, desigur." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:270 msgid "" "Your donation probably isn't tax-deductible (unless you pay taxes on U.S. " "income) but we would very much appreciate your support." msgstr "" +"DonaÈia dvs. probabil nu este deductibilÄ din impozit (cu excepÈia cazului " +"în care plÄtiÈi impozite pe veniturile din S.U.A.), dar vÄ mulÈumim foarte " +"mult pentru sprijinul acordat." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:276 msgid "" "Can I donate to a specific project, or restrict my donation to a particular " "purpose?" msgstr "" +"Pot s
[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot
commit 158a2a8c39017c3b8d30f615c4c984af95f69fbd Author: Translation commit bot Date: Wed Feb 13 10:15:28 2019 + Update translations for donatepages-messagespot --- locale/ro/LC_MESSAGES/messages.po | 43 +-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/locale/ro/LC_MESSAGES/messages.po b/locale/ro/LC_MESSAGES/messages.po index ca1502936..dae3b2203 100644 --- a/locale/ro/LC_MESSAGES/messages.po +++ b/locale/ro/LC_MESSAGES/messages.po @@ -1449,12 +1449,16 @@ msgid "" "There are probably other ways to donate anonymously that we haven't thought " "of-- maybe you will :)" msgstr "" +"Probabil cÄ existÄ Èi alte modalitÄÈi de a dona anonim la care nu ne-am " +"gândit încÄ... poate o veÈi face dvs. :)" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:387 msgid "" "Is the Tor Project required to identify me as a donor to the United States " "government, or to any other authority?" msgstr "" +"Este necesar ca Tor Project sÄ mÄ identifice ca donator cÄtre guvernul " +"Statelor Unite sau cÄtre oricare altÄ autoritate?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:391 msgid "" @@ -1462,6 +1466,9 @@ msgid "" "required to report the donation amount and your name and address (if we have" " it) to the IRS, on Schedule B of the Form 990, which is filed annually." msgstr "" +"DacÄ donaÈi 5.000 $ sau mai mult pentru Tor Project într-un singur an, " +"suntem obligaÈi sÄ raportÄm suma donaÈiei Èi numele Èi adresa dvs. (dacÄ le " +"avem) cÄtre IRS, pe Schema B a Formularului 990, care este depusÄ anual ." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:393 msgid "" @@ -1469,44 +1476,57 @@ msgid "" "from the copy of the 990 that's made publicly-available, and that's what we " "do." msgstr "" +"Cu toate acestea, este normal ca organizaÈiile nonprofit sÄ redacteze " +"informaÈii individuale ale donatorilor din copia documentului 990, care a " +"devenit disponibil publicului, Èi asta facem." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:395 msgid "" "We are not required to identify donors to any other organization or " "authority, and we do not." msgstr "" +"Nu suntem obligaÈi sÄ identificÄm donatorii oricÄrei alte organizaÈii sau " +"autoritÄÈi, Èi nici nu facem acest lucru." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:397 msgid "" "(Also, if you wanted, you could give us $4,999 in late 2018 and $4,999 in " "early 2019.)" msgstr "" +"(De asemenea, dacÄ doriÈi, aÈi putea sÄ ne daÈi 4.999 dolari la sfârÈitul " +"anului 2018 Èi 4.999 dolari la începutul anului 2019.)" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:403 msgid "" "In your privacy policy, you say you will never publicly identify me as a " "donor without my permission." msgstr "" +"Ãn politica dvs. de confidenÈialitate, spuneÈi cÄ niciodatÄ nu mÄ veÈi " +"identifica public în calitate de donator fÄrÄ permisiunea mea." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:405 msgid "What does that mean?" -msgstr "" +msgstr "Ce înseamnÄ asta?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:409 msgid "Yes, that's right." -msgstr "" +msgstr "Da, aÈa e." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:411 msgid "" "If you donate to the Tor Project, there will be some people at the Tor " "Project who know about your donation." msgstr "" +"DacÄ faceÈi o donaÈie cÄtre Tor Project, vor exista persoane de la Tor " +"Project care Ètiu despre donaÈia dumneavoastrÄ." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:413 msgid "" "However, we will never publicly identify you as a donor, unless you have " "given us permission to do so." msgstr "" +"Cu toate acestea, nu vÄ vom identifica niciodatÄ Ã®n mod public ca donator, " +"cu excepÈia cazului în care ne-aÈi dat permisiunea sÄ facem acest lucru." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:415 msgid "" @@ -1514,24 +1534,33 @@ msgid "" "do anything else that would publicly identify you as someone who has " "donated." msgstr "" +"Asta înseamnÄ cÄ nu vÄ vom posta numele pe site-ul nostru, nu vÄ mulÈumim pe" +" Twitter sau nu facem altceva care v-ar putea identifica public ca pe cineva" +" care a donat." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:417 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
[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot
commit ec7cd71f739c5ef1c36eecaa04ca7fc84dcfc5dd Author: Translation commit bot Date: Wed Feb 13 10:45:27 2019 + Update translations for donatepages-messagespot --- locale/ro/LC_MESSAGES/messages.po | 72 +++ 1 file changed, 57 insertions(+), 15 deletions(-) diff --git a/locale/ro/LC_MESSAGES/messages.po b/locale/ro/LC_MESSAGES/messages.po index dae3b2203..e54787f34 100644 --- a/locale/ro/LC_MESSAGES/messages.po +++ b/locale/ro/LC_MESSAGES/messages.po @@ -1592,7 +1592,7 @@ msgid "" "can donate?" msgstr "" "DacÄ nu vreau sÄ folosesc cardul de credit sau PayPal? ExistÄ o altÄ " -"modalitate prin care pot sÄ dau?" +"modalitate prin care pot sÄ fac o donaÈie?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:441 msgid "" @@ -1600,26 +1600,34 @@ msgid "" "options.html.en\" class=\"hyperlinks links\" target=\"_blank\">other ways " "you can donate." msgstr "" +"Da! IatÄ o listÄ cu https://www.torproject.org/donate/donate-"; +"options.html.en\" class=\"hyperlinks links\" target=\"_blank\">alte " +"modalitÄÈi prin care puteÈi face o donaÈie." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:448 msgid "What is your donor privacy policy?" -msgstr "" +msgstr "Care este politica de confidenÈialitate a donatorului dvs.?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:452 msgid "" "Here is the Tor Project donor privacy policy." msgstr "" +"Aici se aflÄ politica de confidenÈialitate pentru " +"donaÈii cÄtre Tor Project ." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:458 msgid "What is your refund policy?" -msgstr "" +msgstr "Care este politica dvs. de rambursare?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:462 msgid "" "If you want your donation refunded, please tell us by emailing giving(at)torproject.org." msgstr "" +"DacÄ doriÈi sÄ vi se ramburseze donaÈia, vÄ rugÄm sÄ ne trimiteÈi un e-mail " +"la adresa giving(at)torproject.org." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:464 msgid "" @@ -1627,10 +1635,13 @@ msgid "" "amount you donated, your full name, the payment method you used and your " "country of origin." msgstr "" +"Pentru a procesa rambursarea, trebuie sÄ cunoaÈtem data donÄrii, suma pe " +"care aÈi donat-o, numele dvs. complet, metoda de platÄ utilizatÄ Èi Èara " +"dvs. de origine." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:466 msgid "Please also tell us why you're asking for a refund." -msgstr "" +msgstr "De asemenea, spuneÈi-ne de ce cereÈi o rambursare." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:468 msgid "" @@ -1638,10 +1649,14 @@ msgid "" " to be made in a specific way, so we may need additional information from " "you in order to process yours." msgstr "" +"ReÈineÈi cÄ anumite metode de platÄ nu vor accepta rambursÄri sau vor fi " +"solicitate pentru a fi efectuate într-un mod specific, aÈa cÄ este posibil " +"sÄ avem nevoie de informaÈii suplimentare de la dvs. pentru a procesa " +"rambursarea dvs." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:474 msgid "Can I donate by mail?" -msgstr "" +msgstr "Pot sÄ fac o donaÈie prin poÈtÄ?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:478 #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:584 @@ -1653,10 +1668,12 @@ msgid "" "Our mailing address is The Tor Project, 217 First Avenue South #4903, " "Seattle WA 98194, USA" msgstr "" +"Adresa noastrÄ este The Tor Project, 217 First Avenue South #4903, Seattle " +"WA 98194, USA" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:486 msgid "Do you accept cash donations?" -msgstr "" +msgstr "AcceptaÈi donaÈii în numerar?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:490 msgid "Yes" @@ -1695,13 +1712,15 @@ msgstr "" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:512 msgid "Can I become a Tor Project member?" -msgstr "" +msgstr "Pot deveni membru al Tor Project?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:516 msgid "" "Right now, we don't have a membership program, but we may set one up in the " "future." msgstr "" +"Ãn momentul de faÈÄ, nu avem un program de aderare, dar putem stabili unul " +"în viitor." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:518 msgid "" @@ -1710,10 +1729,14 @@
[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot
commit 3b23c5c7362d4adef55f4c24437a6bc7facdc4df Author: Translation commit bot Date: Wed Feb 13 11:15:27 2019 + Update translations for donatepages-messagespot --- locale/ro/LC_MESSAGES/messages.po | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/locale/ro/LC_MESSAGES/messages.po b/locale/ro/LC_MESSAGES/messages.po index e54787f34..38092a874 100644 --- a/locale/ro/LC_MESSAGES/messages.po +++ b/locale/ro/LC_MESSAGES/messages.po @@ -1939,11 +1939,11 @@ msgstr "" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:48 msgid "Classic" -msgstr "" +msgstr "Clasic" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:56 msgid "European" -msgstr "" +msgstr "European" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:66 msgid "Size" @@ -1951,7 +1951,7 @@ msgstr "MÄrime" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:70 msgid "Select Size" -msgstr "" +msgstr "SelectaÈi mÄrimea" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:74 msgid "S" @@ -1963,12 +1963,12 @@ msgstr "M" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:82 msgid "L" -msgstr "" +msgstr "L" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:86 msgid "XL" -msgstr "" +msgstr "XL" #: tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:90 msgid "XXL" -msgstr "" +msgstr "XXL" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup
commit d985235437df2d8a9f399e4482da418f5e38b126 Author: Translation commit bot Date: Wed Feb 13 12:47:11 2019 + Update translations for tails-persistence-setup --- gl/gl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gl/gl.po b/gl/gl.po index dd86448f6..165012ea5 100644 --- a/gl/gl.po +++ b/gl/gl.po @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" "POT-Creation-Date: 2018-11-01 12:21+0100\n" -"PO-Revision-Date: 2019-02-06 11:54+\n" -"Last-Translator: Oscar Guardiola \n" +"PO-Revision-Date: 2019-02-13 12:26+\n" +"Last-Translator: Pilar Fernández Pazos \n" "Language-Team: Galician (http://www.transifex.com/otf/torproject/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'ticket28668_035' into ticket28668_040
commit bbe417ae8f2eff9b1ec50411dc50d4f0281c1778 Merge: d23704bf2 d71ca3968 Author: Nick Mathewson Date: Wed Jan 23 17:08:36 2019 -0500 Merge branch 'ticket28668_035' into ticket28668_040 src/test/test_util.c | 3 +++ 1 file changed, 3 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.5] Merge branch 'tor-github/pr/650' into maint-0.3.5
commit 6efc2a0e1f785e1e12fb8c7fd4b6aa4feceb647a Merge: 2e770216c d71ca3968 Author: David Goulet Date: Wed Feb 13 10:56:24 2019 -0500 Merge branch 'tor-github/pr/650' into maint-0.3.5 changes/bug29161| 3 +++ changes/ticket28668 | 3 +++ changes/ticket29160 | 4 src/lib/encoding/time_fmt.c | 4 src/test/test_address.c | 3 +-- src/test/test_util.c| 24 src/test/testing_common.c | 18 ++ 7 files changed, 57 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'ticket28668_035' into ticket28668_040
commit 3baf99e81bcded352b8e8a3416148e53a4801a11 Merge: 16430fdaf f684cd800 Author: Nick Mathewson Date: Wed Jan 16 15:54:31 2019 -0500 Merge branch 'ticket28668_035' into ticket28668_040 changes/ticket28668 | 3 +++ src/test/testing_common.c | 18 ++ 2 files changed, 21 insertions(+) diff --cc src/test/testing_common.c index 4e603b529,62d40a42f..8fc8ef783 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@@ -287,7 -304,14 +297,15 @@@ main(int c, const char **v s.masks[LOG_WARN-LOG_ERR] |= LD_BUG; add_stream_log(&s, "", fileno(stdout)); } + { + /* Setup logs that cause failure. */ + log_severity_list_t s; + memset(&s, 0, sizeof(s)); + set_log_severity_config(LOG_ERR, LOG_ERR, &s); + s.masks[LOG_WARN-LOG_ERR] |= LD_BUG; + add_callback_log(&s, log_callback_failure); + } + flush_log_messages_from_startup(); init_protocol_warning_severity_level(); options->command = CMD_RUN_UNITTESTS; ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.5] Capture more BUG warnings in util/time test
commit 6144cf99adae5ffebbc549a4e0f3c6e05e51ad16 Author: Nick Mathewson Date: Wed Jan 23 12:37:12 2019 -0500 Capture more BUG warnings in util/time test These are ones that happen on windows only. Fixes bug 29161. --- changes/bug29161| 3 +++ src/lib/encoding/time_fmt.c | 4 src/test/test_util.c| 21 + 3 files changed, 28 insertions(+) diff --git a/changes/bug29161 b/changes/bug29161 new file mode 100644 index 0..39a638acf --- /dev/null +++ b/changes/bug29161 @@ -0,0 +1,3 @@ + o Minor bugfixes (tests): +- Detect and suppress "bug" warnings from the util/time test on Windows. + Fixes bug 29161; bugfix on 0.2.9.3-alpha. diff --git a/src/lib/encoding/time_fmt.c b/src/lib/encoding/time_fmt.c index 5b2440d1a..40543d41e 100644 --- a/src/lib/encoding/time_fmt.c +++ b/src/lib/encoding/time_fmt.c @@ -39,6 +39,8 @@ * * Convert *timep to a struct tm in local time, and store the value in * *result. Return the result on success, or NULL on failure. + * + * Treat malformatted inputs localtime outputs as a BUG. */ struct tm * tor_localtime_r(const time_t *timep, struct tm *result) @@ -56,6 +58,8 @@ tor_localtime_r(const time_t *timep, struct tm *result) * * Convert *timep to a struct tm in UTC, and store the value in * *result. Return the result on success, or NULL on failure. + * + * Treat malformatted inputs or gmtime outputs as a BUG. */ struct tm * tor_gmtime_r(const time_t *timep, struct tm *result) diff --git a/src/test/test_util.c b/src/test/test_util.c index 089c1f1d7..6a7b42b78 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -690,6 +690,12 @@ test_util_time(void *arg) expect_single_log_msg_containing(msg); \ teardown_capture_of_logs(); \ } while (0) +#define CHECK_POSSIBLE_EINVAL() do {\ +if (mock_saved_log_n_entries()) { \ + expect_single_log_msg_containing("Invalid argument"); \ +} \ +teardown_capture_of_logs(); \ + } while (0) #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \ CHECK_TIMEGM_WARNING("Out-of-range argument to tor_timegm") @@ -885,12 +891,16 @@ test_util_time(void *arg) if (sizeof(time_t) == 4 || sizeof(time_t) == 8) { t_res = -1*(1 << 30); +CAPTURE(); tor_gmtime_r(&t_res, &b_time); +CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1935-1900)); t_res = INT32_MIN; +CAPTURE(); tor_gmtime_r(&t_res, &b_time); +CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1901-1900)); } @@ -900,7 +910,9 @@ test_util_time(void *arg) /* one of the smallest tm_year values my 64 bit system supports: * b_time.tm_year == (-292275055LL-1900LL) without clamping */ t_res = -9223372036854775LL; +CAPTURE(); tor_gmtime_r(&t_res, &b_time); +CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1-1900)); @@ -926,7 +938,9 @@ test_util_time(void *arg) { /* As above, but with localtime. */ t_res = -9223372036854775LL; +CAPTURE(); tor_localtime_r(&t_res, &b_time); +CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1-1900)); @@ -983,7 +997,9 @@ test_util_time(void *arg) /* one of the largest tm_year values my 64 bit system supports: * b_time.tm_year == (292278994L-1900L) without clamping */ t_res = 9223372036854775LL; +CAPTURE(); tor_gmtime_r(&t_res, &b_time); +CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (2037-1900) || b_time.tm_year == (-1900)); @@ -1004,7 +1020,9 @@ test_util_time(void *arg) { /* As above but with localtime. */ t_res = 9223372036854775LL; +CAPTURE(); tor_localtime_r(&t_res, &b_time); +CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (2037-1900) || b_time.tm_year == (-1900)); @@ -1216,7 +1234,9 @@ test_util_time(void *arg) /* This value is out of range with 32 bit time_t, but in range for 64 bit * time_t */ tv.tv_sec = (time_t)215000UL; + CAPTURE(); format_iso_time(timestr, (time_t)tv.tv_sec); + CHECK_POSSIBLE_EINVAL(); #if SIZEOF_TIME_T == 4 /* format_iso_time should indicate failure on overflow, but it doesn't yet. * Hopefully #18480 will improve the failure semantics in this case. @@ -1231,6 +1251,7 @@ test_util_time(void *arg) #undef CAPTURE #undef CHECK_TIMEGM_ARG_OUT_OF_RANGE +#undef CHECK_POSSIBLE_EINVAL done: teardown_capture_of_logs(); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lis
[tor-commits] [tor/maint-0.3.5] test: Fix a warning underflow in rend_cache/clean
commit 2d74da3d0efd7a67f9bdb73145c38fe047faf1f8 Author: David Goulet Date: Thu Nov 29 10:02:50 2018 -0500 test: Fix a warning underflow in rend_cache/clean Because the test is adding entries to the "rend_cache" directly, the rend_cache_increment_allocation() was never called which made the rend_cache_clean() call trigger that underflow warning: rend_cache/clean: [forking] Nov 29 09:55:04.024 [warn] rend_cache_decrement_allocation(): Bug: Underflow in rend_cache_decrement_allocation (on Tor 0.4.0.0-alpha-dev 2240fe63feb9a8cf) The test is still good and valid. Fixes #28660 Signed-off-by: David Goulet --- src/test/test_rendcache.c | 4 1 file changed, 4 insertions(+) diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index 7ec4771b6..4f544cf21 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -788,7 +788,9 @@ test_rend_cache_clean(void *data) desc_two->pk = pk_generate(1); strmap_set_lc(rend_cache, "foo1", one); + rend_cache_increment_allocation(rend_cache_entry_allocation(one)); strmap_set_lc(rend_cache, "foo2", two); + rend_cache_increment_allocation(rend_cache_entry_allocation(two)); rend_cache_clean(time(NULL), REND_CACHE_TYPE_CLIENT); tt_int_op(strmap_size(rend_cache), OP_EQ, 0); @@ -806,7 +808,9 @@ test_rend_cache_clean(void *data) desc_one->pk = pk_generate(0); desc_two->pk = pk_generate(1); + rend_cache_increment_allocation(rend_cache_entry_allocation(one)); strmap_set_lc(rend_cache, "foo1", one); + rend_cache_increment_allocation(rend_cache_entry_allocation(two)); strmap_set_lc(rend_cache, "foo2", two); rend_cache_clean(time(NULL), REND_CACHE_TYPE_CLIENT); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.5] Another case of possible gmtime angst.
commit d71ca3968213ea2ed6e30e7a1a5478db759a61e5 Author: Nick Mathewson Date: Wed Jan 23 17:07:39 2019 -0500 Another case of possible gmtime angst. --- src/test/test_util.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 6a7b42b78..4701fadf1 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1065,7 +1065,10 @@ test_util_time(void *arg) /* This value is out of range with 32 bit time_t, but in range for 64 bit * time_t */ + CAPTURE(); format_rfc1123_time(timestr, (time_t)215000UL); + CHECK_POSSIBLE_EINVAL(); + #if SIZEOF_TIME_T == 4 #if 0 /* Wrapping around will have made it this. */ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.5] If address/get_if_addrs6 can't findipv6, log WARN, not ERR
commit 54c9c8b04f6055dc4101b6a36cfb587af78dc9b4 Author: Nick Mathewson Date: Wed Jan 23 12:04:57 2019 -0500 If address/get_if_addrs6 can't findipv6, log WARN, not ERR Fixes 29160, and allows 28668 (treating ERR logs as test failures) to procede. --- changes/ticket29160 | 4 src/test/test_address.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket29160 b/changes/ticket29160 new file mode 100644 index 0..8e1118306 --- /dev/null +++ b/changes/ticket29160 @@ -0,0 +1,4 @@ + o Minor bugfixes (tests): +- Do not log an error-level message if we fail to find an IPv6 + network interface from the unit tests. Fixes bug 29160; bugfix on + 0.2.7.3-rc. diff --git a/src/test/test_address.c b/src/test/test_address.c index 43467aca1..cfb32b855 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -1013,7 +1013,7 @@ test_address_get_if_addrs6(void *arg) (void)arg; - rv = get_interface_address6(LOG_ERR, AF_INET6, &tor_addr); + rv = get_interface_address6(LOG_WARN, AF_INET6, &tor_addr); /* Work even on systems without IPv6 interfaces */ if (rv == 0) { @@ -1204,4 +1204,3 @@ struct testcase_t address_tests[] = { ADDRESS_TEST(tor_addr_in_same_network_family, 0), END_OF_TESTCASES }; - ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.5] Fail any unit test that causes an unhandled LD_BUG or LOG_ERR
commit f684cd800577144a48e112951eaf4ddc602ad26a Author: Nick Mathewson Date: Wed Jan 16 15:47:33 2019 -0500 Fail any unit test that causes an unhandled LD_BUG or LOG_ERR Closes ticket 28668. --- changes/ticket28668 | 3 +++ src/test/testing_common.c | 18 ++ 2 files changed, 21 insertions(+) diff --git a/changes/ticket28668 b/changes/ticket28668 new file mode 100644 index 0..6386e0051 --- /dev/null +++ b/changes/ticket28668 @@ -0,0 +1,3 @@ + o Minor features (testing): +- Treat all unexpected ERR and BUG messages as test failures. + Closes ticket 28668. diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 60015f3c2..62d40a42f 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -239,6 +239,15 @@ tinytest_postfork(void) init_pregenerated_keys(); } +static void +log_callback_failure(int severity, uint32_t domain, const char *msg) +{ + (void)msg; + if (severity == LOG_ERR || (domain & LD_BUG)) { +tinytest_set_test_failed_(); + } +} + /** Main entry point for unit test code: parse the command line, and run * some unit tests. */ int @@ -287,6 +296,7 @@ main(int c, const char **v) c = i_out; { +/* setup logs to stdout */ log_severity_list_t s; memset(&s, 0, sizeof(s)); set_log_severity_config(loglevel, LOG_ERR, &s); @@ -294,6 +304,14 @@ main(int c, const char **v) s.masks[LOG_WARN-LOG_ERR] |= LD_BUG; add_stream_log(&s, "", fileno(stdout)); } + { +/* Setup logs that cause failure. */ +log_severity_list_t s; +memset(&s, 0, sizeof(s)); +set_log_severity_config(LOG_ERR, LOG_ERR, &s); +s.masks[LOG_WARN-LOG_ERR] |= LD_BUG; +add_callback_log(&s, log_callback_failure); + } init_protocol_warning_severity_level(); options->command = CMD_RUN_UNITTESTS; ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Fail any unit test that causes an unhandled LD_BUG or LOG_ERR
commit f684cd800577144a48e112951eaf4ddc602ad26a Author: Nick Mathewson Date: Wed Jan 16 15:47:33 2019 -0500 Fail any unit test that causes an unhandled LD_BUG or LOG_ERR Closes ticket 28668. --- changes/ticket28668 | 3 +++ src/test/testing_common.c | 18 ++ 2 files changed, 21 insertions(+) diff --git a/changes/ticket28668 b/changes/ticket28668 new file mode 100644 index 0..6386e0051 --- /dev/null +++ b/changes/ticket28668 @@ -0,0 +1,3 @@ + o Minor features (testing): +- Treat all unexpected ERR and BUG messages as test failures. + Closes ticket 28668. diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 60015f3c2..62d40a42f 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -239,6 +239,15 @@ tinytest_postfork(void) init_pregenerated_keys(); } +static void +log_callback_failure(int severity, uint32_t domain, const char *msg) +{ + (void)msg; + if (severity == LOG_ERR || (domain & LD_BUG)) { +tinytest_set_test_failed_(); + } +} + /** Main entry point for unit test code: parse the command line, and run * some unit tests. */ int @@ -287,6 +296,7 @@ main(int c, const char **v) c = i_out; { +/* setup logs to stdout */ log_severity_list_t s; memset(&s, 0, sizeof(s)); set_log_severity_config(loglevel, LOG_ERR, &s); @@ -294,6 +304,14 @@ main(int c, const char **v) s.masks[LOG_WARN-LOG_ERR] |= LD_BUG; add_stream_log(&s, "", fileno(stdout)); } + { +/* Setup logs that cause failure. */ +log_severity_list_t s; +memset(&s, 0, sizeof(s)); +set_log_severity_config(LOG_ERR, LOG_ERR, &s); +s.masks[LOG_WARN-LOG_ERR] |= LD_BUG; +add_callback_log(&s, log_callback_failure); + } init_protocol_warning_severity_level(); options->command = CMD_RUN_UNITTESTS; ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Fix a LOG_ERR message from test_pt.c
commit 3da3aca08f022f6c1e33a06afe4e30804754d005 Author: Nick Mathewson Date: Wed Jan 16 15:54:35 2019 -0500 Fix a LOG_ERR message from test_pt.c Fixes an instance of ticket28668. --- src/test/test_pt.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/test/test_pt.c b/src/test/test_pt.c index bacb6d5a3..8759f05e8 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -23,6 +23,8 @@ #include "app/config/or_state_st.h" +#include "test/log_test_helpers.h" + static void reset_mp(managed_proxy_t *mp) { @@ -414,7 +416,10 @@ test_pt_configure_proxy(void *arg) "650 TRANSPORT_LAUNCHED server mock5 127.0.0.1 \r\n"); /* Get the log message out. */ + setup_full_capture_of_logs(LOG_ERR); process_notify_event_stdout(mp->process); + expect_single_log_msg_containing("Oh noes, something bad happened"); + teardown_capture_of_logs(); tt_int_op(controlevent_n, OP_EQ, 10); tt_int_op(controlevent_event, OP_EQ, EVENT_PT_LOG); @@ -475,6 +480,7 @@ test_pt_configure_proxy(void *arg) } done: + teardown_capture_of_logs(); or_state_free(dummy_state); UNMOCK(process_read_stdout); UNMOCK(get_or_state); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'ticket28668_035' into ticket28668_040
commit d23704bf26ae6c00e97fb0c3ceb4a362c49eaf07 Merge: 3da3aca08 2d74da3d0 Author: Nick Mathewson Date: Wed Jan 23 14:50:22 2019 -0500 Merge branch 'ticket28668_035' into ticket28668_040 changes/bug29161| 3 +++ changes/ticket29160 | 4 src/lib/encoding/time_fmt.c | 4 src/test/test_address.c | 2 +- src/test/test_util.c| 21 + 5 files changed, 33 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] If address/get_if_addrs6 can't findipv6, log WARN, not ERR
commit 54c9c8b04f6055dc4101b6a36cfb587af78dc9b4 Author: Nick Mathewson Date: Wed Jan 23 12:04:57 2019 -0500 If address/get_if_addrs6 can't findipv6, log WARN, not ERR Fixes 29160, and allows 28668 (treating ERR logs as test failures) to procede. --- changes/ticket29160 | 4 src/test/test_address.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket29160 b/changes/ticket29160 new file mode 100644 index 0..8e1118306 --- /dev/null +++ b/changes/ticket29160 @@ -0,0 +1,4 @@ + o Minor bugfixes (tests): +- Do not log an error-level message if we fail to find an IPv6 + network interface from the unit tests. Fixes bug 29160; bugfix on + 0.2.7.3-rc. diff --git a/src/test/test_address.c b/src/test/test_address.c index 43467aca1..cfb32b855 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -1013,7 +1013,7 @@ test_address_get_if_addrs6(void *arg) (void)arg; - rv = get_interface_address6(LOG_ERR, AF_INET6, &tor_addr); + rv = get_interface_address6(LOG_WARN, AF_INET6, &tor_addr); /* Work even on systems without IPv6 interfaces */ if (rv == 0) { @@ -1204,4 +1204,3 @@ struct testcase_t address_tests[] = { ADDRESS_TEST(tor_addr_in_same_network_family, 0), END_OF_TESTCASES }; - ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.3.5'
commit d043096d596b7c83de354776a2ee1a799c8b6a5d Merge: d5de1a0a5 6efc2a0e1 Author: David Goulet Date: Wed Feb 13 11:02:09 2019 -0500 Merge branch 'maint-0.3.5' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Capture more BUG warnings in util/time test
commit 6144cf99adae5ffebbc549a4e0f3c6e05e51ad16 Author: Nick Mathewson Date: Wed Jan 23 12:37:12 2019 -0500 Capture more BUG warnings in util/time test These are ones that happen on windows only. Fixes bug 29161. --- changes/bug29161| 3 +++ src/lib/encoding/time_fmt.c | 4 src/test/test_util.c| 21 + 3 files changed, 28 insertions(+) diff --git a/changes/bug29161 b/changes/bug29161 new file mode 100644 index 0..39a638acf --- /dev/null +++ b/changes/bug29161 @@ -0,0 +1,3 @@ + o Minor bugfixes (tests): +- Detect and suppress "bug" warnings from the util/time test on Windows. + Fixes bug 29161; bugfix on 0.2.9.3-alpha. diff --git a/src/lib/encoding/time_fmt.c b/src/lib/encoding/time_fmt.c index 5b2440d1a..40543d41e 100644 --- a/src/lib/encoding/time_fmt.c +++ b/src/lib/encoding/time_fmt.c @@ -39,6 +39,8 @@ * * Convert *timep to a struct tm in local time, and store the value in * *result. Return the result on success, or NULL on failure. + * + * Treat malformatted inputs localtime outputs as a BUG. */ struct tm * tor_localtime_r(const time_t *timep, struct tm *result) @@ -56,6 +58,8 @@ tor_localtime_r(const time_t *timep, struct tm *result) * * Convert *timep to a struct tm in UTC, and store the value in * *result. Return the result on success, or NULL on failure. + * + * Treat malformatted inputs or gmtime outputs as a BUG. */ struct tm * tor_gmtime_r(const time_t *timep, struct tm *result) diff --git a/src/test/test_util.c b/src/test/test_util.c index 089c1f1d7..6a7b42b78 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -690,6 +690,12 @@ test_util_time(void *arg) expect_single_log_msg_containing(msg); \ teardown_capture_of_logs(); \ } while (0) +#define CHECK_POSSIBLE_EINVAL() do {\ +if (mock_saved_log_n_entries()) { \ + expect_single_log_msg_containing("Invalid argument"); \ +} \ +teardown_capture_of_logs(); \ + } while (0) #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \ CHECK_TIMEGM_WARNING("Out-of-range argument to tor_timegm") @@ -885,12 +891,16 @@ test_util_time(void *arg) if (sizeof(time_t) == 4 || sizeof(time_t) == 8) { t_res = -1*(1 << 30); +CAPTURE(); tor_gmtime_r(&t_res, &b_time); +CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1935-1900)); t_res = INT32_MIN; +CAPTURE(); tor_gmtime_r(&t_res, &b_time); +CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1901-1900)); } @@ -900,7 +910,9 @@ test_util_time(void *arg) /* one of the smallest tm_year values my 64 bit system supports: * b_time.tm_year == (-292275055LL-1900LL) without clamping */ t_res = -9223372036854775LL; +CAPTURE(); tor_gmtime_r(&t_res, &b_time); +CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1-1900)); @@ -926,7 +938,9 @@ test_util_time(void *arg) { /* As above, but with localtime. */ t_res = -9223372036854775LL; +CAPTURE(); tor_localtime_r(&t_res, &b_time); +CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1-1900)); @@ -983,7 +997,9 @@ test_util_time(void *arg) /* one of the largest tm_year values my 64 bit system supports: * b_time.tm_year == (292278994L-1900L) without clamping */ t_res = 9223372036854775LL; +CAPTURE(); tor_gmtime_r(&t_res, &b_time); +CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (2037-1900) || b_time.tm_year == (-1900)); @@ -1004,7 +1020,9 @@ test_util_time(void *arg) { /* As above but with localtime. */ t_res = 9223372036854775LL; +CAPTURE(); tor_localtime_r(&t_res, &b_time); +CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (2037-1900) || b_time.tm_year == (-1900)); @@ -1216,7 +1234,9 @@ test_util_time(void *arg) /* This value is out of range with 32 bit time_t, but in range for 64 bit * time_t */ tv.tv_sec = (time_t)215000UL; + CAPTURE(); format_iso_time(timestr, (time_t)tv.tv_sec); + CHECK_POSSIBLE_EINVAL(); #if SIZEOF_TIME_T == 4 /* format_iso_time should indicate failure on overflow, but it doesn't yet. * Hopefully #18480 will improve the failure semantics in this case. @@ -1231,6 +1251,7 @@ test_util_time(void *arg) #undef CAPTURE #undef CHECK_TIMEGM_ARG_OUT_OF_RANGE +#undef CHECK_POSSIBLE_EINVAL done: teardown_capture_of_logs(); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lis
[tor-commits] [tor/master] Merge branch 'tor-github/pr/651'
commit d5de1a0a5514c51d39f8acdb0c906a186854e681 Merge: c320c52e8 bbe417ae8 Author: David Goulet Date: Wed Feb 13 11:02:02 2019 -0500 Merge branch 'tor-github/pr/651' changes/bug29161| 3 +++ changes/ticket28668 | 3 +++ changes/ticket29160 | 4 src/lib/encoding/time_fmt.c | 4 src/test/test_address.c | 2 +- src/test/test_pt.c | 6 ++ src/test/test_util.c| 24 src/test/testing_common.c | 18 ++ 8 files changed, 63 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Fail any unit test that causes an unhandled LD_BUG or LOG_ERR
commit f684cd800577144a48e112951eaf4ddc602ad26a Author: Nick Mathewson Date: Wed Jan 16 15:47:33 2019 -0500 Fail any unit test that causes an unhandled LD_BUG or LOG_ERR Closes ticket 28668. --- changes/ticket28668 | 3 +++ src/test/testing_common.c | 18 ++ 2 files changed, 21 insertions(+) diff --git a/changes/ticket28668 b/changes/ticket28668 new file mode 100644 index 0..6386e0051 --- /dev/null +++ b/changes/ticket28668 @@ -0,0 +1,3 @@ + o Minor features (testing): +- Treat all unexpected ERR and BUG messages as test failures. + Closes ticket 28668. diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 60015f3c2..62d40a42f 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -239,6 +239,15 @@ tinytest_postfork(void) init_pregenerated_keys(); } +static void +log_callback_failure(int severity, uint32_t domain, const char *msg) +{ + (void)msg; + if (severity == LOG_ERR || (domain & LD_BUG)) { +tinytest_set_test_failed_(); + } +} + /** Main entry point for unit test code: parse the command line, and run * some unit tests. */ int @@ -287,6 +296,7 @@ main(int c, const char **v) c = i_out; { +/* setup logs to stdout */ log_severity_list_t s; memset(&s, 0, sizeof(s)); set_log_severity_config(loglevel, LOG_ERR, &s); @@ -294,6 +304,14 @@ main(int c, const char **v) s.masks[LOG_WARN-LOG_ERR] |= LD_BUG; add_stream_log(&s, "", fileno(stdout)); } + { +/* Setup logs that cause failure. */ +log_severity_list_t s; +memset(&s, 0, sizeof(s)); +set_log_severity_config(LOG_ERR, LOG_ERR, &s); +s.masks[LOG_WARN-LOG_ERR] |= LD_BUG; +add_callback_log(&s, log_callback_failure); + } init_protocol_warning_severity_level(); options->command = CMD_RUN_UNITTESTS; ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'tor-github/pr/650' into maint-0.3.5
commit 6efc2a0e1f785e1e12fb8c7fd4b6aa4feceb647a Merge: 2e770216c d71ca3968 Author: David Goulet Date: Wed Feb 13 10:56:24 2019 -0500 Merge branch 'tor-github/pr/650' into maint-0.3.5 changes/bug29161| 3 +++ changes/ticket28668 | 3 +++ changes/ticket29160 | 4 src/lib/encoding/time_fmt.c | 4 src/test/test_address.c | 3 +-- src/test/test_util.c| 24 src/test/testing_common.c | 18 ++ 7 files changed, 57 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] If address/get_if_addrs6 can't findipv6, log WARN, not ERR
commit 54c9c8b04f6055dc4101b6a36cfb587af78dc9b4 Author: Nick Mathewson Date: Wed Jan 23 12:04:57 2019 -0500 If address/get_if_addrs6 can't findipv6, log WARN, not ERR Fixes 29160, and allows 28668 (treating ERR logs as test failures) to procede. --- changes/ticket29160 | 4 src/test/test_address.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket29160 b/changes/ticket29160 new file mode 100644 index 0..8e1118306 --- /dev/null +++ b/changes/ticket29160 @@ -0,0 +1,4 @@ + o Minor bugfixes (tests): +- Do not log an error-level message if we fail to find an IPv6 + network interface from the unit tests. Fixes bug 29160; bugfix on + 0.2.7.3-rc. diff --git a/src/test/test_address.c b/src/test/test_address.c index 43467aca1..cfb32b855 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -1013,7 +1013,7 @@ test_address_get_if_addrs6(void *arg) (void)arg; - rv = get_interface_address6(LOG_ERR, AF_INET6, &tor_addr); + rv = get_interface_address6(LOG_WARN, AF_INET6, &tor_addr); /* Work even on systems without IPv6 interfaces */ if (rv == 0) { @@ -1204,4 +1204,3 @@ struct testcase_t address_tests[] = { ADDRESS_TEST(tor_addr_in_same_network_family, 0), END_OF_TESTCASES }; - ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] test: Fix a warning underflow in rend_cache/clean
commit 2d74da3d0efd7a67f9bdb73145c38fe047faf1f8 Author: David Goulet Date: Thu Nov 29 10:02:50 2018 -0500 test: Fix a warning underflow in rend_cache/clean Because the test is adding entries to the "rend_cache" directly, the rend_cache_increment_allocation() was never called which made the rend_cache_clean() call trigger that underflow warning: rend_cache/clean: [forking] Nov 29 09:55:04.024 [warn] rend_cache_decrement_allocation(): Bug: Underflow in rend_cache_decrement_allocation (on Tor 0.4.0.0-alpha-dev 2240fe63feb9a8cf) The test is still good and valid. Fixes #28660 Signed-off-by: David Goulet --- src/test/test_rendcache.c | 4 1 file changed, 4 insertions(+) diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index 7ec4771b6..4f544cf21 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -788,7 +788,9 @@ test_rend_cache_clean(void *data) desc_two->pk = pk_generate(1); strmap_set_lc(rend_cache, "foo1", one); + rend_cache_increment_allocation(rend_cache_entry_allocation(one)); strmap_set_lc(rend_cache, "foo2", two); + rend_cache_increment_allocation(rend_cache_entry_allocation(two)); rend_cache_clean(time(NULL), REND_CACHE_TYPE_CLIENT); tt_int_op(strmap_size(rend_cache), OP_EQ, 0); @@ -806,7 +808,9 @@ test_rend_cache_clean(void *data) desc_one->pk = pk_generate(0); desc_two->pk = pk_generate(1); + rend_cache_increment_allocation(rend_cache_entry_allocation(one)); strmap_set_lc(rend_cache, "foo1", one); + rend_cache_increment_allocation(rend_cache_entry_allocation(two)); strmap_set_lc(rend_cache, "foo2", two); rend_cache_clean(time(NULL), REND_CACHE_TYPE_CLIENT); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'tor-github/pr/650' into maint-0.3.5
commit 6efc2a0e1f785e1e12fb8c7fd4b6aa4feceb647a Merge: 2e770216c d71ca3968 Author: David Goulet Date: Wed Feb 13 10:56:24 2019 -0500 Merge branch 'tor-github/pr/650' into maint-0.3.5 changes/bug29161| 3 +++ changes/ticket28668 | 3 +++ changes/ticket29160 | 4 src/lib/encoding/time_fmt.c | 4 src/test/test_address.c | 3 +-- src/test/test_util.c| 24 src/test/testing_common.c | 18 ++ 7 files changed, 57 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Capture more BUG warnings in util/time test
commit 6144cf99adae5ffebbc549a4e0f3c6e05e51ad16 Author: Nick Mathewson Date: Wed Jan 23 12:37:12 2019 -0500 Capture more BUG warnings in util/time test These are ones that happen on windows only. Fixes bug 29161. --- changes/bug29161| 3 +++ src/lib/encoding/time_fmt.c | 4 src/test/test_util.c| 21 + 3 files changed, 28 insertions(+) diff --git a/changes/bug29161 b/changes/bug29161 new file mode 100644 index 0..39a638acf --- /dev/null +++ b/changes/bug29161 @@ -0,0 +1,3 @@ + o Minor bugfixes (tests): +- Detect and suppress "bug" warnings from the util/time test on Windows. + Fixes bug 29161; bugfix on 0.2.9.3-alpha. diff --git a/src/lib/encoding/time_fmt.c b/src/lib/encoding/time_fmt.c index 5b2440d1a..40543d41e 100644 --- a/src/lib/encoding/time_fmt.c +++ b/src/lib/encoding/time_fmt.c @@ -39,6 +39,8 @@ * * Convert *timep to a struct tm in local time, and store the value in * *result. Return the result on success, or NULL on failure. + * + * Treat malformatted inputs localtime outputs as a BUG. */ struct tm * tor_localtime_r(const time_t *timep, struct tm *result) @@ -56,6 +58,8 @@ tor_localtime_r(const time_t *timep, struct tm *result) * * Convert *timep to a struct tm in UTC, and store the value in * *result. Return the result on success, or NULL on failure. + * + * Treat malformatted inputs or gmtime outputs as a BUG. */ struct tm * tor_gmtime_r(const time_t *timep, struct tm *result) diff --git a/src/test/test_util.c b/src/test/test_util.c index 089c1f1d7..6a7b42b78 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -690,6 +690,12 @@ test_util_time(void *arg) expect_single_log_msg_containing(msg); \ teardown_capture_of_logs(); \ } while (0) +#define CHECK_POSSIBLE_EINVAL() do {\ +if (mock_saved_log_n_entries()) { \ + expect_single_log_msg_containing("Invalid argument"); \ +} \ +teardown_capture_of_logs(); \ + } while (0) #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \ CHECK_TIMEGM_WARNING("Out-of-range argument to tor_timegm") @@ -885,12 +891,16 @@ test_util_time(void *arg) if (sizeof(time_t) == 4 || sizeof(time_t) == 8) { t_res = -1*(1 << 30); +CAPTURE(); tor_gmtime_r(&t_res, &b_time); +CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1935-1900)); t_res = INT32_MIN; +CAPTURE(); tor_gmtime_r(&t_res, &b_time); +CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1901-1900)); } @@ -900,7 +910,9 @@ test_util_time(void *arg) /* one of the smallest tm_year values my 64 bit system supports: * b_time.tm_year == (-292275055LL-1900LL) without clamping */ t_res = -9223372036854775LL; +CAPTURE(); tor_gmtime_r(&t_res, &b_time); +CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1-1900)); @@ -926,7 +938,9 @@ test_util_time(void *arg) { /* As above, but with localtime. */ t_res = -9223372036854775LL; +CAPTURE(); tor_localtime_r(&t_res, &b_time); +CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1-1900)); @@ -983,7 +997,9 @@ test_util_time(void *arg) /* one of the largest tm_year values my 64 bit system supports: * b_time.tm_year == (292278994L-1900L) without clamping */ t_res = 9223372036854775LL; +CAPTURE(); tor_gmtime_r(&t_res, &b_time); +CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (2037-1900) || b_time.tm_year == (-1900)); @@ -1004,7 +1020,9 @@ test_util_time(void *arg) { /* As above but with localtime. */ t_res = 9223372036854775LL; +CAPTURE(); tor_localtime_r(&t_res, &b_time); +CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (2037-1900) || b_time.tm_year == (-1900)); @@ -1216,7 +1234,9 @@ test_util_time(void *arg) /* This value is out of range with 32 bit time_t, but in range for 64 bit * time_t */ tv.tv_sec = (time_t)215000UL; + CAPTURE(); format_iso_time(timestr, (time_t)tv.tv_sec); + CHECK_POSSIBLE_EINVAL(); #if SIZEOF_TIME_T == 4 /* format_iso_time should indicate failure on overflow, but it doesn't yet. * Hopefully #18480 will improve the failure semantics in this case. @@ -1231,6 +1251,7 @@ test_util_time(void *arg) #undef CAPTURE #undef CHECK_TIMEGM_ARG_OUT_OF_RANGE +#undef CHECK_POSSIBLE_EINVAL done: teardown_capture_of_logs(); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lis
[tor-commits] [tor/master] Another case of possible gmtime angst.
commit d71ca3968213ea2ed6e30e7a1a5478db759a61e5 Author: Nick Mathewson Date: Wed Jan 23 17:07:39 2019 -0500 Another case of possible gmtime angst. --- src/test/test_util.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 6a7b42b78..4701fadf1 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1065,7 +1065,10 @@ test_util_time(void *arg) /* This value is out of range with 32 bit time_t, but in range for 64 bit * time_t */ + CAPTURE(); format_rfc1123_time(timestr, (time_t)215000UL); + CHECK_POSSIBLE_EINVAL(); + #if SIZEOF_TIME_T == 4 #if 0 /* Wrapping around will have made it this. */ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] test: Fix a warning underflow in rend_cache/clean
commit 2d74da3d0efd7a67f9bdb73145c38fe047faf1f8 Author: David Goulet Date: Thu Nov 29 10:02:50 2018 -0500 test: Fix a warning underflow in rend_cache/clean Because the test is adding entries to the "rend_cache" directly, the rend_cache_increment_allocation() was never called which made the rend_cache_clean() call trigger that underflow warning: rend_cache/clean: [forking] Nov 29 09:55:04.024 [warn] rend_cache_decrement_allocation(): Bug: Underflow in rend_cache_decrement_allocation (on Tor 0.4.0.0-alpha-dev 2240fe63feb9a8cf) The test is still good and valid. Fixes #28660 Signed-off-by: David Goulet --- src/test/test_rendcache.c | 4 1 file changed, 4 insertions(+) diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index 7ec4771b6..4f544cf21 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -788,7 +788,9 @@ test_rend_cache_clean(void *data) desc_two->pk = pk_generate(1); strmap_set_lc(rend_cache, "foo1", one); + rend_cache_increment_allocation(rend_cache_entry_allocation(one)); strmap_set_lc(rend_cache, "foo2", two); + rend_cache_increment_allocation(rend_cache_entry_allocation(two)); rend_cache_clean(time(NULL), REND_CACHE_TYPE_CLIENT); tt_int_op(strmap_size(rend_cache), OP_EQ, 0); @@ -806,7 +808,9 @@ test_rend_cache_clean(void *data) desc_one->pk = pk_generate(0); desc_two->pk = pk_generate(1); + rend_cache_increment_allocation(rend_cache_entry_allocation(one)); strmap_set_lc(rend_cache, "foo1", one); + rend_cache_increment_allocation(rend_cache_entry_allocation(two)); strmap_set_lc(rend_cache, "foo2", two); rend_cache_clean(time(NULL), REND_CACHE_TYPE_CLIENT); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Another case of possible gmtime angst.
commit d71ca3968213ea2ed6e30e7a1a5478db759a61e5 Author: Nick Mathewson Date: Wed Jan 23 17:07:39 2019 -0500 Another case of possible gmtime angst. --- src/test/test_util.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 6a7b42b78..4701fadf1 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1065,7 +1065,10 @@ test_util_time(void *arg) /* This value is out of range with 32 bit time_t, but in range for 64 bit * time_t */ + CAPTURE(); format_rfc1123_time(timestr, (time_t)215000UL); + CHECK_POSSIBLE_EINVAL(); + #if SIZEOF_TIME_T == 4 #if 0 /* Wrapping around will have made it this. */ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit ffbc8a7c273582a417e1282bdd73763437e036b2 Merge: d7052dd48 6efc2a0e1 Author: David Goulet Date: Wed Feb 13 11:00:06 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug29161| 3 +++ changes/ticket28668 | 3 +++ changes/ticket29160 | 4 src/lib/encoding/time_fmt.c | 4 src/test/test_address.c | 3 +-- src/test/test_util.c| 24 src/test/testing_common.c | 18 ++ 7 files changed, 57 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/674'
commit 5687165cf1aec8e3b7356ab842624d36f56318fc Merge: d043096d5 58cbe5170 Author: Nick Mathewson Date: Wed Feb 13 11:38:35 2019 -0500 Merge remote-tracking branch 'tor-github/pr/674' changes/doc28623 | 3 +++ doc/tor.1.txt| 13 +++-- 2 files changed, 10 insertions(+), 6 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Use RFC5737-compliant example IP addresses in manpage when describing MapAddress
commit 58cbe517084d4ec8cd4ff3c297f841e561804cc3 Author: rl1987 Date: Wed Jan 30 17:13:40 2019 +0200 Use RFC5737-compliant example IP addresses in manpage when describing MapAddress --- changes/doc28623 | 3 +++ doc/tor.1.txt| 13 +++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/changes/doc28623 b/changes/doc28623 new file mode 100644 index 0..3c3313abd --- /dev/null +++ b/changes/doc28623 @@ -0,0 +1,3 @@ + o Documentation: +- In manpage entry describing MapAddress torrc setting, use example + IP addresses from ranges specified by RFC 5737. Resolves issue 28623. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 00d6929c1..eb1603743 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1159,17 +1159,18 @@ The following options are useful only for clients (that is, if 1. When evaluating MapAddress expressions Tor stops when it hits the most recently added expression that matches the requested address. So if you -have the following in your torrc, www.torproject.org will map to 1.1.1.1: +have the following in your torrc, www.torproject.org will map to +198.51.100.1: - MapAddress www.torproject.org 2.2.2.2 - MapAddress www.torproject.org 1.1.1.1 + MapAddress www.torproject.org 192.0.2.1 + MapAddress www.torproject.org 198.51.100.1 2. Tor evaluates the MapAddress configuration until it finds no matches. So if you have the following in your torrc, www.torproject.org will map to -2.2.2.2: +203.0.113.1: - MapAddress 1.1.1.1 2.2.2.2 - MapAddress www.torproject.org 1.1.1.1 + MapAddress 198.51.100.1 203.0.113.1 + MapAddress www.torproject.org 198.51.100.1 3. The following MapAddress expression is invalid (and will be ignored) because you cannot map from a specific address to a wildcard ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed
commit 6ab285d5b2def47935af7a4d2bfc97a3467959ae Author: Translation commit bot Date: Wed Feb 13 17:45:23 2019 + Update translations for bridgedb_completed --- sv/LC_MESSAGES/bridgedb.po | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po index 9af835227..1d828b572 100644 --- a/sv/LC_MESSAGES/bridgedb.po +++ b/sv/LC_MESSAGES/bridgedb.po @@ -8,7 +8,7 @@ # Gabor Sebastiani, 2014 # Jacob Andersson , 2018 # Jonatan Nyberg, 2017 -# Jonatan Nyberg, 2018 +# Jonatan Nyberg, 2018-2019 # Peter Michanek , 2015 # Petomatick , 2011 # ph AA, 2015 @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2018-11-21 16:38+\n" +"PO-Revision-Date: 2019-02-13 17:38+\n" "Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -140,7 +140,7 @@ msgstr "Lägg nu till %s bryggorna till Tor Browser%s" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%sG%se mig bryggor!" +msgstr "%sB%sara ge mig bryggor!" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" @@ -168,7 +168,7 @@ msgstr "%sJ%sa!" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "%sH%sämta Bridges" +msgstr "%sH%sämta bryggor" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" @@ -306,7 +306,7 @@ msgstr "Här är dina rader med bryggor:" #: bridgedb/strings.py:129 msgid "Get Bridges!" -msgstr "Skaffa Bryggor!" +msgstr "Skaffa bryggor!" #: bridgedb/strings.py:133 msgid "Please select options for bridge type:" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit 2a3f06cc0a5d04a95e127397b2323c66cefb149a Author: Translation commit bot Date: Wed Feb 13 17:45:15 2019 + Update translations for bridgedb --- sv/LC_MESSAGES/bridgedb.po | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po index 9af835227..1d828b572 100644 --- a/sv/LC_MESSAGES/bridgedb.po +++ b/sv/LC_MESSAGES/bridgedb.po @@ -8,7 +8,7 @@ # Gabor Sebastiani, 2014 # Jacob Andersson , 2018 # Jonatan Nyberg, 2017 -# Jonatan Nyberg, 2018 +# Jonatan Nyberg, 2018-2019 # Peter Michanek , 2015 # Petomatick , 2011 # ph AA, 2015 @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2018-11-21 16:38+\n" +"PO-Revision-Date: 2019-02-13 17:38+\n" "Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -140,7 +140,7 @@ msgstr "Lägg nu till %s bryggorna till Tor Browser%s" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%sG%se mig bryggor!" +msgstr "%sB%sara ge mig bryggor!" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" @@ -168,7 +168,7 @@ msgstr "%sJ%sa!" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "%sH%sämta Bridges" +msgstr "%sH%sämta bryggor" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" @@ -306,7 +306,7 @@ msgstr "Här är dina rader med bryggor:" #: bridgedb/strings.py:129 msgid "Get Bridges!" -msgstr "Skaffa Bryggor!" +msgstr "Skaffa bryggor!" #: bridgedb/strings.py:133 msgid "Please select options for bridge type:" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit 5b2a6475ee18e1ff8e88b829ddcc97a5fb046415 Author: Translation commit bot Date: Wed Feb 13 17:45:56 2019 + Update translations for https_everywhere_completed --- sv/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index 09bf0b0a4..07a8b2430 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -8,7 +8,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit ec150927795ad6befd199ae72027f63633981b43 Author: Translation commit bot Date: Wed Feb 13 17:45:49 2019 + Update translations for https_everywhere --- sv/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index 09bf0b0a4..07a8b2430 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -8,7 +8,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
commit cf94649a5287f4f5796c0fa1dc5b55a3303e8cf6 Author: Translation commit bot Date: Wed Feb 13 17:47:00 2019 + Update translations for tails-greeter-2_completed --- sv/sv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 0b91cb787..ce79a31b2 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-04 09:46+0200\n" +"POT-Creation-Date: 2019-01-16 11:27+0100\n" "PO-Revision-Date: 2016-11-18 21:29+\n" "Last-Translator: Jonatan Nyberg, 2017\n" "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n" @@ -214,7 +214,7 @@ msgstr "Anslut direkt till Tor-nätverket (standard)." #: ../data/greeter.ui.h:42 msgid "Configure a Tor bridge or local proxy" -msgstr "Konfigurera en Tor-bro eller lokal proxy" +msgstr "Konfigurera en Tor-brygga eller lokal proxy" #: ../data/greeter.ui.h:43 msgid "Disable all networking" @@ -258,7 +258,7 @@ msgstr "_Windows kamouflering" #: ../tailsgreeter/gui.py:391 msgid "Bridge & Proxy" -msgstr "Bro & Proxy" +msgstr "Brygga & Proxy" #: ../tailsgreeter/gui.py:397 msgid "Offline" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2
commit 4f8214c0e24ee3958831347c430ee212b51c81c9 Author: Translation commit bot Date: Wed Feb 13 17:46:53 2019 + Update translations for tails-greeter-2 --- sv/sv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 0b91cb787..ce79a31b2 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-04 09:46+0200\n" +"POT-Creation-Date: 2019-01-16 11:27+0100\n" "PO-Revision-Date: 2016-11-18 21:29+\n" "Last-Translator: Jonatan Nyberg, 2017\n" "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n" @@ -214,7 +214,7 @@ msgstr "Anslut direkt till Tor-nätverket (standard)." #: ../data/greeter.ui.h:42 msgid "Configure a Tor bridge or local proxy" -msgstr "Konfigurera en Tor-bro eller lokal proxy" +msgstr "Konfigurera en Tor-brygga eller lokal proxy" #: ../data/greeter.ui.h:43 msgid "Disable all networking" @@ -258,7 +258,7 @@ msgstr "_Windows kamouflering" #: ../tailsgreeter/gui.py:391 msgid "Bridge & Proxy" -msgstr "Bro & Proxy" +msgstr "Brygga & Proxy" #: ../tailsgreeter/gui.py:397 msgid "Offline" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties
commit 06ee2113f9d78a9c53a28ebddc0a9f5835577a40 Author: Translation commit bot Date: Wed Feb 13 17:50:16 2019 + Update translations for tor-launcher-properties --- sv/torlauncher.properties | 38 +++--- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/sv/torlauncher.properties b/sv/torlauncher.properties index 703de902e..9c4bb36a7 100644 --- a/sv/torlauncher.properties +++ b/sv/torlauncher.properties @@ -52,31 +52,31 @@ torlauncher.forAssistance2=För hjälp, besök %S torlauncher.copiedNLogMessages=Kopieringen är färdig. %S meddelanden från Tor-loggen som du kan klistra in i en textredigerare eller ett e-postmeddelande. -torlauncher.bootstrapStatus.starting=Starting -torlauncher.bootstrapStatus.conn_pt=Connecting to bridge -torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge -torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy -torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy -torlauncher.bootstrapStatus.conn=Connecting to a Tor relay -torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay -torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay -torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay +torlauncher.bootstrapStatus.starting=Startar +torlauncher.bootstrapStatus.conn_pt=Ansluter till bryggan +torlauncher.bootstrapStatus.conn_done_pt=Ansluten till bryggan +torlauncher.bootstrapStatus.conn_proxy=Ansluter till proxyservern +torlauncher.bootstrapStatus.conn_done_proxy=Ansluten till proxyservern +torlauncher.bootstrapStatus.conn=Ansluter till en Tor-relä +torlauncher.bootstrapStatus.conn_done=Ansluten till en Tor-relä +torlauncher.bootstrapStatus.handshake=Förhandlar med en Tor-relä +torlauncher.bootstrapStatus.handshake_done=Avslutade förhandlingarna med en Tor-relä torlauncher.bootstrapStatus.onehop_create=Skapar en krypterad kataloganslutning torlauncher.bootstrapStatus.requesting_status=Hämtar nätverksstatus torlauncher.bootstrapStatus.loading_status=Läser in nätverksstatus torlauncher.bootstrapStatus.loading_keys=Läser in auktoritära certifikat torlauncher.bootstrapStatus.requesting_descriptors=Begär reläinformation torlauncher.bootstrapStatus.loading_descriptors=Läser in reläinformation -torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information -torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge -torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge -torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy -torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy -torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay -torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay -torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay -torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay -torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit +torlauncher.bootstrapStatus.enough_dirinfo=Färdig inläsning av relä-information +torlauncher.bootstrapStatus.ap_conn_pt=Bygger kretser: Ansluter till bryggan +torlauncher.bootstrapStatus.ap_conn_done_pt=Bygger kretser: Ansluten till bryggan +torlauncher.bootstrapStatus.ap_conn_proxy=Bygger kretsar: Ansluter till proxyservern +torlauncher.bootstrapStatus.ap_conn_done_proxy=Bygger kretsar: Ansluten till proxyservern +torlauncher.bootstrapStatus.ap_conn=Bygger kretsar: Ansluter till en Tor-relä +torlauncher.bootstrapStatus.ap_conn_done=Bygger kretsar: Ansluten till en Tor-relä +torlauncher.bootstrapStatus.ap_handshake=Bygger kretsar: Förhandlar med en Tor-relä +torlauncher.bootstrapStatus.ap_handshake_done=Bygger kretsar: Avslutade förhandlingarna med ett Tor-relä +torlauncher.bootstrapStatus.circuit_create=Bygger kretsar: Upprättar en Tor-krets torlauncher.bootstrapStatus.done=Ansluten till Tor-nätverket! torlauncher.bootstrapWarning.done=klar ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
commit 6645185465119ee956976d5c3eabe14bd3240b9d Author: Translation commit bot Date: Wed Feb 13 17:50:25 2019 + Update translations for tor-launcher-properties_completed --- sv/torlauncher.properties | 24 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/sv/torlauncher.properties b/sv/torlauncher.properties index 406dfb9f1..9c4bb36a7 100644 --- a/sv/torlauncher.properties +++ b/sv/torlauncher.properties @@ -52,15 +52,31 @@ torlauncher.forAssistance2=För hjälp, besök %S torlauncher.copiedNLogMessages=Kopieringen är färdig. %S meddelanden från Tor-loggen som du kan klistra in i en textredigerare eller ett e-postmeddelande. -torlauncher.bootstrapStatus.conn_dir=Ansluter till en reläkatalog -torlauncher.bootstrapStatus.handshake_dir=Skapar en krypterad kataloganslutning +torlauncher.bootstrapStatus.starting=Startar +torlauncher.bootstrapStatus.conn_pt=Ansluter till bryggan +torlauncher.bootstrapStatus.conn_done_pt=Ansluten till bryggan +torlauncher.bootstrapStatus.conn_proxy=Ansluter till proxyservern +torlauncher.bootstrapStatus.conn_done_proxy=Ansluten till proxyservern +torlauncher.bootstrapStatus.conn=Ansluter till en Tor-relä +torlauncher.bootstrapStatus.conn_done=Ansluten till en Tor-relä +torlauncher.bootstrapStatus.handshake=Förhandlar med en Tor-relä +torlauncher.bootstrapStatus.handshake_done=Avslutade förhandlingarna med en Tor-relä +torlauncher.bootstrapStatus.onehop_create=Skapar en krypterad kataloganslutning torlauncher.bootstrapStatus.requesting_status=Hämtar nätverksstatus torlauncher.bootstrapStatus.loading_status=Läser in nätverksstatus torlauncher.bootstrapStatus.loading_keys=Läser in auktoritära certifikat torlauncher.bootstrapStatus.requesting_descriptors=Begär reläinformation torlauncher.bootstrapStatus.loading_descriptors=Läser in reläinformation -torlauncher.bootstrapStatus.conn_or=Ansluter till Tor-nätverket -torlauncher.bootstrapStatus.handshake_or=Etablerar en Tor-krets +torlauncher.bootstrapStatus.enough_dirinfo=Färdig inläsning av relä-information +torlauncher.bootstrapStatus.ap_conn_pt=Bygger kretser: Ansluter till bryggan +torlauncher.bootstrapStatus.ap_conn_done_pt=Bygger kretser: Ansluten till bryggan +torlauncher.bootstrapStatus.ap_conn_proxy=Bygger kretsar: Ansluter till proxyservern +torlauncher.bootstrapStatus.ap_conn_done_proxy=Bygger kretsar: Ansluten till proxyservern +torlauncher.bootstrapStatus.ap_conn=Bygger kretsar: Ansluter till en Tor-relä +torlauncher.bootstrapStatus.ap_conn_done=Bygger kretsar: Ansluten till en Tor-relä +torlauncher.bootstrapStatus.ap_handshake=Bygger kretsar: Förhandlar med en Tor-relä +torlauncher.bootstrapStatus.ap_handshake_done=Bygger kretsar: Avslutade förhandlingarna med ett Tor-relä +torlauncher.bootstrapStatus.circuit_create=Bygger kretsar: Upprättar en Tor-krets torlauncher.bootstrapStatus.done=Ansluten till Tor-nätverket! torlauncher.bootstrapWarning.done=klar ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/699'
commit 5f42bc0f485f768081307f8afc1642140acb4810 Merge: 5687165cf b61c3c6df Author: Nick Mathewson Date: Wed Feb 13 15:19:59 2019 -0500 Merge remote-tracking branch 'tor-github/pr/699' changes/ticket26698 | 4 ++ src/app/config/config.c | 3 +- src/feature/dirauth/bwauth.c| 28 ++-- src/feature/dirauth/bwauth.h| 4 +- src/feature/dirauth/dirvote.c | 40 ++- src/feature/nodelist/networkstatus_st.h | 3 + src/test/test_dir.c | 123 +++- 7 files changed, 178 insertions(+), 27 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] bwauth: Add function to get the digest of a bw file
commit fc3e90a7b64714f30c19572900523078e8e7c0d6 Author: juga0 Date: Tue Nov 6 14:49:20 2018 + bwauth: Add function to get the digest of a bw file --- src/app/config/config.c | 3 ++- src/feature/dirauth/bwauth.c | 26 --- src/feature/dirauth/bwauth.h | 4 +-- src/test/test_dir.c | 62 4 files changed, 72 insertions(+), 23 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 8e4794315..7734c19a0 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -3554,7 +3554,8 @@ options_validate(or_options_t *old_options, or_options_t *options, "(Bridge/V3)AuthoritativeDir is set."); /* If we have a v3bandwidthsfile and it's broken, complain on startup */ if (options->V3BandwidthsFile && !old_options) { - dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL, NULL); + dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL, NULL, + NULL); } /* same for guardfraction file */ if (options->GuardfractionFile && !old_options) { diff --git a/src/feature/dirauth/bwauth.c b/src/feature/dirauth/bwauth.c index a31050ff9..1929c1438 100644 --- a/src/feature/dirauth/bwauth.c +++ b/src/feature/dirauth/bwauth.c @@ -20,6 +20,7 @@ #include "feature/nodelist/routerinfo_st.h" #include "feature/nodelist/vote_routerstatus_st.h" +#include "lib/crypt_ops/crypto_format.h" #include "lib/encoding/keyval.h" /** Total number of routers with measured bandwidth; this is set by @@ -205,7 +206,8 @@ dirserv_get_credible_bandwidth_kb(const routerinfo_t *ri) int dirserv_read_measured_bandwidths(const char *from_file, smartlist_t *routerstatuses, - smartlist_t *bw_file_headers) + smartlist_t *bw_file_headers, + uint8_t *digest_out) { FILE *fp = tor_fopen_cloexec(from_file, "r"); int applied_lines = 0; @@ -219,6 +221,7 @@ dirserv_read_measured_bandwidths(const char *from_file, int rv = -1; char *line = NULL; size_t n = 0; + crypto_digest_t *digest = crypto_digest256_new(DIGEST_SHA256); /* Initialise line, so that we can't possibly run off the end. */ @@ -233,11 +236,14 @@ dirserv_read_measured_bandwidths(const char *from_file, log_warn(LD_DIRSERV, "Empty bandwidth file"); goto err; } + /* If the line could be gotten, add it to the digest */ + crypto_digest_add_bytes(digest, (const char *) line, strlen(line)); if (!strlen(line) || line[strlen(line)-1] != '\n') { log_warn(LD_DIRSERV, "Long or truncated time in bandwidth file: %s", escaped(line)); -goto err; +/* Continue adding lines to the digest. */ +goto continue_digest; } line[strlen(line)-1] = '\0'; @@ -245,14 +251,14 @@ dirserv_read_measured_bandwidths(const char *from_file, if (!ok) { log_warn(LD_DIRSERV, "Non-integer time in bandwidth file: %s", escaped(line)); -goto err; +goto continue_digest; } now = time(NULL); if ((now - file_time) > MAX_MEASUREMENT_AGE) { log_warn(LD_DIRSERV, "Bandwidth measurement file stale. Age: %u", (unsigned)(time(NULL) - file_time)); -goto err; +goto continue_digest; } /* If timestamp was correct and bw_file_headers is not NULL, @@ -267,6 +273,7 @@ dirserv_read_measured_bandwidths(const char *from_file, while (!feof(fp)) { measured_bw_line_t parsed_line; if (tor_getline(&line, &n, fp) >= 0) { + crypto_digest_add_bytes(digest, (const char *) line, strlen(line)); if (measured_bw_line_parse(&parsed_line, line, line_is_after_headers) != -1) { /* This condition will be true when the first complete valid bw line @@ -305,6 +312,14 @@ dirserv_read_measured_bandwidths(const char *from_file, "Applied %d measurements.", applied_lines); rv = 0; + continue_digest: + /* Continue parsing lines to return the digest of the Bandwidth File. */ + while (!feof(fp)) { +if (tor_getline(&line, &n, fp) >= 0) { + crypto_digest_add_bytes(digest, (const char *) line, strlen(line)); +} + } + err: if (line) { // we need to raw_free this buffer because we got it from tor_getdelim() @@ -312,6 +327,9 @@ dirserv_read_measured_bandwidths(const char *from_file, } if (fp) fclose(fp); + if (digest_out) +crypto_digest_get_digest(digest, (char *) digest_out, DIGEST256_LEN); + crypto_digest_free(digest); return rv; } diff --git a/src/feature/dirauth/bwauth.h b/src/feature/dirauth/bwauth.h index 450772845..8b7acc4a1 100644 --- a/src/feature/dirauth/bwauth.h +++ b/src/feature/dirauth/bwauth.h @@ -21,8 +21,8 @@ int dirserv_read_measured_bandwidths(const char *from_file, smartlist_t *routerstatuses, -
[tor-commits] [tor/master] test: Add test to get the digest of a bw file
commit 28490fa23edc11f0b22ef4365be97eb3fb88768d Author: juga0 Date: Tue Nov 6 14:56:05 2018 + test: Add test to get the digest of a bw file --- src/feature/dirauth/bwauth.c | 2 +- src/test/test_dir.c | 61 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/src/feature/dirauth/bwauth.c b/src/feature/dirauth/bwauth.c index 1929c1438..7d7dea4df 100644 --- a/src/feature/dirauth/bwauth.c +++ b/src/feature/dirauth/bwauth.c @@ -254,7 +254,7 @@ dirserv_read_measured_bandwidths(const char *from_file, goto continue_digest; } - now = time(NULL); + now = approx_time(); if ((now - file_time) > MAX_MEASUREMENT_AGE) { log_warn(LD_DIRSERV, "Bandwidth measurement file stale. Age: %u", (unsigned)(time(NULL) - file_time)); diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 08b5cdddf..4132d42d1 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -91,6 +91,9 @@ #ifdef HAVE_SYS_STAT_H #include #endif +#ifdef HAVE_UNISTD_H +#include +#endif #define NS_MODULE dir @@ -2027,6 +2030,7 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) tor_free(bw_file_headers_str); done: + unlink(fname); tor_free(fname); tor_free(header_lines_v100); tor_free(header_lines_v110_no_terminator); @@ -3860,6 +3864,62 @@ mock_get_options(void) return mock_options; } +/** + * Test dirauth_get_b64_digest_bw_file. + * This function should be near the other bwauth functions, but it needs + * mock_get_options, that is only defined here. + */ + +static void +test_dir_bwauth_bw_file_digest256(void *arg) +{ + (void)arg; + const char *content = +"1541171221\n" +"node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 " +"master_key_ed25519=YaqV4vbvPYKucElk297eVdNArDz9HtIwUoIeo0+cVIpQ " +"bw=760 nick=Test time=2018-05-08T16:13:26\n"; + + char *fname = tor_strdup(get_fname("V3BandwidthsFile")); + /* Initialize to a wrong digest. */ + uint8_t digest[DIGEST256_LEN] = "01234567890123456789abcdefghijkl"; + + /* Digest of an empty string. Initialize to a wrong digest. */ + char digest_empty_str[DIGEST256_LEN] = "01234567890123456789abcdefghijkl"; + crypto_digest256(digest_empty_str, "", 0, DIGEST_SHA256); + + /* Digest of the content. Initialize to a wrong digest. */ + char digest_expected[DIGEST256_LEN] = "01234567890123456789abcdefghijkl"; + crypto_digest256(digest_expected, content, strlen(content), DIGEST_SHA256); + + /* When the bandwidth file can not be found. */ + tt_int_op(-1, OP_EQ, +dirserv_read_measured_bandwidths(fname, + NULL, NULL, digest)); + tt_mem_op(digest, OP_EQ, digest_empty_str, DIGEST256_LEN); + + /* When there is a timestamp but it is too old. */ + write_str_to_file(fname, content, 0); + tt_int_op(-1, OP_EQ, +dirserv_read_measured_bandwidths(fname, + NULL, NULL, digest)); + /* The digest will be correct. */ + tt_mem_op(digest, OP_EQ, digest_expected, DIGEST256_LEN); + + update_approx_time(1541171221); + + /* When there is a bandwidth file and it can be read. */ + tt_int_op(0, OP_EQ, +dirserv_read_measured_bandwidths(fname, + NULL, NULL, digest)); + tt_mem_op(digest, OP_EQ, digest_expected, DIGEST256_LEN); + + done: + unlink(fname); + tor_free(fname); + update_approx_time(time(NULL)); +} + static void reset_routerstatus(routerstatus_t *rs, const char *hex_identity_digest, @@ -6441,6 +6501,7 @@ struct testcase_t dir_tests[] = { DIR_LEGACY(measured_bw_kb_line_is_after_headers), DIR_LEGACY(measured_bw_kb_cache), DIR_LEGACY(dirserv_read_measured_bandwidths), + DIR(bwauth_bw_file_digest256, 0), DIR_LEGACY(param_voting), DIR(param_voting_lookup, 0), DIR_LEGACY(v3_networkstatus), ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] changes: Add changes file for #26698
commit b61c3c6dfa072a9717c878675ed431c3f8f74d24 Author: juga0 Date: Tue Nov 6 14:58:15 2018 + changes: Add changes file for #26698 --- changes/ticket26698 | 4 1 file changed, 4 insertions(+) diff --git a/changes/ticket26698 b/changes/ticket26698 new file mode 100644 index 0..6b029a1b7 --- /dev/null +++ b/changes/ticket26698 @@ -0,0 +1,4 @@ + o Minor features (directory authority): +- When a directory authority is using a bandwidth file to obtain the + bandwidth values, include the digest of the file in the vote. + Closes ticket 26698. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] dirvote: Add the bandwidth file digest in the vote
commit ec7da50ab4d30eac64e02e1a5d37a72c91845214 Author: juga0 Date: Tue Nov 6 14:57:18 2018 + dirvote: Add the bandwidth file digest in the vote --- src/feature/dirauth/dirvote.c | 40 ++--- src/feature/nodelist/networkstatus_st.h | 3 +++ 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 9587f3655..ba7b2f1de 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -61,6 +61,9 @@ #include "lib/encoding/confline.h" #include "lib/crypt_ops/crypto_format.h" +/* Algorithm to use for the bandwidth file digest. */ +#define DIGEST_ALG_BW_FILE DIGEST_SHA256 + /** * \file dirvote.c * \brief Functions to compute directory consensus, and schedule voting. @@ -269,6 +272,7 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, char *flag_thresholds = dirserv_get_flag_thresholds_line(); char *params; char *bw_headers_line = NULL; +char *bw_file_digest = NULL; authority_cert_t *cert = v3_ns->cert; char *methods = make_consensus_method_list(MIN_SUPPORTED_CONSENSUS_METHOD, @@ -308,6 +312,28 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, tor_free(bw_file_headers); } +/* Create bandwidth-file-digest if applicable. + * v3_ns->b64_digest_bw_file will contain the digest when V3BandwidthsFile + * is configured and the bandwidth file could be read, even if it was not + * parseable. + */ +if (!tor_digest256_is_zero((const char *)v3_ns->bw_file_digest256)) { + /* Encode the digest. */ + char b64_digest_bw_file[BASE64_DIGEST256_LEN+1] = {0}; + if (digest256_to_base64(b64_digest_bw_file, + (const char *)v3_ns->bw_file_digest256)>0) { +/* "bandwidth-file-digest" 1*(SP algorithm "=" digest) NL */ +char *digest_algo_b64_digest_bw_file = NULL; +tor_asprintf(&digest_algo_b64_digest_bw_file, "%s=%s", + crypto_digest_algorithm_get_name(DIGEST_ALG_BW_FILE), + b64_digest_bw_file); +/* No need for tor_strdup(""), format_line_if_present does it. */ +bw_file_digest = format_line_if_present( + "bandwidth-file-digest", digest_algo_b64_digest_bw_file); +tor_free(digest_algo_b64_digest_bw_file); + } +} + smartlist_add_asprintf(chunks, "network-status-version 3\n" "vote-status %s\n" @@ -327,6 +353,7 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, "contact %s\n" "%s" /* shared randomness information */ "%s" /* bandwidth file headers */ + "%s" /* bandwidth file */ , v3_ns->type == NS_TYPE_VOTE ? "vote" : "opinion", methods, @@ -345,7 +372,8 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, shared_random_vote_str ? shared_random_vote_str : "", bw_headers_line ? - bw_headers_line : ""); + bw_headers_line : "", + bw_file_digest ? bw_file_digest: ""); tor_free(params); tor_free(flags); @@ -353,6 +381,7 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, tor_free(methods); tor_free(shared_random_vote_str); tor_free(bw_headers_line); +tor_free(bw_file_digest); if (!tor_digest_is_zero(voter->legacy_id_digest)) { char fpbuf[HEX_DIGEST_LEN+1]; @@ -4425,6 +4454,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, const int vote_on_reachability = running_long_enough_to_decide_unreachable(); smartlist_t *microdescriptors = NULL; smartlist_t *bw_file_headers = NULL; + uint8_t bw_file_digest256[DIGEST256_LEN] = {0}; tor_assert(private_key); tor_assert(cert); @@ -4462,7 +4492,8 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, * set_routerstatus_from_routerinfo() see up-to-date bandwidth info. */ if (options->V3BandwidthsFile) { -dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL, NULL); +dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL, NULL, + NULL); } else { /* * No bandwidths file; clear the measured bandwidth cache in case we had @@ -4567,7 +4598,9 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, /* Only set bw_file_headers when V3BandwidthsFile is configured */ bw_file_headers = smartlist_new(); dirserv_read_measured_bandwidths(options->V3BandwidthsFile, - routerstatuses, bw_file_headers); + routerstatuses, bw_file_headers, + bw_file_digest256); + } else { /* * No bandwid
[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot
commit c3a86b26e3d5dabf3cbf8dbbd4523044c2361aca Author: Translation commit bot Date: Wed Feb 13 22:15:27 2019 + Update translations for donatepages-messagespot --- locale/ar/LC_MESSAGES/messages.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/locale/ar/LC_MESSAGES/messages.po b/locale/ar/LC_MESSAGES/messages.po index 19bce2ea7..9f68d2ca0 100644 --- a/locale/ar/LC_MESSAGES/messages.po +++ b/locale/ar/LC_MESSAGES/messages.po @@ -14,10 +14,11 @@ # Haroon Ali , 2018 # Ali Muhammed , 2018 # Isho Antar , 2018 +# ealtimimi , 2019 # msgid "" msgstr "" -"Last-Translator: Isho Antar , 2018\n" +"Last-Translator: ealtimimi , 2019\n" "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" @@ -576,7 +577,7 @@ msgstr "" #: tmp/cache_locale/6f/6f67db0a5268c67c9254c73517aaaea60c8c65a268f9242703a3299173f14b74.php:84 msgid "Procedure" -msgstr "" +msgstr "اÙخطÙات" #: tmp/cache_locale/54/5420828d7720daccac45a05e74a0bdde5ef138020bd4901a7e81ad8817d3f8e8.php:34 msgid "Tor Thanks You" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [meek/webextension] Firefox 65, not 55.
commit 343a5a1073b5088602c0d6202da6276b85ec4d09 Author: David Fifield Date: Wed Feb 13 22:03:22 2019 -0700 Firefox 65, not 55. --- webextension/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webextension/README b/webextension/README index a53d147..1174dc5 100644 --- a/webextension/README +++ b/webextension/README @@ -7,7 +7,7 @@ application runs as a subprocess of the browser; its job is to open a localhost socket and act as an intermediary between the extension and meek-client, because the extension cannot open a socket by itself. -These instructions require Firefox 55. +These instructions require Firefox 65. 1. Compile the native application. cd native && go build ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [meek/webextension] Typos.
commit 0245c8e73900eb8f90775d9206610547b9f1f216 Author: David Fifield Date: Wed Feb 13 22:16:12 2019 -0700 Typos. --- webextension/README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webextension/README b/webextension/README index 1174dc5..a728842 100644 --- a/webextension/README +++ b/webextension/README @@ -35,14 +35,14 @@ These instructions require Firefox 65. This enables the extension to write to stdout. 5. In Firefox, go to about:debugging and click "Load Temporary - Add-on...". Find manifest.json file and click Open. + Add-on...". Find manifest.json and click Open. More information: https://developer.mozilla.org/en-US/docs/Tools/about:debugging#Loading_a_temporary_add-on In the terminal, you should see a line like this, with a random port number in place of : meek-http-helper: listen 127.0.0.1: -Now the extension is running an ready to start making requests. You can +Now the extension is running and ready to start making requests. You can run "meek-client --helper", passing it the correct port number : UseBridges 1 ClientTransportPlugin meek exec ./meek-client --helper 127.0.0.1: --log meek-client.log ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits