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

[tor-browser/tor-browser-78.3.0esr-10.5-1] Revert "Bug 21907: Fix runtime error on CentOS 6"
by gk＠torproject.org 18 Sep '20

18 Sep '20

commit 090676aed458ed15a441e41350065f09f2df4566 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 17 08:46:57 2020 +0000 Revert "Bug 21907: Fix runtime error on CentOS 6" This reverts commit a00c57b6116329b5376bbf3f4212e5d2a3fece07. The 10.0 series is the last one with CentOS 6 support. --- gfx/harfbuzz/src/hb-glib.cc | 53 +++++++++++++++++++++++++++++++++++++++++++++ gfx/harfbuzz/src/hb-glib.h | 5 +++++ 2 files changed, 58 insertions(+) diff --git a/… [View More]gfx/harfbuzz/src/hb-glib.cc b/gfx/harfbuzz/src/hb-glib.cc index 2fd39610203d..058f65ae69c3 100644 --- a/gfx/harfbuzz/src/hb-glib.cc +++ b/gfx/harfbuzz/src/hb-glib.cc @@ -49,6 +49,7 @@ **/ +#if !GLIB_CHECK_VERSION(2,29,14) static const hb_script_t glib_script_to_script[] = { @@ -170,6 +171,7 @@ glib_script_to_script[] = HB_SCRIPT_SORA_SOMPENG, HB_SCRIPT_TAKRI }; +#endif /** * hb_glib_script_to_script: @@ -185,6 +187,9 @@ glib_script_to_script[] = hb_script_t hb_glib_script_to_script (GUnicodeScript script) { +#if GLIB_CHECK_VERSION(2,29,14) + return (hb_script_t) g_unicode_script_to_iso15924 (script); +#else if (likely ((unsigned int) script < ARRAY_LENGTH (glib_script_to_script))) return glib_script_to_script[script]; @@ -192,6 +197,7 @@ hb_glib_script_to_script (GUnicodeScript script) return HB_SCRIPT_INVALID; return HB_SCRIPT_UNKNOWN; +#endif } /** @@ -208,6 +214,9 @@ hb_glib_script_to_script (GUnicodeScript script) GUnicodeScript hb_glib_script_from_script (hb_script_t script) { +#if GLIB_CHECK_VERSION(2,29,14) + return g_unicode_script_from_iso15924 (script); +#else unsigned int count = ARRAY_LENGTH (glib_script_to_script); for (unsigned int i = 0; i < count; i++) if (glib_script_to_script[i] == script) @@ -217,6 +226,7 @@ hb_glib_script_from_script (hb_script_t script) return G_UNICODE_SCRIPT_INVALID_CODE; return G_UNICODE_SCRIPT_UNKNOWN; +#endif } @@ -263,6 +273,10 @@ hb_glib_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *ab, void *user_data HB_UNUSED) { +#if GLIB_CHECK_VERSION(2,29,12) + return g_unichar_compose (a, b, ab); +#endif + /* We don't ifdef-out the fallback code such that compiler always * sees it and makes sure it's compilable. */ @@ -296,6 +310,10 @@ hb_glib_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *b, void *user_data HB_UNUSED) { +#if GLIB_CHECK_VERSION(2,29,12) + return g_unichar_decompose (ab, a, b); +#endif + /* We don't ifdef-out the fallback code such that compiler always * sees it and makes sure it's compilable. */ @@ -397,4 +415,39 @@ hb_glib_get_unicode_funcs () return static_glib_funcs.get_unconst (); } + + +#if GLIB_CHECK_VERSION(2,31,10) + +static void +_hb_g_bytes_unref (void *data) +{ + g_bytes_unref ((GBytes *) data); +} + +/** + * hb_glib_blob_create: + * @gbytes: the GBytes structure to work upon + * + * Creates an #hb_blob_t blob from the specified + * GBytes data structure. + * + * Return value: (transfer full): the new #hb_blob_t blob object + * + * Since: 0.9.38 + **/ +hb_blob_t * +hb_glib_blob_create (GBytes *gbytes) +{ + gsize size = 0; + gconstpointer data = g_bytes_get_data (gbytes, &size); + return hb_blob_create ((const char *) data, + size, + HB_MEMORY_MODE_READONLY, + g_bytes_ref (gbytes), + _hb_g_bytes_unref); +} +#endif + + #endif diff --git a/gfx/harfbuzz/src/hb-glib.h b/gfx/harfbuzz/src/hb-glib.h index 4adbd7c332cb..5f04183ba19f 100644 --- a/gfx/harfbuzz/src/hb-glib.h +++ b/gfx/harfbuzz/src/hb-glib.h @@ -46,6 +46,11 @@ hb_glib_script_from_script (hb_script_t script); HB_EXTERN hb_unicode_funcs_t * hb_glib_get_unicode_funcs (void); +#if GLIB_CHECK_VERSION(2,31,10) +HB_EXTERN hb_blob_t * +hb_glib_blob_create (GBytes *gbytes); +#endif + HB_END_DECLS #endif /* HB_GLIB_H */ [View Less]

1 0

[tor-browser-build/master] Bug 40041: Remove CentOS 6 support for 10.5 series
by gk＠torproject.org 18 Sep '20

18 Sep '20

commit 1d426e5c975804f91095b9be0b9ea71d75e91ac0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 18 06:32:26 2020 +0000 Bug 40041: Remove CentOS 6 support for 10.5 series CentOS 6 will be EOL later this year (Nov 2020). We are removing support for it beginning with 10.5 which will get released around mid-2021. --- projects/firefox/start-firefox | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/projects/firefox/start-firefox b/… [View More]

1 0

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

18 Sep '20

commit dd4fcc52bc7f0f440554f792c6a90897f5887473 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 18 09:46:58 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+is.po | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/contents+is.po b/contents+is.po index 94c236f8cd..6a6c399f10 100644 --- a/contents+is.po +++ b/contents+is.po @@ -2534,6 +2534,8 @@ msgid "" "10. … [View More]Open the search screen by tapping the magnifying glass at the lower-" "right side." msgstr "" +"10. Opnaðu leitarskjáinn með því að ýta á stækkunarglerið neðarlega hægra " +"megin." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2544,6 +2546,8 @@ msgstr "11. Leitaðu að \"Tor-vafrinn fyrir Android\" eða \"Tor Browser for An #: (content/mobile-tor/contents+en.lrtopic.body) msgid "12. Open the query result by \"The Tor Project\" and install." msgstr "" +"12. Opnaðu leitarniðurstöðuna sem heitir \"Tor-Verkefnið/The Tor Project\" " +"og settu það upp." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2557,6 +2561,9 @@ msgid "" "apk from the [Tor Project " "website](https://www.torproject.org/download/#android)." msgstr "" +"Þú getur líka náð í Tor-vafrann fyrir Android með því að sækja og setja upp " +"apk-pakka af [vefsvæði Tor-" +"verkefnisins](https://www.torproject.org/download/#android)." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2594,6 +2601,8 @@ msgid "" "Once clicked, changing sentences will appear at the bottom of the screen, " "indicating Tor’s connection progress." msgstr "" +"Eftir að smellt er á hnappinn, munu birtast setningar neðst á skjánum sem " +"gefa til kynna hvernig gengur með að tengjast Tor." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2602,6 +2611,10 @@ msgid "" " at a certain point, see the [Troubleshooting](https://tb-" "manual.torproject.org/troubleshooting) page for help solving the problem." msgstr "" +"Ef þú ert á tiltölulega hraðvirku neti, en framvindan virðist stöðvast á " +"einhverjum tilteknum tímapunkti, skaltu skoða síðuna um " +"[Vandamálalausnir](https://tb-manual.torproject.org/troubleshooting) til að " +"finna aðstoð við að leysa þetta." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2631,6 +2644,8 @@ msgid "" "The first screen asks if access to the Tor network is blocked or censored on" " your connection." msgstr "" +"Fyrsti skjárinn spyr hvort lokað sé á aðgang að Tor eða hvort tengingin þín " +"sé ritskoðuð." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2639,6 +2654,9 @@ msgid "" "connect to the Tor network and no other solutions have worked, click the " "switch." msgstr "" +"Ef þú veist að tengingin þín sé ritskoðuð, eða ef þú hefur þegar reynt að " +"tengjast við Tor og það mistekist án þess að nokkrar aðrar lausnir hafi " +"virkað, þá ættirðu að smella á rofann." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2690,6 +2708,8 @@ msgid "" "The first screen asks if access to the Tor network is censored on your " "connection. Click on the switch to toggle it." msgstr "" +"Fyrsti skjárinn spyr hvort aðgangurinn að Tor sé ritskoðaður á tengingunni. " +"Smelltu á rofann til að víxla honum af/á." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2796,7 +2816,7 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "Clicking on this button will provide you with a new identity." -msgstr "" +msgstr "Með því að smella á þennan hnapp muntu fá nýtt auðkenni." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2844,6 +2864,8 @@ msgid "" "Tor Browser for Android provides the same three security levels that are " "available on desktop." msgstr "" +"Tor-vafrinn fyrir Android gefur sömu þrjú öryggisstig og þau sem " +"borðtölvuútgáfan býður." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) [View Less]

1 0

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

18 Sep '20

commit 6c223f10998bb453630dded574d81643e9fa6a60 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 18 09:15:19 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/is/LC_MESSAGES/messages.po | 93 +++++++++++++++++++++++++++++++-------- 1 file changed, 74 insertions(+), 19 deletions(-) diff --git a/locale/is/LC_MESSAGES/messages.po b/locale/is/LC_MESSAGES/messages.po index 9af8e9013f..3804ffb641 100644 --- a/… [View More]locale/is/LC_MESSAGES/messages.po +++ b/locale/is/LC_MESSAGES/messages.po @@ -2,11 +2,11 @@ # Translators: # erinm, 2018 # Baddi Svali <saevartj(a)hotmail.com>, 2019 -# Sveinn í Felli <sv1(a)fellsnet.is>, 2019 +# Sveinn í Felli <sv1(a)fellsnet.is>, 2020 # msgid "" msgstr "" -"Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>, 2019\n" +"Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>, 2020\n" "Language-Team: Icelandic (https://www.transifex.com/otf/teams/1519/is/)\n" "Language: is\n" "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" @@ -744,6 +744,8 @@ msgstr "Með þinni hjálp, munum við gera Tor-netið aðgengilegt fyrir alla!" #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:101 msgid "Together, we will stand up for the universal right to privacy." msgstr "" +"Saman sýnum við stuðning í verki fyrir þau alþjóðlegu mannréttindi sem " +"fylgja réttinum til einkalífs og frelsis á netinu." #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:103 msgid "" @@ -867,10 +869,12 @@ msgid "" "Checks</a> or <a class=\"hyperlinks links\" href=\"/%langcode%/donor-faq" "#donate-anonymous\">Money Orders</a>" msgstr "" +"Ávísanir</a> eða <a class=\"hyperlinks links\" href=\"/%langcode%/donor-faq" +"#donate-anonymous\">símgreiðslur</a>" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:138 msgid "Stock Donation" -msgstr "" +msgstr "Styrkur með hlutabréfum" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:143 msgid "" @@ -1101,6 +1105,9 @@ msgid "" "<a class=\"hyperlinks links\" href=\"https://youtu.be/JWII85UlzKw\" " "target=\"_blank\">Watch this video</a> to learn more about how Tor works." msgstr "" +"<a class=\"hyperlinks links\" href=\"https://youtu.be/JWII85UlzKw\" " +"target=\"_blank\">Skoðaðu þetta myndskeið</a> til að fræðast meira um " +"hvernig Tor virkar." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:237 msgid "" @@ -1354,6 +1361,9 @@ msgid "" "For European bank transfers, we have an arrangement with the Renewable " "Freedom Foundation to provide tax-deductible donations for Europeans." msgstr "" +"Þegar um evrópskar bankamillifærslur er að ræða, þá erum við með samkomulag " +"við Renewable Freedom Foundation um að sjá um styrki sem séu frádráttarbærir" +" frá skatti fyrir evrópska ríkisborgara." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:347 msgid "" @@ -1361,10 +1371,13 @@ msgid "" "href=\"https://renewablefreedom.org/contact/\" target=\"_blank\" " "class=\"hyperlinks links\">upon request</a>." msgstr "" +"Þeir gefa úr kvittun fyrir styrknum <a " +"href=\"https://renewablefreedom.org/contact/\" target=\"_blank\" " +"class=\"hyperlinks links\">samkvæmt beiðni</a>." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:349 msgid "The account information is as follows:" -msgstr "" +msgstr "Reikningsupplýsingarnar eru eftirfarandi:" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:353 msgid "" @@ -1421,6 +1434,9 @@ msgid "" "different country, let us know and we will try to offer tax-deductibility in" " your country in the future." msgstr "" +"Ef það er mikilvægt að framlag þitt sé frádráttarbært frá sköttum í " +"einhverju öðru landi, láttu okkur þá vita svo að við getum reynt að komast " +"að því hvort slíkt sé mögulegt í framtíðinni." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:385 msgid "" @@ -1578,6 +1594,10 @@ msgid "" "Discover or American Express) or via PayPal, please visit our <a " "class=\"hyperlinks links\" href=\"/%langcode%\">donate page</a>." msgstr "" +"Til að styrkja með helstu kredit- epa debit- greiðslukortumk (VISA, " +"MasterCard, Discover eða American Express) eða í gegnum PayPal, ættirðu að " +"skoða <a class=\"hyperlinks links\" href=\"/%langcode%\">styrkjasíðuna " +"okkar</a>." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:467 msgid "Why do you ask for my address and similar information?" @@ -1627,6 +1647,9 @@ msgid "" "These people typically use a very small amount for their testing, and we've " "found that setting a $2 minimum donation seems to deter them." msgstr "" +"Þessir aðilar prófa oft mjög lágar upphæðir til að sannreyna kortin, og " +"höfum við séð að svo virðist sem lágmarksgreiðsla upp á 2 USD sé nægilegt " +"til að fæla frá slíka aðila." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:493 msgid "Is there a maximum donation?" @@ -1744,7 +1767,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:573 msgid "Can I make a stock donation?" -msgstr "" +msgstr "Get ég gefið hlutabréf ?" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:577 msgid "You can donate stock to the Tor Project." @@ -1802,6 +1825,10 @@ 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 "" +"Ef þú gefur meira en 20.000 USD til Tor-verkefnisins á einu ári, þá ber " +"okkur skylda til að upplýsa IRS skattstofuna um upphæð styrks, nafn þitt og " +"heimilisfang (ef við vitum það) í Schedule B á Form 990 eyðublaðinu, sem " +"skilað er árlega." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:623 msgid "" @@ -1949,6 +1976,9 @@ msgid "" "The fastest way to find out if your company matches donations is usually by " "checking with your HR department." msgstr "" +"Fljótlegasta leiðin til að komast að því hvort fyrirtækið þitt veitir " +"mótframlag vegna styrkja er venjulega að hafa samband við " +"mannauðsstýringardeildina þína." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:687 msgid "" @@ -1976,6 +2006,10 @@ msgid "" "links\" target=\"_blank\" href=\"https://community.torproject.org\">this is " "a good place to start</a>." msgstr "" +"Ef þú hefur áhuga á að taka þátt í Tor-verkefninu, þá er <a " +"class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://community.torproject.org\">þetta góður staður til að byrja " +"á</a>." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:701 msgid "" @@ -2005,6 +2039,9 @@ msgid "" "stickers, are presented on our main <a class=\"hyperlinks links\" " "href=\"/%langcode%\">donation page</a>." msgstr "" +"Úrval þakkargjafa fyrir styrktaraðila, meðal annars stuttermabolir, " +"hettupeysur og límmiðar, eru kynntar á <a class=\"hyperlinks links\" " +"href=\"/%langcode%\">styrkjasíðunni okkar</a>." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:721 msgid "" @@ -2045,7 +2082,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:737 msgid "Tor doesn't currently participate in the Federal CFC program." -msgstr "" +msgstr "Tor-verkefnið tekur ekki þátt í Federal CFC áætluninni." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:739 msgid "" @@ -2077,6 +2114,10 @@ msgid "" "to make a hardware donation that you think might be especially useful for " "us, please mail <span class=\"email\">giving(at)torproject.org</span>." msgstr "" +"Nei, venjulega hvetjum við fólk ekki til að gefa vélbúnað. En ef þú ert með " +"einhver tæki sem þú heldur að komi sér sérstaklega vel fyrir okkur að eiga, " +"þá geturðu sent okkur póst á <span " +"class=\"email\">giving(hjá)torproject.org</span>." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:767 msgid "Can I donate my time?" @@ -2088,6 +2129,9 @@ msgid "" "href=\"https://community.torproject.org\">list of areas where we would love " "your help</a>." msgstr "" +"Hér er <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://community.torproject.org\">listi yfir ýmis svið þar sem við " +"gætum vel þegið hjálp frá þér</a>." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:779 msgid "I would like my company to support Tor." @@ -2119,6 +2163,9 @@ msgid "" "target=\"_blank\" href=\"https://community.torproject.org/relay/\">operate a" " Tor relay</a>." msgstr "" +"Hugsanlega myndi fyrirtækið vera tilbúið að <a class=\"hyperlinks links\" " +"target=\"_blank\" href=\"https://community.torproject.org/relay/\">reka Tor-" +"endurvarpa</a>." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:791 msgid "" @@ -2209,6 +2256,8 @@ msgstr "Áskrift staðfest!" #: tmp/cache_locale/6c/6cd01cfbd4684dcca4eada963c78b5d694a2f40cd309be9366b080c410b3c5a0.php:78 msgid "Thanks for joining our email list - you'll hear from us soon!" msgstr "" +"Takk fyrir að gerast áskrifandi að póstlistanum okkar - þú heyrir frá okkur " +"fljótlega!" #: tmp/cache_locale/6c/6cd01cfbd4684dcca4eada963c78b5d694a2f40cd309be9366b080c410b3c5a0.php:80 msgid "" @@ -2377,11 +2426,11 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:89 msgid "Florida Registration #CH58356" -msgstr "" +msgstr "Florida Registration #CH58356" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:93 msgid "Georgia" -msgstr "" +msgstr "Georgia" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:95 msgid "" @@ -2392,7 +2441,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:99 msgid "Maryland" -msgstr "" +msgstr "Maryland" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:101 msgid "" @@ -2402,7 +2451,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:105 msgid "Nevada" -msgstr "" +msgstr "Nevada" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:107 msgid "" @@ -2412,7 +2461,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:111 msgid "New Jersey" -msgstr "" +msgstr "New Jersey" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:113 msgid "" @@ -2431,7 +2480,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:119 msgid "New York" -msgstr "" +msgstr "New York" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:121 msgid "" @@ -2443,7 +2492,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:125 msgid "North Carolina" -msgstr "" +msgstr "North Carolina" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:127 msgid "" @@ -2457,7 +2506,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:133 msgid "Pennsylvania" -msgstr "" +msgstr "Pennsylvania" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:135 msgid "" @@ -2468,7 +2517,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:139 msgid "Virginia" -msgstr "" +msgstr "Virginia" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:141 msgid "" @@ -2478,7 +2527,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:145 msgid "Washington" -msgstr "" +msgstr "Washington" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:147 msgid "" @@ -2489,7 +2538,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:151 msgid "West Virginia" -msgstr "" +msgstr "West Virginia" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:153 msgid "" @@ -2500,7 +2549,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:157 msgid "Wisconsin" -msgstr "" +msgstr "Wisconsin" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:159 msgid "" @@ -2528,7 +2577,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:175 msgid "Back to Donate FAQ" -msgstr "" +msgstr "Til baka á síðuna með spurningum vegna styrkja" #: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:68 msgid "Thank you for your support of the Tor Project." @@ -2555,6 +2604,8 @@ msgid "" "Tell family, friends, and colleagues that you're supporting privacy and " "security and taking back the internet with Tor!" msgstr "" +"Segðu fjölskyldu þinni, samstarfsfólki og vinum að þú styðjir við öryggi og " +"friðhelgi fólks og að almenningur eignist internetið aftur með Tor!" #: tmp/cache_locale/05/05c65ace52301a00198c48e1d823da2c14fbd489e7fb45efbca4e79e5709cbdb.php:53 msgid "Processing Donation - Tor" @@ -2583,6 +2634,8 @@ msgid "" "We believe everyone in the world should be able to enjoy the luxury our " "tools provide: private access to the open web." msgstr "" +"Við trúum því að allir eigi rétt á því að kanna internetið án afskipta " +"annarra af persónulegum upplýsingum hvers og eins." #: tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:93 msgid "" @@ -2597,6 +2650,8 @@ msgstr "Með þinni hjálp, munum við gera Tor-netið aðgengilegt fyrir alla!" #: tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:99 msgid "We're standing up for the universal human right to privacy." msgstr "" +"Saman sýnum við stuðning í verki fyrir þau alþjóðlegu mannréttindi sem " +"fylgja réttinum til einkalífs og frelsis á netinu." #: tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:101 msgid "Join us by becoming a Champion of Privacy today." [View Less]

1 0

[translation/abouttor-homepage_completed] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
by translation＠torproject.org 18 Sep '20

18 Sep '20

commit 951b95bec5e7d4b9c9c297cf53ca9ecdaca76594 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 18 08:45:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_c… --- tr/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd index 90513e77c8..cb28a8c179 100644 --- a/tr/aboutTor.dtd +++ b/tr/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.… [View More]

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 18 Sep '20

18 Sep '20

commit 1d3b02a4a28f114dffd7a24a5ad9d201b257612a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 18 08:45:03 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- tr/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd index 4af179b8e7..cb28a8c179 100644 --- a/tr/aboutTor.dtd +++ b/tr/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.… [View More]

1 0

[onionperf/master] Add path validation to filter interface
by karsten＠torproject.org 18 Sep '20

18 Sep '20

commit 1a81b3dff756cf197d661f931485443d1454c7c4 Author: Ana Custura <ana(a)netstat.org.uk> Date: Fri Aug 21 01:38:01 2020 +0100 Add path validation to filter interface --- onionperf/onionperf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/onionperf/onionperf b/onionperf/onionperf index b1e7bd3..96c6869 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -439,6 +439,9 @@ def analyze(args): def filter(args): from onionperf.filtering import Filtering + p =… [View More]

1 0

[onionperf/master] Fix naming of exclusion list
by karsten＠torproject.org 18 Sep '20

18 Sep '20

commit d9f8b8fe36fabb30bf96802130a68b9020f6a875 Author: Ana Custura <ana(a)netstat.org.uk> Date: Fri Aug 21 03:07:30 2020 +0100 Fix naming of exclusion list --- onionperf/filtering.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/onionperf/filtering.py b/onionperf/filtering.py index 204b161..ab96f1e 100644 --- a/onionperf/filtering.py +++ b/onionperf/filtering.py @@ -28,13 +28,13 @@ class Filtering(object): self.… [View More]

1 0

[onionperf/master] Add new filter mode to filter analysis results.
by karsten＠torproject.org 18 Sep '20

18 Sep '20

commit dcab214322356db9d975673d19146ff46ec86b4f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 18 21:05:45 2020 +0200 Add new filter mode to filter analysis results. Implements tpo/metrics/onionperf#33260. --- CHANGELOG.md | 6 +++ onionperf/analysis.py | 11 ++++++ onionperf/filtering.py | 100 +++++++++++++++++++++++++++++++++++++++++++++++++ onionperf/onionperf | 51 +++++++++++++++++++++++++ 4 files changed, 168 insertions(+) diff … [View More]--git a/CHANGELOG.md b/CHANGELOG.md index b8a86ee..c57695e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Changes in version 0.7 - 2020-??-?? + + - Add a new `onionperf filter` mode that takes an OnionPerf analysis + results file as input, applies filters, and produces a new + OnionPerf analysis results file as output. + # Changes in version 0.6 - 2020-08-08 - Update to TGen 1.0.0, use TGenTools for parsing TGen log files, and diff --git a/onionperf/analysis.py b/onionperf/analysis.py index ea07d0e..b2f483f 100644 --- a/onionperf/analysis.py +++ b/onionperf/analysis.py @@ -62,6 +62,11 @@ class OPAnalysis(Analysis): self.json_db['data'][self.nickname]["tgen"].pop("stream_summary") self.did_analysis = True + def set_tgen_transfers(self, node, tgen_transfers): + self.json_db['data'][node]['tgen']['transfers'] = tgen_transfers + + def set_tgen_streams(self, node, tgen_streams): + self.json_db['data'][node]['tgen']['streams'] = tgen_streams def save(self, filename=None, output_prefix=os.getcwd(), do_compress=True, date_prefix=None): if filename is None: @@ -98,6 +103,12 @@ class OPAnalysis(Analysis): except: return None + def get_tor_circuits(self, node): + try: + return self.json_db['data'][node]['tor']['circuits'] + except: + return None + def get_tor_streams(self, node): try: return self.json_db['data'][node]['tor']['streams'] diff --git a/onionperf/filtering.py b/onionperf/filtering.py new file mode 100644 index 0000000..435a1bc --- /dev/null +++ b/onionperf/filtering.py @@ -0,0 +1,100 @@ +''' + OnionPerf + Authored by Rob Jansen, 2015 + Copyright 2015-2020 The Tor Project + See LICENSE for licensing information +''' + +import re +from onionperf.analysis import OPAnalysis + +class Filtering(object): + + def __init__(self): + self.fingerprints_to_include = None + self.fingerprints_to_exclude = None + self.fingerprint_pattern = re.compile("\$?([0-9a-fA-F]{40})") + + def read_input(self, path): + self.analysis = OPAnalysis.load(filename=path) + + def include_fingerprints(self, path): + self.fingerprints_to_include = [] + with open(path, 'rt') as f: + for line in f: + fingerprint_match = self.fingerprint_pattern.match(line) + if fingerprint_match: + fingerprint = fingerprint_match.group(1).upper() + self.fingerprints_to_include.append(fingerprint) + + def exclude_fingerprints(self, path): + self.exclude_fingerprints = [] + with open(path, 'rt') as f: + for line in f: + fingerprint_match = self.fingerprint_pattern.match(line) + if fingerprint_match: + fingerprint = fingerprint_match.group(1).upper() + self.exclude_fingerprints.append(fingerprint) + + def apply_filters(self): + if self.fingerprints_to_include is None and self.fingerprints_to_exclude is None: + return + for source in self.analysis.get_nodes(): + tor_streams_by_source_port = {} + tor_streams = self.analysis.get_tor_streams(source) + for tor_stream in tor_streams.values(): + if "source" in tor_stream and ":" in tor_stream["source"]: + source_port = tor_stream["source"].split(":")[1] + tor_streams_by_source_port.setdefault(source_port, []).append(tor_stream) + tor_circuits = self.analysis.get_tor_circuits(source) + tgen_streams = self.analysis.get_tgen_streams(source) + tgen_transfers = self.analysis.get_tgen_transfers(source) + retained_tgen_streams = {} + retained_tgen_transfers = {} + while tgen_streams or tgen_transfers: + stream_id = None + transfer_id = None + source_port = None + unix_ts_end = None + keep = False + if tgen_streams: + stream_id, stream_data = tgen_streams.popitem() + if "local" in stream_data["transport_info"] and len(stream_data["transport_info"]["local"].split(":")) > 2: + source_port = stream_data["transport_info"]["local"].split(":")[2] + if "unix_ts_end" in stream_data: + unix_ts_end = stream_data["unix_ts_end"] + elif tgen_transfers: + transfer_id, transfer_data = tgen_transfers.popitem() + if "endpoint_local" in transfer_data and len(transfer_data["endpoint_local"].split(":")) > 2: + source_port = transfer_data["endpoint_local"].split(":")[2] + if "unix_ts_end" in transfer_data: + unix_ts_end = transfer_data["unix_ts_end"] + if source_port and unix_ts_end: + for tor_stream in tor_streams_by_source_port[source_port]: + if abs(unix_ts_end - tor_stream["unix_ts_end"]) < 150.0: + circuit_id = tor_stream["circuit_id"] + if circuit_id and circuit_id in tor_circuits: + tor_circuit = tor_circuits[circuit_id] + path = tor_circuit["path"] + keep = True + for long_name, _ in path: + fingerprint_match = self.fingerprint_pattern.match(long_name) + if fingerprint_match: + fingerprint = fingerprint_match.group(1).upper() + if self.fingerprints_to_include and fingerprint not in self.fingerprints_to_include: + keep = False + break + if self.fingerprints_to_exclude and fingerprint in self.fingerprints_to_exclude: + keep = False + break + if keep: + if stream_id: + retained_tgen_streams[stream_id] = stream_data + if transfer_id: + retained_tgen_transfers[transfer_id] = transfer_data + self.analysis.set_tgen_streams(source, retained_tgen_streams) + self.analysis.set_tgen_transfers(source, retained_tgen_transfers) + + def write_output(self, path): + self.analysis.save(filename=path) + diff --git a/onionperf/onionperf b/onionperf/onionperf index e8024ce..b1e7bd3 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -74,6 +74,15 @@ Stats files in the default Torperf format can also be exported. HELP_ANALYZE = """ Analyze Tor and TGen output """ + +DESC_FILTER = """ +Takes an OnionPerf analysis results file as input, applies filters, +and produces a new OnionPerf analysis results file as output. +""" +HELP_FILTER = """ +Filter OnionPerf analysis results +""" + DESC_VISUALIZE = """ Loads an OnionPerf json file, e.g., one produced with the `analyze` subcommand, and plots various interesting performance metrics to PDF files. @@ -280,6 +289,36 @@ files generated by this script will be written""", action="store", dest="date_prefix", default=None) + # filter + filter_parser = sub_parser.add_parser('filter', description=DESC_FILTER, help=HELP_FILTER, + formatter_class=my_formatter_class) + filter_parser.set_defaults(func=filter, formatter_class=my_formatter_class) + + filter_parser.add_argument('-i', '--input', + help="""read the OnionPerf analysis results at PATH as input""", + metavar="PATH", required="True", + action="store", dest="input") + + filter_parser.add_argument('--include-fingerprints', + help="""include only measurements with known circuit path and with all + relays being contained in the fingerprints file located at + PATH""", + metavar="PATH", action="store", dest="include_fingerprints", + default=None) + + filter_parser.add_argument('--exclude-fingerprints', + help="""exclude measurements without known circuit path or with any + relays being contained in the fingerprints file located at + PATH""", + metavar="PATH", action="store", dest="exclude_fingerprints", + default=None) + + filter_parser.add_argument('-o', '--output', + help="""write the filtered output OnionPerf analysis results file to + PATH""", + metavar="PATH", required="True", + action="store", dest="output") + # visualize visualize_parser = sub_parser.add_parser('visualize', description=DESC_VISUALIZE, help=HELP_VISUALIZE, formatter_class=my_formatter_class) @@ -397,6 +436,18 @@ def analyze(args): else: logging.error("Given paths were an unrecognized mix of file and directory paths, nothing will be analyzed") +def filter(args): + from onionperf.filtering import Filtering + + filtering = Filtering() + filtering.read_input(args.input) + if args.include_fingerprints is not None: + filtering.include_fingerprints(args.include_fingerprints) + if args.exclude_fingerprints is not None: + filtering.exclude_fingerprints(args.exclude_fingerprints) + filtering.apply_filters() + filtering.write_output(args.output) + def visualize(args): from onionperf.visualization import TGenVisualization from onionperf.analysis import OPAnalysis [View Less]

1 0

[onionperf/master] Also accept a directory in `onionperf filter -i`.
by karsten＠torproject.org 18 Sep '20

18 Sep '20

commit 053da92c69d4b3628f33e1dd610a1bc8f601cbe0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 27 09:59:59 2020 +0200 Also accept a directory in `onionperf filter -i`. And clarify that we're leaving statistics unchanged as part of the filtering. --- CHANGELOG.md | 4 ++-- onionperf/filtering.py | 10 +++------- onionperf/onionperf | 35 ++++++++++++++++++++++++----------- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/… [View More]CHANGELOG.md b/CHANGELOG.md index c57695e..ebd43e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ # Changes in version 0.7 - 2020-??-?? - Add a new `onionperf filter` mode that takes an OnionPerf analysis - results file as input, applies filters, and produces a new - OnionPerf analysis results file as output. + results file or directory as input, applies filters, and produces + new OnionPerf analysis results file(s) as output. # Changes in version 0.6 - 2020-08-08 diff --git a/onionperf/filtering.py b/onionperf/filtering.py index ab96f1e..b431eb9 100644 --- a/onionperf/filtering.py +++ b/onionperf/filtering.py @@ -15,9 +15,6 @@ class Filtering(object): self.fingerprints_to_exclude = None self.fingerprint_pattern = re.compile("\$?([0-9a-fA-F]{40})") - def read_input(self, path): - self.analysis = OPAnalysis.load(filename=path) - def include_fingerprints(self, path): self.fingerprints_to_include = [] with open(path, 'rt') as f: @@ -36,7 +33,8 @@ class Filtering(object): fingerprint = fingerprint_match.group(1).upper() self.fingerprints_to_exclude.append(fingerprint) - def apply_filters(self): + def apply_filters(self, input_path, output_dir, output_file): + self.analysis = OPAnalysis.load(filename=input_path) if self.fingerprints_to_include is None and self.fingerprints_to_exclude is None: return for source in self.analysis.get_nodes(): @@ -94,7 +92,5 @@ class Filtering(object): retained_tgen_transfers[transfer_id] = transfer_data self.analysis.set_tgen_streams(source, retained_tgen_streams) self.analysis.set_tgen_transfers(source, retained_tgen_transfers) - - def write_output(self, path): - self.analysis.save(filename=path) + self.analysis.save(filename=output_file, output_prefix=output_dir) diff --git a/onionperf/onionperf b/onionperf/onionperf index 96c6869..7c16aea 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -76,8 +76,11 @@ Analyze Tor and TGen output """ DESC_FILTER = """ -Takes an OnionPerf analysis results file as input, applies filters, -and produces a new OnionPerf analysis results file as output. +Takes an OnionPerf analysis results file or directory as input, applies filters, +and produces new OnionPerf analysis results file(s) as output. + +This subcommand only filters measurements in `data/[source]/tgen/transfers` +and `data/[source]/tgen/streams`, but leaves any summaries unchanged. """ HELP_FILTER = """ Filter OnionPerf analysis results @@ -295,7 +298,8 @@ files generated by this script will be written""", filter_parser.set_defaults(func=filter, formatter_class=my_formatter_class) filter_parser.add_argument('-i', '--input', - help="""read the OnionPerf analysis results at PATH as input""", + help="""a file or directory PATH from which OnionPerf analysis results + files are read""", metavar="PATH", required="True", action="store", dest="input") @@ -314,8 +318,8 @@ files generated by this script will be written""", default=None) filter_parser.add_argument('-o', '--output', - help="""write the filtered output OnionPerf analysis results file to - PATH""", + help="""a file or directory PATH where filtered output OnionPerf + analysis results files are written""", metavar="PATH", required="True", action="store", dest="output") @@ -439,17 +443,26 @@ def analyze(args): def filter(args): from onionperf.filtering import Filtering - p = os.path.abspath(os.path.expanduser(args.input)) - if not os.path.exists(p): - raise argparse.ArgumentTypeError("path '%s' does not exist" % args.input) + input_path = os.path.abspath(os.path.expanduser(args.input)) + if not os.path.exists(input_path): + raise argparse.ArgumentTypeError("input path '%s' does not exist" % args.input) + output_path = os.path.abspath(os.path.expanduser(args.output)) + if os.path.exists(output_path): + raise argparse.ArgumentTypeError("output path '%s' already exists" % args.output) filtering = Filtering() - filtering.read_input(args.input) if args.include_fingerprints is not None: filtering.include_fingerprints(args.include_fingerprints) if args.exclude_fingerprints is not None: filtering.exclude_fingerprints(args.exclude_fingerprints) - filtering.apply_filters() - filtering.write_output(args.output) + if os.path.isfile(input_path): + output_dir, output_file = os.path.split(output_path) + filtering.apply_filters(input_path=input_path, output_dir=output_dir, output_file=output_file) + else: + for dirpath, dirnames, filenames in os.walk(input_path): + for filename in filenames: + input_file = os.path.join(dirpath, filename) + output_dir = os.path.join(output_path, os.path.relpath(dirpath, input_path)) + filtering.apply_filters(input_path=input_file, output_dir=output_dir, output_file=filename) def visualize(args): from onionperf.visualization import TGenVisualization [View Less]

1 0