date:20210205

[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot

2021-02-05 Thread translation

commit e3e9f66154d419b1f09488238bf6fec59fb75902
Author: Translation commit bot 
Date:   Sat Feb 6 07:45:13 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ko/LC_MESSAGES/messages.po | 55 +++
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/locale/ko/LC_MESSAGES/messages.po 
b/locale/ko/LC_MESSAGES/messages.po
index b0fa857df3..8e616d8e40 100644
--- a/locale/ko/LC_MESSAGES/messages.po
+++ b/locale/ko/LC_MESSAGES/messages.po
@@ -1908,7 +1908,7 @@ msgstr ""
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:731
 msgid ""
 "Does the Tor Project participate in the Combined Federal Campaign program?"
-msgstr "Tor íë¡ì í¸ë íµí© ì°ë°©ì ë¶ íë¡ê·¸ë¨ì 
ì°¸ì¬í©ëê¹?"
+msgstr "Tor íë¡ì í¸ë CFC íë¡ê·¸ë¨ì ì°¸ì¬í©ëê¹?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:735
 msgid ""
@@ -1923,27 +1923,27 @@ msgstr ""
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:737
 msgid "Tor doesn't currently participate in the Federal CFC program."
-msgstr "Torë íì¬ íµí© ì°ë°©ì ë¶ íë¡ê·¸ë¨ì ì°¸ê°íì§ 
ììµëë¤."
+msgstr "Torë íì¬ CFC íë¡ê·¸ë¨ì ì°¸ê°íì§ ììµëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:739
 msgid ""
 "If you'd like to get Tor added to the CFC program in your location, that "
 "would be great: please let us know if you need any help."
-msgstr ""
+msgstr "Torë¥¼ ë¹ì ì ìì¹ìì CFC íë¡ê·¸ë¨ì ì¶ê°íê¸°ë¥¼ 
ìíì ë¤ë©´, ì¢ì ê²ìëë¤. ëìì´ íìíìë©´ ì í¬ìê² 
ìë ¤ì£¼ì¸ì."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:745
 msgid "Can I donate my airline miles, flight vouchers, or hotel points?"
-msgstr ""
+msgstr "íê³µ ë§ì¼ë¦¬ì§, íê³µê¶ ëë í¸í í¬ì¸í¸ë¥¼ ê¸°ë¶í  
ì ììµëê¹?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:751
 msgid ""
 "We would like to accept your miles, vouchers and hotel points, and in the "
 "future we may be able to."
-msgstr ""
+msgstr "ì í¬ë ê·íì ë§ì¼ë¦¬ì§, ìíê¶, í¸í í¬ì¸í¸ë¥¼ ë°ê³ 
 ì¶ìµëë¤. ê·¸ë¦¬ê³  ì°ë¦¬ë ê³§ ê·¸ë ê² í  ì ìì ê²ìëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:757
 msgid "Can I donate hardware?"
-msgstr ""
+msgstr "íëì¨ì´ë¥¼ ê¸°ë¶í  ì ììµëê¹?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:761
 msgid ""
@@ -1951,10 +1951,13 @@ msgid ""
 "to make a hardware donation that you think might be especially useful for "
 "us, please mail giving(at)torproject.org."
 msgstr ""
+"ì¼ë°ì ì¼ë¡, ì í¬ë ì¬ëë¤ìê² íëì¨ì´ë¥¼ ê¸°ë¶íëë¡ 
ê¶ì¥íì§ ììµëë¤. íì§ë§ ì í¬ìê² í¹í ì ì©íë¤ê³  
ìê°ëë íëì¨ì´ ê¸°ë¶ë¥¼ íê³  "
+"ì¶ì¼ìë¤ë©´, giving(at)torproject.orgì¼ë¡ 
ì´ë©ì¼ì ë³´ë´ì£¼ìê¸° "
+"ë°ëëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:767
 msgid "Can I donate my time?"
-msgstr ""
+msgstr "ëìì ëë ¤ë ëëì?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:773
 msgid ""
@@ -1962,26 +1965,28 @@ msgid ""
 "href=\"https://community.torproject.org\;>list of areas where we would love "
 "your help."
 msgstr ""
+"ì¬ê¸° ê·íì https://community.torproject.org\;>ëìì´ íìí ëª©ë¡ì´ 
ììµëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:779
 msgid "I would like my company to support Tor."
-msgstr ""
+msgstr "ì í¬ íì¬ê° Torë¥¼ ì§ìíì¼ë©´ í©ëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:781
 msgid "What can we do to help?"
-msgstr ""
+msgstr "ì í¬ê° ë¬´ìì ëì¸ ì ììê¹ì?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:785
 msgid ""
 "Your company could match donations made by its employees to the Tor Project"
 "--that would be wonderful."
-msgstr ""
+msgstr "ê·íì íì¬ë Tor íë¡ì í¸ì ë§¤ì¹ ê¸°ë¶ë¥¼ í  ì 
ììµëë¤. ì ë§ ë©ì§ ê²ëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:787
 msgid ""
 "Your company may operate a corporate foundation that gives out grants, and "
 "if so, you should encourage it to fund us."
-msgstr ""
+msgstr "ê·íë ë³´ì¡°ê¸ì ì£¼ë ë²ì¸ ì¬ë¨ì ì´ìí  ì 
ìì¼ë©°, ë§ì½ ê·¸ë ë¤ë©´, ê·íë ì í¬ìê² ìê¸ì ë ì 
ìëë¡ ì¥ë ¤í´ì¼ í©ëë¤."
 
 #:

[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot

2021-02-05 Thread translation

commit b0a2010d95702218ae26f1826a9aa980d9a0de66
Author: Translation commit bot 
Date:   Sat Feb 6 07:15:13 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ko/LC_MESSAGES/messages.po | 15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/locale/ko/LC_MESSAGES/messages.po 
b/locale/ko/LC_MESSAGES/messages.po
index 07f5fa22ea..b0fa857df3 100644
--- a/locale/ko/LC_MESSAGES/messages.po
+++ b/locale/ko/LC_MESSAGES/messages.po
@@ -1887,7 +1887,7 @@ msgstr ""
 msgid ""
 "If I want to stay in touch with the Tor Project, what's the best way for me "
 "to do that?"
-msgstr ""
+msgstr "Tor íë¡ì í¸ì ììì ê³ì ë£ê³  ì¶ì¼ë©´ ì´ë»ê² íë 
ê² ê°ì¥ ì¢ìê¹ì?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:725
 msgid ""
@@ -1898,11 +1898,17 @@ msgid ""
 " links\" target=\"_blank\" href=\"https://twitter.com/torproject\;>follow us"
 " on Twitter."
 msgstr ""
+"https://newsletter.torproject.org/\;>Tor ë´ì¤ë¥¼ êµ¬ë
íê±°ë, https://blog.torproject.org/\;>Tor ë¸ë¡ê·¸ë¥¼ ì½ê±°ë, ì í¬ 
https://twitter.com/torproject\;>í¸ìí° ê³ì ì 
íë¡ì°íì¸ì."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:731
 msgid ""
 "Does the Tor Project participate in the Combined Federal Campaign program?"
-msgstr ""
+msgstr "Tor íë¡ì í¸ë íµí© ì°ë°©ì ë¶ íë¡ê·¸ë¨ì 
ì°¸ì¬í©ëê¹?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:735
 msgid ""
@@ -1911,10 +1917,13 @@ msgid ""
 "target=\"_blank\" class=\"hyperlinks links\">King County Employee Giving "
 "Program."
 msgstr ""
+"Torë https://www.kingcounty.gov/audience/employees/giving.aspx\; "
+"target=\"_blank\" class=\"hyperlinks links\">í¹ ì¹´ì´í° ì§ì ê¸°ë¶ 
íë¡ê·¸ë¨ì ì°¸ì¬íëë¡ ëì´ "
+"ììµëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:737
 msgid "Tor doesn't currently participate in the Federal CFC program."
-msgstr ""
+msgstr "Torë íì¬ íµí© ì°ë°©ì ë¶ íë¡ê·¸ë¨ì ì°¸ê°íì§ 
ììµëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:739
 msgid ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot

2021-02-05 Thread translation

commit 9270a4722d6b9519a30f533427fbaf3a7ac0e729
Author: Translation commit bot 
Date:   Sat Feb 6 06:15:19 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ko/LC_MESSAGES/messages.po | 31 ---
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/locale/ko/LC_MESSAGES/messages.po 
b/locale/ko/LC_MESSAGES/messages.po
index 60ff9ccf61..07f5fa22ea 100644
--- a/locale/ko/LC_MESSAGES/messages.po
+++ b/locale/ko/LC_MESSAGES/messages.po
@@ -1777,7 +1777,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:663
 msgid "What is your refund policy?"
-msgstr "ë¹ì ë¤ì íë¶ ì ì±ì ë¬´ììëê¹?"
+msgstr "ê¸°ë¶ê¸ì íë¶ ë°ì¼ë ¤ë©´ ì´ë»ê² í´ì¼ í©ëê¹?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:667
 msgid ""
@@ -1792,11 +1792,11 @@ msgid ""
 "To process your refund we'll need to know the date of your donation, the "
 "amount you donated, your full name, the payment method you used and your "
 "country of origin."
-msgstr ""
+msgstr "íë¶ì ì§ííë ¤ë©´ ê¸°ë¶ ë ì§, ê¸°ë¶í ê¸ì¡, ì ì²´ 
ì´ë¦, ì¬ì©í ê²°ì  ë°©ë² ë° êµê°ë¥¼ ììì¼ í©ëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:671
 msgid "Please also tell us why you're asking for a refund."
-msgstr ""
+msgstr "ê·¸ë¦¬ê³  íë¶ì ìì²íë ì´ì ë ìë ¤ì£¼ì¸ì."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:673
 msgid ""
@@ -1804,10 +1804,11 @@ msgid ""
 " to be made in a specific way, so we may need additional information from "
 "you in order to process yours."
 msgstr ""
+"ì¼ë¶ ì§ë¶ ë°©ë²ì íë¶ì ì§ìíì§ ìê±°ë í¹ì í 
ë°©ë²ì¼ë¡ í´ì¼ íë¯ë¡ ê·íì ì ë³´ë¥¼ ì²ë¦¬íê¸° ìí´ ì¶ê° ì 
ë³´ê° íìí  ì ììµëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:679
 msgid "Does Tor Project accept matching donations?"
-msgstr ""
+msgstr "Tor íë¡ì í¸ë ë§¤ì¹ ê¸°ë¶ê¸ì ë°ìµëê¹?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:683
 msgid ""
@@ -1815,28 +1816,32 @@ msgid ""
 "Verizon, Red Hat, many universities, and others-- will match donations made "
 "by their employees."
 msgstr ""
+"ë¤! êµ¬ê¸, ë§ì´í¬ë¡ìíí¸, eBay, PayPal, Apple, Verizon, Red Hat, 
ê·¸ë¦¬ê³  ë§ì ëíë¤ê³¼ ê°ì ë§ì "
+"íì¬ë¤ì´ ì§ì ë§¤ì¹ ê¸°ë¶ë¥¼ í©ëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:685
 msgid ""
 "The fastest way to find out if your company matches donations is usually by "
 "checking with your HR department."
-msgstr ""
+msgstr "íì¬ìì ë§¤ì¹ ê¸°ë¶ë¥¼ íëì§ íì¸íë ê°ì¥ ë¹ ë¥¸ 
ë°©ë²ì ëê° ì¸ì¬ ë¶ìì íì¸íë ê²ìëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:687
 msgid ""
 "If you want help figuring out the process, write us at giving(at)torproject.org."
 msgstr ""
+"ê³¼ì ì íìíë ë° ëìì´ íìíë©´ giving(at)torproject.orgì "
+"ë¬¸ìíììì¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:693
 msgid "Can I become a Tor Project member?"
-msgstr ""
+msgstr "Tor íë¡ì í¸ íìì´ ë  ì ìëì?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:697
 msgid ""
 "Right now, we don't have a membership program, but we may set one up in the "
 "future."
-msgstr ""
+msgstr "ì§ê¸ì ë©¤ë²ì íë¡ê·¸ë¨ì´ ìì§ë§, ìì¼ë¡ ë©¤ë²ì 
íë¡ê·¸ë¨ì ë§ë ¨í  ìë ììµëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:699
 msgid ""
@@ -1844,28 +1849,30 @@ msgid ""
 "links\" target=\"_blank\" href=\"https://community.torproject.org\;>this is "
 "a good place to start."
 msgstr ""
+"Tor íë¡ì í¸ì ì°¸ì¬íê³  ì¶ë¤ë©´, https://community.torproject.org\;>ì´ê³³ì ì°¸ì¬íê¸°ì ì¢ì 
ê³³ìëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:701
 msgid ""
 "We do have two giving programs - Champions of Privacy and Defenders of "
 "Privacy."
-msgstr ""
+msgstr "ì°ë¦¬ë ë ê°ì§ ê¸°ë¶ íë¡ê·¸ë¨ì ê°ì§ê³  ììµëë¤ - 
ê°ì¸ ì ë³´ì ì±í¼ì¸ê³¼ ê°ì¸ ì ë³´ì ìí¸ìë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:703
 msgid ""
 "Champions of Privacy donate $1,000 or more per year and enjoy special perks "
 "and access."
-msgstr ""
+msgstr "ê°ì¸ ì ë³´ ì±í¼ì¸ì ë§¤ë 1,000ë¬ë¬ ì´ìì ê¸°ë¶íê³  
í¹ë³ ííê³¼ ì¡ì¸ì¤ë¥¼ ì¦ê¸¸ ì ììµëë¤."
 
 #:

[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot

2021-02-05 Thread translation

commit c8238056e17be575e38119570a07a31213143be1
Author: Translation commit bot 
Date:   Sat Feb 6 05:45:17 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ko/LC_MESSAGES/messages.po | 83 +--
 1 file changed, 53 insertions(+), 30 deletions(-)

diff --git a/locale/ko/LC_MESSAGES/messages.po 
b/locale/ko/LC_MESSAGES/messages.po
index 35117933c0..60ff9ccf61 100644
--- a/locale/ko/LC_MESSAGES/messages.po
+++ b/locale/ko/LC_MESSAGES/messages.po
@@ -1551,47 +1551,49 @@ msgstr "ì°í¸íì ë³´ë´ë ë°©ë²ì¼ë¡ ê¸°ë¶ë¥¼ 
íì¤ ì ììµëë¤."
 msgid ""
 "You can donate via bitcoin or another cryptocurrency if you have it set up "
 "in a way that preserves your anonymity."
-msgstr ""
+msgstr "ìµëªì±ì ë³´ì¡´íë ë°©ìì¼ë¡ ì¤ì í ê²½ì° 
ë¹í¸ì½ì¸ì´ë ë¤ë¥¸ ìí¸ííë¥¼ íµí´ ê¸°ë¶í  ì ììµëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:513
 msgid "You can buy cash gift cards and mail them to us."
-msgstr ""
+msgstr "íê¸ ê¸°íí¸ ì¹´ëë¥¼ êµ¬ë§¤íìì ì í¬ìê² ì°í¸ì¼ë¡ 
ë³´ë´ì¤ ìë ììµëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:515
 msgid ""
 "There are probably other ways to donate anonymously that we haven't thought "
 "of -- maybe you will."
-msgstr ""
+msgstr "ìë§ ìµëªì¼ë¡ ê¸°ë¶í  ì ìë ë¤ë¥¸ ë°©ë²ë¤ì´ ìì 
ê²ìëë¤. ì°ë¦¬ê° ë¯¸ì² ìê°íì§ ëª»íë ê²ë¤ì´ê² ì£ ."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:521
 msgid "Can I donate by mail?"
-msgstr ""
+msgstr "ì°í¸ì¼ë¡ ê¸°ë¶ë¥¼ í  ì ìëì?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:525
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:537
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:771
 msgid "Yes."
-msgstr ""
+msgstr "ë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:527
 msgid ""
 "Our mailing address is The Tor Project, 217 First Avenue South #4903, "
 "Seattle WA 98194, USA."
 msgstr ""
+"ì í¬ ì°í¸ ì£¼ìë The Tor Project, 217 First Avenue South #4903, 
Seattle WA "
+"98194, USAìëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:533
 msgid "Do you accept cash donations?"
-msgstr ""
+msgstr "íê¸ ê¸°ë¶ë ë°ìµëê¹?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:543
 msgid "Can I donate via AmazonSmile?"
-msgstr ""
+msgstr "ìë§ì¡´ ì¤ë§ì¼ë¡ ê¸°ë¶ë¥¼ í  ì ìëì?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:547
 msgid ""
 "Amazon Smile is a website operated by Amazon with the same products, prices,"
 " and shopping features as Amazon.com."
-msgstr ""
+msgstr "ìë§ì¡´ ì¤ë§ì¼ì ìë§ì¡´ì´ ì´ìíë ì¹ì¬ì´í¸ë¡, 
Amazon.comê³¼ ëì¼í ì í, ê°ê²©, ì¼í ê¸°ë¥ì ê°ì§ê³  
ììµëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:549
 #, php-format
@@ -1600,22 +1602,27 @@ msgid ""
 "Foundation will donate 0.5% of the purchase price of eligible products to "
 "the charitable organization of your choice."
 msgstr ""
+"ì°¨ì´ì ì ìë§ì¡´ ì¤ë§ì¼ìì ì¼íí  ë ìë§ì¡´ ì¤ë§ì¼ 
ì¬ë¨ì´ ì ê²© ì í êµ¬ë§¤ ê°ê²©ì 0.5%ë¥¼ ìì ì´ ì íí ìì 
ë¨ì²´ì ê¸°ë¶íë¤ë "
+"ê²ìëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:553
 msgid ""
 "https://smile.amazon.com/ch/20-8096820\; target=\"_blank\" "
 "class=\"hyperlinks links\">Set up the Tor Project on Amazon Smile"
 msgstr ""
+"https://smile.amazon.com/ch/20-8096820\; target=\"_blank\" "
+"class=\"hyperlinks links\">ìë§ì¡´ ì¤ë§ì¼ìì Tor íë¡ì í¸ ì¤ì 
"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:559
 msgid "Can I donate via Giving Assistant?"
-msgstr ""
+msgstr "ê¸°ë¹ ì´ìì¤í´í¸ë¥¼ íµí´ ê¸°ë¶í  ì ìëì?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:563
 msgid ""
 "Giving Assistant helps you donate a percentage of your cash back earnings to"
 " us with every purchase you make at 3,000+ popular online retailers."
 msgstr ""
+"ê¸°ë¹ ì´ìì¤í´í¸ë 3,000ê° ì´ìì ì¸ê¸° ì¨ë¼ì¸ ìë§¤ì ìì 
êµ¬ë§¤í  ëë§ë¤ íê¸ ììµì ì¼ë¶ë¥¼ ì í¬ìê² ê¸°ë¶íë ë° 
ëìì´ ë©ëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:567
 msgid ""
@@ -1623,58 +1630,62 @@ msgid ""
 " class=\"hyperlinks links\">Use Giving

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2021-02-05 Thread translation

commit 7da4ac39055128d4332417f0be0f6a791627a5b8
Author: Translation commit bot 
Date:   Sat Feb 6 05:18:05 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ko.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+ko.po b/contents+ko.po
index 5ea8bcd80a..172a27b9a1 100644
--- a/contents+ko.po
+++ b/contents+ko.po
@@ -2378,7 +2378,7 @@ msgstr ""
 #: https//support.torproject.org/about/distribute-tor/
 #: (content/about/distribute-tor/contents+en.lrquestion.description)
 msgid "Yes."
-msgstr ""
+msgstr "ë¤."
 
 #: https//support.torproject.org/about/distribute-tor/
 #: (content/about/distribute-tor/contents+en.lrquestion.description)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot

2021-02-05 Thread translation

commit 252b3652e1d3fbb5de00259ff527e9c8c4be98bc
Author: Translation commit bot 
Date:   Sat Feb 6 05:15:20 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ko/LC_MESSAGES/messages.po | 67 +--
 1 file changed, 44 insertions(+), 23 deletions(-)

diff --git a/locale/ko/LC_MESSAGES/messages.po 
b/locale/ko/LC_MESSAGES/messages.po
index 985e34d98d..35117933c0 100644
--- a/locale/ko/LC_MESSAGES/messages.po
+++ b/locale/ko/LC_MESSAGES/messages.po
@@ -1340,7 +1340,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:391
 msgid "They also like donations of bandwidth from ISPs."
-msgstr ""
+msgstr "ê·¸ë¤ì ëí ì¸í°ë· ìë¹ì¤ ì ê³µì¬ììì ëìí 
ê¸°ë¶ë¥¼ ì¢ìí©ëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:395
 msgid ""
@@ -1349,6 +1349,9 @@ msgid ""
 "501(c)(3) non-profit that collects donations and turns them into more US-"
 "based exit relay capacity."
 msgstr ""
+"https://www.noisebridge.net/wiki/Noisebridge_Tor\; "
+"target=\"_blank\" class=\"hyperlinks links\">ë¸ì´ì¦ë¸ë¦¿ì§ë 
ê¸°ë¶ê¸ì ëª¨ì ë ë§ì ë¯¸êµ ê¸°ë° "
+"ì¶êµ¬ ë¦´ë ì´ ë¥ë ¥ì¼ë¡ ë°ê¾¸ë ë¯¸êµ ê¸°ë° 501(c)(3) ë¹ìë¦¬ 
ë¨ì²´ìëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:399
 msgid ""
@@ -1356,6 +1359,8 @@ msgid ""
 "links\">Nos Oignons is a French charitable non-profit that runs fast "
 "exit relays in France."
 msgstr ""
+"https://nos-oignons.net/\; target=\"_blank\" class=\"hyperlinks "
+"links\">Nos Oignonsë íëì¤ìì ë¹ ë¥¸ ì¶êµ¬ ë¦´ë ì´ë¥¼ 
ì´ìíë íëì¤ì ìì  ë¹ìë¦¬ ë¨ì²´ìëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:403
 msgid ""
@@ -1363,6 +1368,8 @@ msgid ""
 "class=\"hyperlinks links\">DFRI is a Swedish non-profit running exit "
 "relays."
 msgstr ""
+"https://www.dfri.se/donera/?lang=en\; target=\"_blank\" "
+"class=\"hyperlinks links\">DFRIë ì¤ì¨ë´ì ë¹ìë¦¬ ì¤íí 
ì¶êµ¬ ë¦´ë ì´ìëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:407
 msgid ""
@@ -1370,21 +1377,23 @@ msgid ""
 "target=\"_blank\" class=\"hyperlinks links\">The Tor Project, Inc, but "
 "we consider that a good thing."
 msgstr ""
+"ì´ ì¡°ì§ë¤ì The Tor Project, Inc.ì ê°ì§ ìì§ë§, ì í¬ë ê·¸ê²ì´ 
ì¢ì ê²ì´ë¼ê³  ìê°í©ëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:409
 msgid "They're run by nice people who are part of the Tor community."
-msgstr ""
+msgstr "Tor ì»¤ë®¤ëí°ì ìí ì¹ì í ì¬ëë¤ì´ ì´ìí©ëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:415
 msgid ""
 "Can I donate to a specific project, or restrict my donation to a particular "
 "purpose?"
-msgstr ""
+msgstr "í¹ì  íë¡ì í¸ì ê¸°ë¶ë¥¼ íê±°ë í¹ì  ëª©ì ì¼ë¡ 
ê¸°ë¶ë¥¼ ì íí  ì ììµëê¹?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:419
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:749
 msgid "No, sorry."
-msgstr ""
+msgstr "ì£ì¡íì§ë§ ì ë©ëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:421
 msgid ""
@@ -1392,68 +1401,72 @@ msgid ""
 "used, we're required by the IRS to track and report separately on that "
 "money."
 msgstr ""
+"ë§ì½ ì í¬ê° ê·¸ë¤ì´ ì´ë»ê² ì¬ì©íê¸¸ ìíëì§ ëªìí 
ì¬ëì ê¸°ë¶ë¥¼ ë°ìë¤ì¸ë¤ë©´, ì í¬ë êµì¸ì²ìì ê·¸ ëì 
ë°ë¡ ì¶ì íê³  ë³´ê³ íëë¡ "
+"ìêµ¬ë°ìµëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:423
 msgid ""
 "That would be a big administrative burden for a small organization, and we "
 "don't think it's a good idea for us."
-msgstr ""
+msgstr "ê·¸ê²ì ìì ì¡°ì§ìê²ë í° íì  ë¶ë´ì´ ë  ê²ì´ê³ , ì 
í¬ë ê·¸ê²ì´ ì í¬ìê² ì¢ì ë°©ë²ì´ë¼ê³  ìê°íì§ 
ììµëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:425
 msgid ""
 "However, we would be very happy to hear your ideas and feedback about our "
 "work."
-msgstr ""
+msgstr "íì§ë§, ì í¬ë ì í¬ì ììì ëí ê·íì 
ìì´ëì´ì í¼ëë°±ì ë¤ì¼ë©´ ë§¤ì° ê¸°ì  ê²ìëë¤."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:427
 msgid ""
 "If you're donating using a mechanism that allows for comments, feel free to "
 "send your thoughts that way."
-msgstr ""
+msgstr "ë§ì½ ì¬ë¬ë¶ì´ ëê¸ì íì©íë ì²´ì ë¥¼ ì¬ì©íì¬ 
ê¸°ë¶íë¤ë©´, ì¬ë¬ë¶ì

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2021-02-05 Thread translation

commit 4e3e50dc2cb95e75a124bea6ccb9a2910c33123c
Author: Translation commit bot 
Date:   Sat Feb 6 04:16:33 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 ja.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ja.po b/ja.po
index 8ad3a74b4c..d0281eb209 100644
--- a/ja.po
+++ b/ja.po
@@ -34,7 +34,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
-"PO-Revision-Date: 2021-01-08 13:12+\n"
+"PO-Revision-Date: 2021-02-06 03:59+\n"
 "Last-Translator: Ito Takeshi\n"
 "Language-Team: Japanese 
(http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2021-02-05 Thread translation

commit b01e991b22d660189c5aba74d79fbc90272c1d5a
Author: Translation commit bot 
Date:   Sat Feb 6 04:15:51 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 ja.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ja.po b/ja.po
index f1b887fef4..af8ec6d159 100644
--- a/ja.po
+++ b/ja.po
@@ -34,7 +34,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
-"PO-Revision-Date: 2021-01-08 13:12+\n"
+"PO-Revision-Date: 2021-02-06 03:59+\n"
 "Last-Translator: Ito Takeshi\n"
 "Language-Team: Japanese 
(http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -187,7 +187,7 @@ msgstr "ã·ã¹ãã ã¯ææ°çã§ã"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:364
 msgid "This version of Tails is outdated, and may have security issues."
-msgstr "Tails 
ã®ãã®ãã¼ã¸ã§ã³ã¯æ§ããã»ãã¥ãªãã£ä¸ã®åé¡ãããå 
´åãããã¾ãã"
+msgstr "ãã®ãã¼ã¸ã§ã³ã® Tails 
ã¯å¤ããã»ãã¥ãªãã£ä¸ã®åé¡ãããå ´åãããã¾ãã"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:395
 #, perl-brace-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/master] fix grammar error in metrics job description

2021-02-05 Thread arma

commit c906c45ada313210e34bfa03a2855c876228a1b0
Author: Roger Dingledine 
Date:   Fri Feb 5 22:31:39 2021 -0500

fix grammar error in metrics job description
---
 content/about/jobs/metrics-data-architect/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/about/jobs/metrics-data-architect/contents.lr 
b/content/about/jobs/metrics-data-architect/contents.lr
index be69a7bc..94ed6775 100644
--- a/content/about/jobs/metrics-data-architect/contents.lr
+++ b/content/about/jobs/metrics-data-architect/contents.lr
@@ -40,7 +40,7 @@ How we achieve our goals:
 
 The most interesting challenge for metrics collection at Tor is how to gather 
data on an anonymity system without de-anonymizing users.
 
-We are integrating the metrics team with a new network health team that will 
be also focusing on taking care of the health of the Tor network. Additionally, 
Tor has just begin a large network performance improvement project that will 
vastly increase network utilization and client performance. There will be close 
interaction between this role and our performance effort, in the form of 
ensuring data is collected properly during deployment of new performance 
features and performance tuning. This will also include producing custom 
visualizations, doing analysis, and  comparisons between historical and current 
data.
+We are integrating the metrics team with a new network health team that will 
be also focusing on taking care of the health of the Tor network. Additionally, 
Tor has just begun a large network performance improvement project that will 
vastly increase network utilization and client performance. There will be close 
interaction between this role and our performance effort, in the form of 
ensuring data is collected properly during deployment of new performance 
features and performance tuning. This will also include producing custom 
visualizations, doing analysis, and  comparisons between historical and current 
data.
 
 ### The job
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/exoneratorproperties] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties

2021-02-05 Thread translation

commit 9d672948bce5dc2604033244f4d18ad580daa225
Author: Translation commit bot 
Date:   Sat Feb 6 00:15:20 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties
---
 hy/exonerator.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hy/exonerator.properties b/hy/exonerator.properties
index bb11db4de9..1659643c3c 100644
--- a/hy/exonerator.properties
+++ b/hy/exonerator.properties
@@ -1,5 +1,5 @@
 form.explanation=Enter an IP address and date to find out whether that address 
was used as a Tor relay:
-form.ip.label=IP address
+form.ip.label=IP Õ°Õ¡Õ½ÖÕ¥
 form.timestamp.label=Ô±Õ´Õ½Õ¡Õ©Õ«Õ¾
 form.search.label=ÕÖÕ¸Õ¶Õ¥Õ¬
 summary.heading=Ô±Õ´ÖÕ¸ÖÕ¸ÖÕ´
@@ -33,10 +33,10 @@ summary.negative.body=We did not find IP address %s on or 
within a day of %s.
 technicaldetails.heading=Technical details
 technicaldetails.pre=Looking up IP address %s on or within one day of %s. Tor 
clients could have selected this or these Tor relays to build circuits.
 technicaldetails.colheader.timestamp=Timestamp (UTC)
-technicaldetails.colheader.ip=IP address(es)
+technicaldetails.colheader.ip=IP Õ°Õ¡Õ½ÖÕ¥(Õ¶Õ¥Ö)
 technicaldetails.colheader.fingerprint=Identity fingerprint
-technicaldetails.colheader.nickname=Nickname
-technicaldetails.colheader.exit=Exit relay
+technicaldetails.colheader.nickname=ÕÕ¡Õ¯Õ¡Õ¶Õ¸ÖÕ¶
+technicaldetails.colheader.exit=ÔµÕ¬Õ¶Õ¥Õ¬ Õ°Õ¥ÖÕ©Õ¡ÖÕ¸ÕÕ¸ÖÕ©ÕµÕ¸ÖÕ¶Õ«Ö
 technicaldetails.nickname.unknown=Ô±Õ¶Õ°Õ¡ÕµÕ¿
 technicaldetails.exit.unknown=Ô±Õ¶Õ°Õ¡ÕµÕ¿
 technicaldetails.exit.yes=Ô±ÕµÕ¸

___
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] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties

2021-02-05 Thread translation

commit 23ac69d38f8d10016874b45079a78253bc1e49c3
Author: Translation commit bot 
Date:   Fri Feb 5 23:47:50 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties
---
 hy-AM/torlauncher.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hy-AM/torlauncher.properties b/hy-AM/torlauncher.properties
index cd7995d942..8286b703c3 100644
--- a/hy-AM/torlauncher.properties
+++ b/hy-AM/torlauncher.properties
@@ -12,7 +12,7 @@ torlauncher.tor_control_failed=Failed to take control of Tor.
 torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network 
connection.
 torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
-torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
+torlauncher.unable_to_start_tor=ÕÕ½Õ¿Õ¡ÖÕ¾Õ¥Ö Õ½Õ¯Õ½Õ¥Õ¬ Tor-Õ¨:\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
 torlauncher.torrc_missing=The torrc file is missing and could not be created.
 torlauncher.datadir_missing=The Tor data directory does not exist and could 
not be created.
@@ -27,13 +27,13 @@ torlauncher.error_proxy_addr_missing=You must specify both 
an IP address or host
 torlauncher.error_proxy_type_missing=You must select the proxy type.
 torlauncher.error_bridges_missing=You must specify one or more bridges.
 torlauncher.error_default_bridges_type_missing=You must select a transport 
type for the provided bridges.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
+torlauncher.error_bridgedb_bridges_missing=Ô½Õ¶Õ¤ÖÕ¸ÖÕ´ Õ¥Õ¶Ö 
ÕºÕ¡Õ°Õ¡Õ¶Õ»Õ¥Õ¬ Õ¯Õ¡Õ´Õ¸ÖÖÕ»:
 torlauncher.error_bridge_bad_default_type=No provided bridges that have the 
transport type %S are available. Please adjust your settings.
 
 torlauncher.bridge_suffix.meek-amazon=(works in China)
 torlauncher.bridge_suffix.meek-azure=(works in China)
 
-torlauncher.request_a_bridge=Request a Bridgeâ¦
+torlauncher.request_a_bridge=ÕÕ¡Õ°Õ¡Õ¶Õ»Õ¥Õ¬ Õ¯Õ¡Õ´Õ¸ÖÖÕ»...
 torlauncher.request_a_new_bridge=ÕÕ¡Õ°Õ¡Õ¶Õ»Õ¥Õ¬ Õ¶Õ¸Ö Õ¯Õ¡Õ´Õ¸ÖÖÕ»â¦
 torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
 torlauncher.captcha_prompt=Ô¼Õ¸ÖÕ®Õ¥Ö Â«CAPTCHAÂ»-Õ¶ Õ¯Õ¡Õ´Õ¸ÖÖÕ» 
ÕºÕ¡Õ°Õ¡Õ¶Õ»Õ¥Õ¬Õ¸Ö Õ°Õ¡Õ´Õ¡Ö:
@@ -56,7 +56,7 @@ torlauncher.copiedNLogMessages=Copy complete. %S Tor log 
messages are ready to b
 torlauncher.bootstrapStatus.starting=ÕÕ¯Õ½Õ¸ÖÕ´
 torlauncher.bootstrapStatus.conn_pt=ÕÕ«Õ¡ÖÕ¾Õ¸ÖÕ´ Õ§ Õ¯Õ¡Õ´Õ¸ÖÖÕ»Õ«Õ¶
 torlauncher.bootstrapStatus.conn_done_pt=ÕÕ«Õ¡ÖÕ¾Õ¥Ö Õ¯Õ¡Õ´Õ¸ÖÖÕ»Õ«Õ¶
-torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy
+torlauncher.bootstrapStatus.conn_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

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties

2021-02-05 Thread translation

commit 243188f9f733c57ad1315cb4c1b90de0d8d8e9c7
Author: Translation commit bot 
Date:   Fri Feb 5 23:47:23 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
---
 hy-AM/torbutton.properties | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/hy-AM/torbutton.properties b/hy-AM/torbutton.properties
index 32494b8ca3..b0809cff9c 100644
--- a/hy-AM/torbutton.properties
+++ b/hy-AM/torbutton.properties
@@ -1,8 +1,8 @@
 torbutton.circuit_display.internet = ÕÕ¡Õ´Õ¡ÖÕ¡Õ¶Ö
 torbutton.circuit_display.ip_unknown = Õ¹Õ³Õ¡Õ¶Õ¡Õ¹Õ¾Õ¡Õ® IP
-torbutton.circuit_display.onion_site = Onion site
+torbutton.circuit_display.onion_site = Onion Õ¯Õ¡ÕµÖ
 torbutton.circuit_display.this_browser = Ô±ÕµÕ½ Õ¤Õ«Õ¿Õ¡ÖÕ¯Õ«Õ¹Õ¨
-torbutton.circuit_display.relay = Relay
+torbutton.circuit_display.relay = ÕÕ¥ÖÕ©Õ¡ÖÕ¸ÕÕ¸ÖÕ©ÕµÕ¸ÖÕ¶
 torbutton.circuit_display.tor_bridge = Ô¿Õ¡Õ´Õ¸ÖÖÕ»
 torbutton.circuit_display.unknown_country = Ô±Õ¶Õ°Õ¡ÕµÕ¿ Õ¥ÖÕ¯Õ«Ö
 torbutton.circuit_display.guard = Guard
@@ -11,16 +11,16 @@ torbutton.circuit_display.learn_more = Ô»Õ´Õ¡Õ¶Õ¡Õ¬ 
Õ¡Õ¾Õ¥Õ¬Õ«Õ¶
 torbutton.circuit_display.click_to_copy = ÕÕ¥Õ²Õ´Õ¥Ö ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Õ¬Õ¸Ö 
Õ°Õ¡Õ´Õ¡Ö
 torbutton.circuit_display.copied = ÕÕ¡Õ¿Õ³Õ¥Õ¶Õ¾Õ¥ÕÖ:
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make 
the width and height of your window less distinctive, and thus reduces the 
ability of people to track you online.
-torbutton.panel.tooltip.disabled = Click to enable Tor
-torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.label.disabled = Tor-Õ¶ Õ¡Õ¶Õ»Õ¡Õ¿Õ¾Õ¥Ö
-torbutton.panel.label.enabled = Tor-Õ¨ Õ´Õ«Õ¡ÖÕ¾Õ¥Ö
+torbutton.panel.tooltip.disabled = ÕÕ¥Õ²Õ´Õ¥Ö Tor-Õ¨ 
Õ¯Õ¡ÖÕ¸Õ²Õ¡ÖÕ¶Õ¥Õ¬Õ¸Ö Õ°Õ¡Õ´Õ¡Ö
+torbutton.panel.tooltip.enabled = ÕÕ¥Õ²Õ´Õ¥Ö Tor-Õ¨ 
Õ¯Õ¡ÖÕ¸Õ²Õ¡Õ¦ÖÕ¯Õ¥Õ¬Õ¸Ö Õ°Õ¡Õ´Õ¡Ö
+torbutton.panel.label.disabled = Tor-Õ¨ Õ¯Õ¡ÖÕ¸Õ²Õ¡Õ¦ÖÕ¯Õ¾Õ¥Ö
+torbutton.panel.label.enabled = Tor-Õ¨ Õ¯Õ¡ÖÕ¸Õ²Õ¡ÖÕ¾Õ¥Ö
 extensions.torbut...@torproject.org.description = Torbutton provides a button 
to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.external.title = Download an external file type?
 torbutton.popup.external.app = Tor Browser cannot display this file. You will 
need to open it with another application.\n\n
 torbutton.popup.external.note = Some types of files can cause applications to 
connect to the Internet without using Tor.\n\n
 torbutton.popup.external.suggest = To be safe, you should only open downloaded 
files while offline, or use a Tor Live CD such as Tails.\n
-torbutton.popup.launch = Download file
+torbutton.popup.launch = ÕÕ¥ÖÕ¢Õ¥Õ¼Õ¶Õ¥Õ¬ ÖÕ¡ÕµÕ¬Õ¨
 torbutton.popup.cancel = ÕÕ¥Õ²Õ¡ÖÕ¯Õ¥Õ¬
 torbutton.popup.dontask = Automatically download files from now on
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. 
It does not have access to the Tor Control Port.\n\nAre you running Tor Browser 
Bundle?
@@ -59,19 +59,19 @@ updateDownloadingPanelUILabel=ÕÕ¥ÖÕ¢Õ¥Õ¼Õ¶Õ¾Õ¸ÖÕ´ Õ§ %S 
Õ©Õ¡ÖÕ´Õ¡ÖÕ¸ÖÕ´Õ¨
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
 pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion 
Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
-pageInfo_OnionName=Onion Name:
+pageInfo_OnionEncryption=ÕÕ«Õ¡ÖÕ¸ÖÕ´Õ¨ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ£ÖÕ¾Õ¡Õ® Õ§ (Onion 
Õ®Õ¡Õ¼Õ¡ÕµÕ¸ÖÕ©ÕµÕ¸ÖÕ¶)
+pageInfo_OnionName=Onion Õ¡Õ¶Õ¸ÖÕ¶Õ
 
 # Onion services strings.  Strings are kept here for ease of translation.
 onionServices.learnMore=Ô»Õ´Õ¡Õ¶Õ¡Õ¬ Õ¡Õ¾Õ¥Õ¬Õ«Õ¶
 onionServices.errorPage.browser=Ô´Õ«Õ¿Õ¡ÖÕ¯Õ«Õ¹
 onionServices.errorPage.network=ÕÕ¡Õ¶Ö
-onionServices.errorPage.onionSite=Onionsite
+onionServices.errorPage.onionSite=Onion-Õ¯Õ¡ÕµÖ
 # LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
 #an error code, e.g., 0xF3.
 # Tor SOCKS error 0xF0:
 onionServices.descNotFound.pageTitle=Problem Loading Onionsite
-onionServices.descNotFound.header=Onionsite Not Found
+onionServices.descNotFound.header=Onion-Õ¯Õ¡ÕµÖÕ¨ Õ¹Õ« Õ£Õ¿Õ¶Õ¾Õ¥Õ¬
 onionServices.descNotFound=The most likely cause is that the onionsite is 
offline. Contact the onionsite administrator.
 onionServices.descNotFound.longDescription=Details: %S â The requested onion 
service descriptor can't be found on the hashring and therefore the service is 
not reachable by the client.
 # Tor SOCKS error 0xF1:
@@ -119,11 +119,11 @@ onionServices.authPrompt.invalidKey=Please enter a valid 
key (52 base32 characte
 onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key
 onionServices.authPreferences.header=Onion Services Authentication
 onionServices.authPreferences.overview=Some onion services require that you 
identify yourself with a key (a kind of password) before you can access them.

[tor-commits] [translation/torbirdy] https://gitweb.torproject.org/translation.git/commit/?h=torbirdy

2021-02-05 Thread translation

commit a2dd086142ff9e6055d162a7996e82af99b36a6d
Author: Translation commit bot 
Date:   Fri Feb 5 23:47:14 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=torbirdy
---
 hy/torbirdy.dtd | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/hy/torbirdy.dtd b/hy/torbirdy.dtd
index f1500c068c..d4f2246beb 100644
--- a/hy/torbirdy.dtd
+++ b/hy/torbirdy.dtd
@@ -1,22 +1,22 @@
 
-
+
 
 
 
 
-
+
 
 
 
-
+
 
 
-
-
+
+
 
-
+
 
-
+
 
 
 
@@ -25,9 +25,9 @@
 
 
 
-
+
 
-
+
 
 
 
@@ -48,11 +48,11 @@
 
 
 
-
+
 
 
 
 
 
 
-
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-and-https] https://gitweb.torproject.org/translation.git/commit/?h=tor-and-https

2021-02-05 Thread translation

commit 699399caad44b1f7b8227f0566ba1521d2322834
Author: Translation commit bot 
Date:   Fri Feb 5 23:47:05 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tor-and-https
---
 hy.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hy.po b/hy.po
index 5595f66e2d..3d77a05dbf 100644
--- a/hy.po
+++ b/hy.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2014-07-17 14:23+\n"
-"PO-Revision-Date: 2021-02-04 22:44+\n"
+"PO-Revision-Date: 2021-02-05 23:31+\n"
 "Last-Translator: At protom \n"
 "Language-Team: Armenian 
(http://www.transifex.com/otf/torproject/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -40,7 +40,7 @@ msgstr "Site.com"
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "user / pw"
-msgstr ""
+msgstr "ÖÕ£. Õ¡Õ¶Õ¸ÖÕ¶/ Õ£Õ¡Õ²Õ¿. Õ¢Õ¡Õ¼"
 
 #. (itstool) path: defs/text
 #. Keep it short: 7em max. Seven times the capital letter "M".
@@ -115,7 +115,7 @@ msgstr ""
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "Key"
-msgstr ""
+msgstr "Ô²Õ¡Õ¶Õ¡Õ¬Õ«"
 
 #. (itstool) path: defs/text
 #: C/tor-and-https.svg:363

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2021-02-05 Thread translation

commit 6bb6ee5317d4ceb7c09e1fde3152b0c8dc9b5409
Author: Translation commit bot 
Date:   Fri Feb 5 23:46:38 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 hy.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hy.po b/hy.po
index 869945b1dd..2e5cab79ba 100644
--- a/hy.po
+++ b/hy.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
-"PO-Revision-Date: 2021-02-05 03:14+\n"
+"PO-Revision-Date: 2021-02-05 23:41+\n"
 "Last-Translator: At protom \n"
 "Language-Team: Armenian 
(http://www.transifex.com/otf/torproject/language/hy/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2021-02-05 Thread translation

commit 80cc5631919f97fde1f434fcbd501cf86bfad561
Author: Translation commit bot 
Date:   Fri Feb 5 23:45:59 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 hy.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hy.po b/hy.po
index 2281bf1ebc..3b7d6353a9 100644
--- a/hy.po
+++ b/hy.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
-"PO-Revision-Date: 2021-02-05 03:14+\n"
+"PO-Revision-Date: 2021-02-05 23:41+\n"
 "Last-Translator: At protom \n"
 "Language-Team: Armenian 
(http://www.transifex.com/otf/torproject/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -72,7 +72,7 @@ msgstr ""
 
 #: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:154
 msgid "_Create persistent storage"
-msgstr ""
+msgstr "_ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¡Õ¯Õ¡Õ´ ÕºÕ¡Õ°Õ¥Õ½Õ¿Õ¡ÖÕ¡Õ¶"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:64
 msgid "Persistence is disabled for Electrum"
@@ -1366,11 +1366,11 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:325
 msgid "Create Persistent Storage"
-msgstr ""
+msgstr "ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¡Õ¯Õ¡Õ´ ÕºÕ¡Õ°Õ¥Õ½Õ¿Õ¡ÖÕ¡Õ¶"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:333
 msgid "Creating your persistent storage failed."
-msgstr ""
+msgstr "ÕÕ¥Ö Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¡Õ¯Õ¡Õ´ ÕºÕ¡Õ°Õ¥Õ½Õ¿Õ¡ÖÕ¡Õ¶Õ« Õ½Õ¿Õ¥Õ²Õ®Õ¸ÖÕ´Õ¨ 
Õ±Õ¡ÕÕ¸Õ²Õ¾Õ¥Ö"
 
 #. Translators: Don't translate {packages}, it's a placeholder and
 #. will be replaced.
@@ -2217,7 +2217,7 @@ msgstr "Ô¼Õ¼Õ¥Õ¬Õ¡ÕµÕ¶ Õ¯Õ¡ÖÕ£Õ¡Õ¾Õ¸ÖÕ¸ÖÕ´Õ¶Õ¥Ö"
 
 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
 msgid "Encrypted _Persistent Storage"
-msgstr ""
+msgstr "Ô³Õ¡Õ²Õ¿Õ¶Õ¡Õ£ÖÕ¾Õ¡Õ® _Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¡Õ¯Õ¡Õ´ ÕºÕ¡Õ°Õ¥Õ½Õ¿Õ¡ÖÕ¡Õ¶"
 
 #. The label for this placeholder text is not very big, so keep this string
 #. short.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbirdy] https://gitweb.torproject.org/translation.git/commit/?h=torbirdy

2021-02-05 Thread translation

commit c799ec00996bf6b9592afc7a3bc25038474e1543
Author: Translation commit bot 
Date:   Fri Feb 5 23:17:34 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=torbirdy
---
 hy/torbirdy.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hy/torbirdy.dtd b/hy/torbirdy.dtd
index 4f144a581c..f1500c068c 100644
--- a/hy/torbirdy.dtd
+++ b/hy/torbirdy.dtd
@@ -1,9 +1,9 @@
 
 
 
-
+
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-onioncircuits] https://gitweb.torproject.org/translation.git/commit/?h=tails-onioncircuits

2021-02-05 Thread translation

commit 8db053ac33ef2a3f19d241ff82d7b6bfdaf2af81
Author: Translation commit bot 
Date:   Fri Feb 5 23:16:57 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-onioncircuits
---
 hy/onioncircuits.pot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hy/onioncircuits.pot b/hy/onioncircuits.pot
index bae8cf59ab..352a68a694 100644
--- a/hy/onioncircuits.pot
+++ b/hy/onioncircuits.pot
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-09-06 09:02+0200\n"
-"PO-Revision-Date: 2021-02-05 02:33+\n"
+"PO-Revision-Date: 2021-02-05 22:52+\n"
 "Last-Translator: At protom \n"
 "Language-Team: Armenian 
(http://www.transifex.com/otf/torproject/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@ msgstr "Ô¿Õ¡ÖÕ£Õ¡Õ¾Õ«Õ³Õ¡Õ¯"
 
 #: ../onioncircuits:146
 msgid "Click on a circuit for more detail about its Tor relays."
-msgstr ""
+msgstr "ÕÕ¥Õ²Õ´Õ¥Ö Õ·Õ²Õ©Õ¡ÕµÕ« Õ¾ÖÕ¡ Õ«Ö Tor 
Õ°Õ¥ÖÕ©Õ¡ÖÕ¸ÕÕ¸ÖÕ©ÕµÕ¸ÖÕ¶Õ¶Õ¥ÖÕ« Õ´Õ¡Õ½Õ«Õ¶ Õ°Õ¡Õ¾Õ¥Õ¬ÕµÕ¡Õ¬ 
Õ´Õ¡Õ¶ÖÕ¡Õ´Õ¡Õ½Õ¶Õ¥ÖÕ« Õ°Õ¡Õ´Õ¡Ö:"
 
 #: ../onioncircuits:236
 msgid "The connection to Tor was lost..."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-openpgp-applet] https://gitweb.torproject.org/translation.git/commit/?h=tails-openpgp-applet

2021-02-05 Thread translation

commit 5207923131382c93263488f4056fcd6c5d802636
Author: Translation commit bot 
Date:   Fri Feb 5 23:16:49 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-openpgp-applet
---
 hy/openpgp-applet.pot | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/hy/openpgp-applet.pot b/hy/openpgp-applet.pot
index 47febf1217..45455b0b2d 100644
--- a/hy/openpgp-applet.pot
+++ b/hy/openpgp-applet.pot
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2021-02-05 15:00+\n"
+"PO-Revision-Date: 2021-02-05 23:15+\n"
 "Last-Translator: At protom \n"
 "Language-Team: Armenian 
(http://www.transifex.com/otf/torproject/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -36,11 +36,11 @@ msgstr "ÕÕ¥Ö Õ´Õ¡Õ½Õ«Õ¶"
 
 #: bin/openpgp-applet:232
 msgid "Encrypt Clipboard with _Passphrase"
-msgstr ""
+msgstr "Ô³Õ¡Õ²Õ¿Õ¶Õ¡Õ£ÖÕ¥Õ¬ Õ½Õ¥Õ²Õ¡Õ¶Õ¡Õ¯Õ¡Õ¿Õ¡ÕÕ¿Õ¡Õ¯Õ¨ 
_Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¤Õ¡ÖÕ±Õ¾Õ¡Õ®ÖÕ¸Õ¾"
 
 #: bin/openpgp-applet:235
 msgid "Sign/Encrypt Clipboard with Public _Keys"
-msgstr ""
+msgstr "ÕÕ¿Õ¸ÖÕ¡Õ£ÖÕ¥Õ¬/Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ£ÖÕ¥Õ¬ Õ½Õ¥Õ²Õ¡Õ¶Õ¡Õ¯Õ¡Õ¿Õ¡ÕÕ¿Õ¡Õ¯Õ¨ 
Õ°Õ¡Õ¶ÖÕ¡ÕµÕ«Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶Õ¥ÖÕ¸Õ¾"
 
 #: bin/openpgp-applet:240
 msgid "_Decrypt/Verify Clipboard"
@@ -60,19 +60,19 @@ msgstr ""
 
 #: bin/openpgp-applet:337 bin/openpgp-applet:339 bin/openpgp-applet:341
 msgid "Unknown Trust"
-msgstr ""
+msgstr "Ô±Õ¶Õ°Õ¡ÕµÕ¿ Õ¾Õ½Õ¿Õ¡Õ°Õ¸ÖÕ©ÕµÕ¸ÖÕ¶"
 
 #: bin/openpgp-applet:343
 msgid "Marginal Trust"
-msgstr ""
+msgstr "Ô±Õ¶Õ¶Õ·Õ¡Õ¶ Õ¾Õ½Õ¿Õ¡Õ°Õ¸ÖÕ©ÕµÕ¸ÖÕ¶"
 
 #: bin/openpgp-applet:345
 msgid "Full Trust"
-msgstr ""
+msgstr "Ô±Õ´Õ¢Õ¸Õ²Õ»Õ¡Õ¯Õ¡Õ¶ Õ¾Õ½Õ¿Õ¡Õ°Õ¸ÖÕ©ÕµÕ¸ÖÕ¶"
 
 #: bin/openpgp-applet:347
 msgid "Ultimate Trust"
-msgstr ""
+msgstr "Ô²Õ¡ÖÕ¡ÖÕ±Õ¡Õ¯ Õ¾Õ½Õ¿Õ¡Õ°Õ¸ÖÕ©ÕµÕ¸ÖÕ¶"
 
 #: bin/openpgp-applet:400
 msgid "Name"
@@ -98,7 +98,7 @@ msgstr[1] ""
 
 #: bin/openpgp-applet:465
 msgid "None (Don't sign)"
-msgstr ""
+msgstr "ÕÕ¹Õ«Õ¶Õ¹ (Õ¹Õ½Õ¿Õ¸ÖÕ¡Õ£ÖÕ¥Õ¬)"
 
 #: bin/openpgp-applet:528
 msgid "Select recipients:"
@@ -116,7 +116,7 @@ msgstr ""
 
 #: bin/openpgp-applet:545
 msgid "Sign message as:"
-msgstr ""
+msgstr "ÕÕ¿Õ¸ÖÕ¡Õ£ÖÕ¥Õ¬ Õ°Õ¡Õ²Õ¸ÖÕ¤Õ¡Õ£ÖÕ¸ÖÕ©ÕµÕ¸ÖÕ¶Õ¶Õ¥ÖÕ¨ 
Õ¸ÖÕºÕ¥Õ½Õ"
 
 #: bin/openpgp-applet:549
 msgid "Choose keys"
@@ -124,7 +124,7 @@ msgstr "Ô¸Õ¶Õ¿ÖÕ¥Ö Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶Õ¥Ö"
 
 #: bin/openpgp-applet:589
 msgid "Do you trust these keys?"
-msgstr ""
+msgstr "Ô´Õ¸ÖÖ Õ¾Õ½Õ¿Õ¡Õ°Õ¸ÖÕÕ´ Õ¥Ö Õ¡ÕµÕ½ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶Õ¥ÖÕ«Õ¶:"
 
 #: bin/openpgp-applet:592
 msgid "The following selected key is not fully trusted:"
@@ -171,8 +171,8 @@ msgstr "GnuPG-Õ« Õ¡ÖÕ¤ÕµÕ¸ÖÕ¶ÖÕ¶Õ¥ÖÕ¨"
 
 #: bin/openpgp-applet:860
 msgid "Output of GnuPG:"
-msgstr ""
+msgstr "GnuPG-Õ« Õ°Õ¥Õ¿ÖÕ¸ÖÕ©ÕµÕ¸ÖÕ¶Õ¨Õ"
 
 #: bin/openpgp-applet:885
 msgid "Other messages provided by GnuPG:"
-msgstr ""
+msgstr "GnuPG-Õ« Õ¯Õ¸Õ²Õ´Õ«Ö Õ¿ÖÕ¾Õ¡Õ® Õ¡ÕµÕ¬ 
Õ°Õ¡Õ²Õ¸ÖÕ¤Õ¡Õ£ÖÕ¸ÖÕ©ÕµÕ¸ÖÕ¶Õ¶Õ¥ÖÕ"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-securitylevelproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties

2021-02-05 Thread translation

commit 0de4b9f002d851f4dea28dbb6b15d2f71a52d41e
Author: Translation commit bot 
Date:   Fri Feb 5 22:47:34 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties
---
 hy-AM/securitylevel.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hy-AM/securitylevel.properties b/hy-AM/securitylevel.properties
index 2fdfc76b39..d4d7d64efa 100644
--- a/hy-AM/securitylevel.properties
+++ b/hy-AM/securitylevel.properties
@@ -9,7 +9,7 @@ securityLevel.safer.tooltip = Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸ÖÕ©ÕµÕ¡Õ¶ 
Õ´Õ¡Õ¯Õ¡ÖÕ¤Õ¡Õ¯Õ¨ Õ 
 securityLevel.safer.summary = Ô¿Õ¡ÖÕ¸Õ²Õ¡Õ¦ÖÕ¯Õ¸ÖÕ´ Õ§ Õ¾Õ¥Õ¢Õ¯Õ¡ÕµÖÕ¥ÖÕ« 
Õ£Õ¸ÖÕ®Õ¸ÖÕ¶Õ¡Õ¯Õ¸ÖÕ©ÕµÕ¡Õ¶Õ¨ Õ¯Õ¸ÖÕ¸ÖÕ½Õ¿ Õ°Õ¡ÖÕ¸ÖÖÕ¸Õ² 
Õ°Õ¡Õ³Õ¡ÕÕ¡Õ¯Õ«Õ¸ÖÕ¥Õ¶ Õ¾Õ¿Õ¡Õ¶Õ£Õ¡Õ¾Õ¸Ö Õ°Õ¡Õ¿Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶Õ¶Õ¥ÖÕ¨:
 securityLevel.safer.description1 = JavaScript-Õ¨ Õ¯Õ¡ÖÕ¸Õ²Õ¡Õ¦ÖÕ¯Õ¾Õ¡Õ® Õ§ 
Õ¸Õ¹-HTTPS Õ¯Õ¡ÕµÖÕ¥ÖÕ¸ÖÕ´:
 securityLevel.safer.description2 = ÕÖÕ¸Õ· Õ¿Õ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯Õ¶Õ¥Ö Ö 
Õ´Õ¡Õ©. Õ¶Õ·Õ¡Õ¶Õ¶Õ¥Ö Õ¯Õ¡ÖÕ¸Õ²Õ¡Õ¦ÖÕ¯Õ¾Õ¡Õ® Õ¥Õ¶:
-securityLevel.safer.description3 = Audio and video (HTML5 media), and WebGL 
are click-to-play.
+securityLevel.safer.description3 = ÕÕ¡ÕµÕ¶Õ¡Õ¶ÕµÕ¸ÖÕ©Õ¨, 
Õ¿Õ¥Õ½Õ¡Õ¶ÕµÕ¸ÖÕ©Õ¨ (HTML5 Õ´Õ¥Õ¤Õ«Õ¡) Ö WebGL-Õ¨ Õ¶Õ¾Õ¡Õ£Õ¡ÖÕ¯Õ¾Õ¸ÖÕ´ Õ¥Õ¶ 
Õ½Õ¥Õ²Õ´Õ¥Õ¬Õ¸ÖÖ:
 securityLevel.safest.level = Ô±ÕºÕ¡Õ°Õ¸Õ¾Õ¡Õ£Õ¸ÖÕµÕ¶
 securityLevel.safest.tooltip = Ô±Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸ÖÕ©ÕµÕ¡Õ¶ Õ´Õ¡Õ¯Õ¡ÖÕ¤Õ¡Õ¯Õ¨ 
Õ Ô±ÕºÕ¡Õ°Õ¸Õ¾Õ¡Õ£Õ¸ÖÕµÕ¶
 securityLevel.safest.summary = Ô¹Õ¸ÖÕµÕ¬Õ¡Õ¿ÖÕ¸ÖÕ´ Õ§ Õ´Õ«Õ¡ÕµÕ¶ 
Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¸ÖÕ¶ Õ¯Õ¡ÕµÖÕ¥ÖÕ« Ö Õ°Õ¥Õ¶Õ¾Õ¡Õ® 
Õ®Õ¡Õ¼Õ¡ÕµÕ¸ÖÕ©ÕµÕ¸ÖÕ¶Õ¶Õ¥ÖÕ« Õ°Õ¡Õ´Õ¡Ö ÕºÕ¡ÖÕ¿Õ¡Õ¤ÖÕ¾Õ¡Õ® 
Õ¾Õ¥Õ¢-Õ¯Õ¡ÕµÖÕ¥ÖÕ« Õ°Õ¡Õ¿Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶Õ¶Õ¥Ö: Ô±ÕµÕ¤ 
ÖÕ¸ÖÕ¸ÕÕ¸ÖÕ©ÕµÕ¸ÖÕ¶Õ¶Õ¥ÖÕ¨ Õ¡Õ¦Õ¤Õ¸ÖÕ´ Õ¥Õ¶ Õ¶Õ¯Õ¡ÖÕ¶Õ¥ÖÕ«, 
Õ´Õ¥Õ¤Õ«Õ¡ÕµÕ«, Ö Õ½Õ¯ÖÕ«ÕºÕ¿Õ¶Õ¥ÖÕ« Õ¾ÖÕ¡:

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd

2021-02-05 Thread translation

commit b5bf5348a6b4faca5816052047ec9d8ef69e625d
Author: Translation commit bot 
Date:   Fri Feb 5 22:47:22 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
---
 hy-AM/torbutton.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hy-AM/torbutton.dtd b/hy-AM/torbutton.dtd
index 3f12cdb512..578ab412d4 100644
--- a/hy-AM/torbutton.dtd
+++ b/hy-AM/torbutton.dtd
@@ -36,7 +36,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot

2021-02-05 Thread translation

commit 0af57baa5f5ac937d257ed7ec600aaf97d71418c
Author: Translation commit bot 
Date:   Fri Feb 5 22:45:12 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+ka.po | 8 
 1 file changed, 8 insertions(+)

diff --git a/contents+ka.po b/contents+ka.po
index f05538b45a..a43402b086 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -10847,6 +10847,10 @@ msgid ""
 " they will claim they do support Tor exits but will pull the rug out from "
 "under you later on. This has happened to at least two exit operators. | - |"
 msgstr ""
+"| [Vultr](http://vultr.com) | AS20473 | áááá® | áááá® | áá 
á | ááá ááááá  "
+"áááá®áááá ááªá®áááááá, á áá Tor 
áááá¡ááááááá áá®áá ááááá áááá, 
áááá áá á¡áááá ááááá¡ "
+"áááááááá¡áá¡ ááá á¢á áááá¢áááááá 
á¡áá áá£ááá¡ááá. áá¡áááá¡á á áá, 
áááá¡ááááá ááááá«áá¡ á£ááá"
+" áá  áááá¨áááá¡ á¨ááááá®áá. | - |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10874,6 +10878,8 @@ msgid ""
 "| [blackpulsehosting](https://www.blackpulsehosting.com) | - | Yes | Yes | "
 "No | - | 10/25/15 |"
 msgstr ""
+"| [blackpulsehosting](https://www.blackpulsehosting.com) | - | áááá® | 
áááá® |"
+" áá á | - | 10/25/15 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10881,6 +10887,8 @@ msgid ""
 "| [MonkeyBrains](https://monkeybrains.net) | AS32329 | Yes | Yes | Yes | "
 "Only offers colocation, no cheap VPS option. | 1/14/19 |"
 msgstr ""
+"| [MonkeyBrains](https://monkeybrains.net) | AS32329 | áááá® | 
áááá® | áááá® | "
+"áá®áááá ááááááááááá¡áááá¡ 
ááááááááá¡, ááá¤á VPS-áá¡ áá á©ááááá 
áá  áá¥áá¡. | 1/14/19 |"
 
 #: 
https//community.torproject.org/relay/community-resources/tor-relay-universities/
 #: 
(content/relay-operations/community-resources/tor-relay-universities/contents+en.lrpage.title)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-build/master] Release preparations for 10.5a10

2021-02-05 Thread sysrqb

commit b52fb3fecb60de5efda0f53d127a4eefd31e0508
Author: Matthew Finkel 
Date:   Fri Feb 5 17:31:02 2021 +

Release preparations for 10.5a10

Versions bump and Changelog update
---
 projects/firefox-langpacks/config   | 2 +-
 projects/firefox/config | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 
 rbm.conf| 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/projects/firefox-langpacks/config 
b/projects/firefox-langpacks/config
index 17a707a..34d6fad 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") 
%]-[% c("var/buil
 
 var:
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build2
+  ff_build: build1
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
 targets:
diff --git a/projects/firefox/config b/projects/firefox/config
index 00d45f3..e9df895 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -8,7 +8,7 @@ git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 78.7.0
+  firefox_platform_version: 78.7.1
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 10.5
   branding_directory: 'browser/branding/alpha'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt 
b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index f1bb8c4..12dd037 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,7 @@
+Tor Browser 10.5a10 -- February 7 2021
+ * Windows
+   * Update Firefox to 78.7.1esr
+
 Tor Browser 10.5a9 -- February 5 2021
  * Android
* Update Fenix to 86.0.0-beta.2
diff --git a/rbm.conf b/rbm.conf
index a027f7c..76ab74b 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.5a9'
+  torbrowser_version: '10.5a10'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-- 10.5a7
+- 10.5a8
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot

2021-02-05 Thread translation

commit 69dcf1e6bae978c220b63b8c1146a148f54bff02
Author: Translation commit bot 
Date:   Fri Feb 5 22:15:13 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+ka.po | 42 --
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/contents+ka.po b/contents+ka.po
index 114cbbff26..f05538b45a 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -10585,6 +10585,10 @@ msgid ""
 "for their US Operations arm. They will cancel your account and claim it is a"
 " ToS violation, which requires you to pay out a 60-day notice. | 10/2020 |"
 msgstr ""
+"| [Cloudvider](https://www.clouvider.co.uk/) | - | áá á | áá á | 
áá á | áá¡áá "
+"áá¨á¨-á¡ á¨áááá áá¦ááá£áá 
á«áááááá¡áááá¡. áá¥áááá ááááá áá¨á 
ááá£á¥ááááá ááááá§áááááá¡ "
+"ááá áááááá¡ ááá á¦ááááá¡ 
á¡áá¤á£á«ááááá, á ááª á¡áááá áááá¡ 
ááááá®ááá¡ 60 áá¦áá¡ ááááá¨á. | "
+"10/2020 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10592,11 +10596,14 @@ msgid ""
 "| [ChunkHost](http://chunkhost.com) | - | Yes | Yes | ? | Questionable DMCA "
 "handling | 01/01/12 |"
 msgstr ""
+"| [ChunkHost](http://chunkhost.com) | - | áááá® | áááá® | ? | 
á¡ááááá "
+"áááááááááá£áááá DMCA-á¡áá©ááá 
áááá¡ ááááá¬á§ááá¢ááá | 01/01/12 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
 msgid "| [Cyberonic](http://www.cyberonic.com) | - | Yes | Yes | ? | - | - |"
 msgstr ""
+"| [Cyberonic](http://www.cyberonic.com) | - | áááá® | áááá® | ? 
| - | - |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10604,6 +10611,8 @@ msgid ""
 "| [Datawagon](https://datawagon.net) | AS27176 | Yes | Yes | Yes | Customers"
 " are forwarded abuse complaints to handle themselves | 03/06/19 |"
 msgstr ""
+"| [Datawagon](https://datawagon.net) | AS27176 | áááá® | áááá® 
| áááá® | "
+"áááá®ááá ááááááá ááááá á£ááá 
ááááá¬á§ááá¢áá ááá á¦ááááááá 
á¡áá©ááá ááá | 03/06/19 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10624,6 +10633,7 @@ msgstr "| [Ethr.net](http://ethr.net/) | - | 
áááá® | áááá® | á
 msgid ""
 "| [Evolucix](http://www.evolucix.com) | -  | Yes | Yes | No(?) | - | - |"
 msgstr ""
+"| [Evolucix](http://www.evolucix.com) | -  | áááá® | áááá® | 
áá á(?) | - | - |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10631,6 +10641,8 @@ msgid ""
 "| [Future Hosting](http://www.futurehosting.com/) | - | Yes | Yes | No | - |"
 " 09/01/14 |"
 msgstr ""
+"| [Future Hosting](http://www.futurehosting.com/) | - | áááá® | 
áááá® | áá á | "
+"- | 09/01/14 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10647,6 +10659,7 @@ msgstr ""
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
 msgid "| [HostGator](http://www.hostgator.com/) | - | No | No | No | - | - |"
 msgstr ""
+"| [HostGator](http://www.hostgator.com/) | - | áá á | áá á | áá 
á | - | - |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10656,17 +10669,22 @@ msgid ""
 "Networks and open peering with the entire Any2LA and Atlanta TIE networks. |"
 " 05/01/16 |"
 msgstr ""
+"| [HostHatch](https://hosthatch.com) | AS46562 | áááá® | áááá® 
| áá á | áááá "
+"vps isp á¨áá áá£áá á¡áá®áá¡áá áá 
ááááªááá¡: QuadraNet, nLayer, AboveNet, "
+"Inteliquent, Atrato á¥á¡ááááá¡á áá á¦áá áá 
áááááá áááááªáááá¡ Any2LA áá Atlanta TIE"
+" á¥á¡ááááá¨á. | 05/01/16 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
 msgid ""
 "|

[tor-commits] [translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot

2021-02-05 Thread translation

commit b837156668c4cce49c9495fb90d986358dc8e023
Author: Translation commit bot 
Date:   Fri Feb 5 21:45:11 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+ka.po | 23 +--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/contents+ka.po b/contents+ka.po
index 7b204b2ce5..114cbbff26 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -10489,17 +10489,25 @@ msgid ""
 " so advise changing the default exit (good idea in the UK anyhow). Any DMCA "
 "notices received were simply forwarded on without agro | - |"
 msgstr ""
+"| [Bitfolk](http://bitfolk.com/) | - | áááá® | áááá® | 
áááá® | ááá¢áá ááªáááá áá "
+"áááááááªáááááá ááá£ááá áá ááá 
Tor-á¡á áá ááá¡ áááá®ááá áááááá 
á¡ááááá®ááá¨á. áá¦áááááááá"
+" á£á¡áá ááááá, ááááá ááá¢ááá 
ááááá áá ááá á¦áááááá, áááá¢áá 
ááá á©ááá á¨ááªááááá "
+"áááá£ááá¡á®áááá áááá¡ááááá 
áááá£áááá (ááá áá ááá áá 
ááááááá, áááá ááááááá£á "
+"á¡áááá¤áá¨á). ááááá¡áááá á 
DMCA-á¡áá©áááá á ááá á¢áááá 
áááááááá¡áááá ááááá 
áá£á¦áááááááá| "
+"- |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
 msgid ""
 "| [RapidSwitch](http://rapidswitch.com/) | - | Yes | Yes | ? | - | 07/2014 |"
 msgstr ""
+"| [RapidSwitch](http://rapidswitch.com/) | - | áááá® | áááá® | 
? | - | 07/2014"
+" |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
 msgid "### US"
-msgstr ""
+msgstr "### áá¨á¨"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10507,6 +10515,8 @@ msgid ""
 "| [2HOST](https://2host.com/) | - | Yes | Yes | Yes(?) | Vague AUP/Abuse "
 "handling | 10/15/14 |"
 msgstr ""
+"| [2HOST](https://2host.com/) | - | áááá® | áááá® | 
áááá®(?) | áá£ááááááá "
+"áááááááááá£áááá á¡áá©ááá áááá¡ 
ááááá¬á§ááá¢ááá | 10/15/14 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10514,12 +10524,15 @@ msgid ""
 "| [Amazon Web Services (AWS)](https://aws.amazon.com) | - | Yes | Yes | No |"
 " - | - |"
 msgstr ""
+"| [Amazon Web Services (AWS)](https://aws.amazon.com) | - | áááá® | 
áááá® | "
+"áá á | - | - |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
 msgid ""
 "| [AmeriNOC](https://www.amerinoc.com/) | - | Yes | Yes | Yes | - | - |"
 msgstr ""
+"| [AmeriNOC](https://www.amerinoc.com/) | - | áááá® | áááá® | 
áááá® | - | - |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10527,11 +10540,13 @@ msgid ""
 "| [Arvixe](https://www.arvixe.com/vps_virtual_private_servers_hosting/) | - "
 "| Yes | Yes | Yes | - | 06/19/13 |"
 msgstr ""
+"| [Arvixe](https://www.arvixe.com/vps_virtual_private_servers_hosting/) | - "
+"| áááá® | áááá® | áááá® | - | 06/19/13 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
 msgid "| [Axigy](http://www.axigy.com) | - | Yes | Yes | Yes | - |  - |"
-msgstr ""
+msgstr "| [Axigy](http://www.axigy.com) | - | áááá® | áááá® | 
áááá® | - |  - |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10539,6 +10554,8 @@ msgid ""
 "| [Blacklotus](http://www.blacklotus.net) | - | Yes | Yes | Yes | Liberal "
 "abuse handling policies | - |"
 msgstr ""
+"| [Blacklotus](http://www.blacklotus.net) | - | áááá® | áááá® | 
áááá® | "
+"ááááááá á áááááááááá£ááááá¡ 
áááá£áááááá ááá á¦ááááááá | - |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #:

[tor-commits] [translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot

2021-02-05 Thread translation

commit f9a2100322b83554d79bf076eaafb772e0ac9888
Author: Translation commit bot 
Date:   Fri Feb 5 21:15:10 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+ka.po | 48 +++-
 1 file changed, 43 insertions(+), 5 deletions(-)

diff --git a/contents+ka.po b/contents+ka.po
index cbe606714a..7b204b2ce5 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -10225,6 +10225,8 @@ msgid ""
 "| [Hitme.net.pl](http://hitme.net.pl/) | - | Yes | Yes | Yes | - | "
 "12/06/2017 |"
 msgstr ""
+"| [Hitme.net.pl](http://hitme.net.pl/) | - | áááá® | áááá® | 
áááá® | - | "
+"12/06/2017 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10232,6 +10234,8 @@ msgid ""
 "| [Hostowisko.pl](http://www.hostowisko.pl/) | - | Yes | Yes | ? | -  | "
 "27/08/2013 |"
 msgstr ""
+"| [Hostowisko.pl](http://www.hostowisko.pl/) | - | áááá® | 
áááá® | ? | -  | "
+"27/08/2013 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10245,6 +10249,8 @@ msgid ""
 "| [e24cloud](http://www.e24cloud.com/en) | - | Yes | Yes | ? | - | "
 "01/10/2013 |"
 msgstr ""
+"| [e24cloud](http://www.e24cloud.com/en) | - | áááá® | áááá® | 
? | - | "
+"01/10/2013 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10252,6 +10258,8 @@ msgid ""
 "| [hostinger.pl](http://www.hostinger.pl) | - | Yes | Yes | Yes | | "
 "02/10/2013 |"
 msgstr ""
+"| [hostinger.pl](http://www.hostinger.pl) | - | áááá® | áááá® | 
áááá® | | "
+"02/10/2013 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10284,7 +10292,7 @@ msgstr ""
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
 msgid "### Romania"
-msgstr ""
+msgstr "### á á£áááááá"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10300,12 +10308,16 @@ msgid ""
 " tor-talk thread](https://lists.torproject.org/pipermail/tor-;
 "relays/2015-April/006867.html%7CApril)  | 04/2015 |"
 msgstr ""
+"| [Voxility](http://www.voxility.com/) | - | áááá® | áááá® | ? 
| áá®áááá áá áªááá"
+" [2015 tor-áá á¡áá¡áá£áá 
á](https://lists.torproject.org/pipermail/tor-;
+"relays/2015-April/006867.html%7CApril)  | 04/2015 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
 msgid ""
 "| [JavaPipe](https://javapipe.com/) | - | Yes | Yes | ? | - | 04/2016 |"
 msgstr ""
+"| [JavaPipe](https://javapipe.com/) | - | áááá® | áááá® | ? | - 
| 04/2016 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10314,11 +10326,14 @@ msgid ""
 "Romania and also have data centers in USA and UK with 24x7 free support. | "
 "03/2017 |"
 msgstr ""
+"| [MilesWeb](https://www.milesweb.com/) | - | áááá® | áááá® | 
áá á | á¡áá¢áá áá¤á "
+"ááááááá á á£áááááá¨á áá áá¡ááá 
áááááªáááá áªááá¢á ááá áá¨á¨-á¡á áá 
áááá ááááááá£á "
+"á¡áááá¤áá¨á 24x7 á£á¤áá¡á áá®áá ááááá 
áá. | 03/2017 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
 msgid "### Sweden"
-msgstr ""
+msgstr "### á¨áááááá"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10326,6 +10341,8 @@ msgid ""
 "| [Dataclub](https://www.dataclub.biz) | - | Yes | Yes | Yes | Your Exit "
 "should use Reduced Exit Policy | 2016/06/30 |"
 msgstr ""
+"| [Dataclub](https://www.dataclub.biz) | - | áááá® | áááá® | 
áááá® | áá¥áááá "
+"áááá¡ááááá ááááá«á á£ááá 
áá§ááááááá¡ á¨ááá¦á£áá£á 
áááá£ááááá¡ | 2016/06/30 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #:

[tor-commits] [translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot

2021-02-05 Thread translation

commit 730deecbbec8b47ebed0e8c509f9827fd9703210
Author: Translation commit bot 
Date:   Fri Feb 5 20:45:11 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+ka.po | 29 ++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/contents+ka.po b/contents+ka.po
index 5728c73ac0..cbe606714a 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -10049,12 +10049,17 @@ msgid ""
 " result in temporary blocks, therefore they recommend to use an dedicated IP"
 " address for exit nodes | 06/16/15 |"
 msgstr ""
+"| [XS4ALL](https://www.xs4all.nl/en/) | AS3265 | áááá® | áááá® 
| áááá® | "
+"ááá á¦ááááááá á¨ááá«áááá 
áááááá¬áááá¡ áá áááááá 
á¨ááá¦á£ááááá, áá£ááªá ááá á©áááá 
áªáááá "
+"ááááá§áá¤ááá IP-ááá¡áááá ááá¡ 
ááááá§ááááá áááá¡ááááá 
ááááá«áá¡áááá¡ | 06/16/15 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
 msgid ""
 "| [verelox](https://verelox.com/) | AS12876 | Yes | Yes | Yes | - | 5/16 |"
 msgstr ""
+"| [verelox](https://verelox.com/) | AS12876 | áááá® | áááá® | 
áááá® | - | 5/16 "
+"|"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10068,7 +10073,7 @@ msgstr ""
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
 msgid "| Ziggo | AS9143 | Yes | Yes | Yes | - | 05/24/2016 |"
-msgstr ""
+msgstr "| Ziggo | AS9143 | áááá® | áááá® | áááá® | - | 
05/24/2016 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10095,6 +10100,8 @@ msgid ""
 "| [i3D](https://www.i3d.net/) | - | Yes | Yes | Yes | Allows also exits, if "
 "abuse is handled properly | 08/13/2017 |"
 msgstr ""
+"| [i3D](https://www.i3d.net/) | - | áááá® | áááá® | 
áááá® | ááá¨áááá£ááá "
+"áááá¡ááááááá, áá£ á¡áá©ááá ááá¡ 
á¡áááááááá áááá®ááááá | 08/13/2017 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10102,6 +10109,8 @@ msgid ""
 "| [KoDDoS](https://koddos.net) | AS206264 | Yes | Yes | Yes | Bitcoin "
 "accepted. | 10/12/2017 |"
 msgstr ""
+"| [KoDDoS](https://koddos.net) | AS206264 | áááá® | áááá® | 
áááá® | Bitcoin "
+"ááá¡áá¦áááá. | 10/12/2017 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10139,11 +10148,13 @@ msgid ""
 "| [Netrouting`](http://netrouting.nl/) | - | Yes | Yes | No | ISP has "
 "confirmed by e-mail that exit nodes are NOT acceptable. | 2014-10-15 |"
 msgstr ""
+"| [Netrouting`](http://netrouting.nl/) | - | áááá® | áááá® | 
áá á | ISP "
+"áááá¡á¢á£á ááá¡ ááá¤áá¡á¢áá, á áá 
áááá¡ááááá ááááá«ááá á²á² á²á² 
ááá¨áááá£áá. | 2014-10-15 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
 msgid "| [DirectVPS](http://directvps.nl/) | - | Yes | Yes | ? | - | - |"
-msgstr ""
+msgstr "| [DirectVPS](http://directvps.nl/) | - | áááá® | áááá® 
| ? | - | - |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10168,11 +10179,15 @@ msgid ""
 "anonymous users to run tor exits. Abuse issues will be forwarded. Make sure "
 "to tell them that you're running an exit | 09/2014 |"
 msgstr ""
+"| [ChmuraNet](https://www.chmuranet.com/) | - | áááá® | áááá® | 
áááá® | "
+"á¡áá¨á£áááááá¡ áá«áááá, Tor-áá¡ 
áááá¡ááááá áááááááá¡ 
ááá£áá®áááá áááá¨ááá¡. á¡áá©ááá ááá "
+"ááááááá¡áááá ááááá. á¬áááá¡á¬áá  
áááá¤á áá®áááá, á áá ááá¨áááá£áá 
ááá¥áá áááá¡ááááá "
+"ááááááªááá | 09/2014 |"
 
 #:

[tor-commits] [tor-browser-build/maint-10.0-desktop] Release preparation for 10.0.11

2021-02-05 Thread gk

commit 1dd79281f904bfce4a9c5d4dfeb998367dc0b853
Author: Matthew Finkel 
Date:   Fri Feb 5 16:55:12 2021 +

Release preparation for 10.0.11

Versions bump and Changelog update
---
 projects/firefox-langpacks/config   | 2 +-
 projects/firefox/config | 6 +++---
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 
 rbm.conf| 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/projects/firefox-langpacks/config 
b/projects/firefox-langpacks/config
index 17a707a..34d6fad 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") 
%]-[% c("var/buil
 
 var:
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build2
+  ff_build: build1
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
 targets:
diff --git a/projects/firefox/config b/projects/firefox/config
index 1ffe7b0..4aa0f72 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,14 +1,14 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-2-build1'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-1-build1'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 78.7.0
+  firefox_platform_version: 78.7.1
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 10.0
   branding_directory: 'browser/branding/alpha'
@@ -49,7 +49,7 @@ targets:
   branding_directory: 'browser/branding/official'
 
   nightly:
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-1'
 tag_gpg_id: 0
 var:
   branding_directory: 'browser/branding/nightly'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt 
b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 7714bfc..3342c5e 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,7 @@
+Tor Browser 10.0.11 -- February 6 2021
+ * Windows
+   * Update Firefox to 78.7.1esr
+
 Tor Browser 10.0.10 -- February 3 2021
  * Windows + OS X + Linux
* Update NoScript to 11.2
diff --git a/rbm.conf b/rbm.conf
index ba9a51e..368fa3a 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,11 +24,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.0.10'
+  torbrowser_version: '10.0.11'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-- 10.0.8
 - 10.0.9
+- 10.0.10
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5

2021-02-05 Thread ahf

commit f420eacf1858220f1cb284353f975e03464b15e4
Merge: 4f4728a004 49c61c1bb8
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 19:18:47 2021 +

Merge branch 'maint-0.4.4' into maint-0.4.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.4.5] Merge branch 'maint-0.4.5' into release-0.4.5

2021-02-05 Thread ahf

commit 1e9ad700a13a0215135db998f74060a76f323931
Merge: ef0de1c0b2 f420eacf18
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 19:19:34 2021 +

Merge branch 'maint-0.4.5' into release-0.4.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.4.5] Delete changes/40241_v2 as it breaks CI.

2021-02-05 Thread ahf

commit 49c61c1bb85fa557a6a47f41cfab435a82a6d82f
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 19:18:13 2021 +

Delete changes/40241_v2 as it breaks CI.

Unreviewed build fix. Discussed the cnage on IRC with Nick.
---
 changes/40241_v2 | 4 
 1 file changed, 4 deletions(-)

diff --git a/changes/40241_v2 b/changes/40241_v2
deleted file mode 100644
index 85038297f7..00
--- a/changes/40241_v2
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (compilation):
-- Fix another warning about unreachable fallthrough annotations
-  when building with "--enable-all-bugs-are-fatal" on some compilers.
-  Fixes bug 40241; bugfix on 0.4.5.3-rc.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4

2021-02-05 Thread ahf

commit a9e3f73d67d2d5ab760cb291e18e3f259c3ff5e7
Merge: d9bfe60561 49c61c1bb8
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 19:19:34 2021 +

Merge branch 'maint-0.4.4' into release-0.4.4

___
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.4.5'

2021-02-05 Thread ahf

commit 60823d261c9639975e4f4b029909cb37639c91c4
Merge: db207329c7 f420eacf18
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 19:19:34 2021 +

Merge branch 'maint-0.4.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.4.4] Delete changes/40241_v2 as it breaks CI.

2021-02-05 Thread ahf

commit 49c61c1bb85fa557a6a47f41cfab435a82a6d82f
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 19:18:13 2021 +

Delete changes/40241_v2 as it breaks CI.

Unreviewed build fix. Discussed the cnage on IRC with Nick.
---
 changes/40241_v2 | 4 
 1 file changed, 4 deletions(-)

diff --git a/changes/40241_v2 b/changes/40241_v2
deleted file mode 100644
index 85038297f7..00
--- a/changes/40241_v2
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (compilation):
-- Fix another warning about unreachable fallthrough annotations
-  when building with "--enable-all-bugs-are-fatal" on some compilers.
-  Fixes bug 40241; bugfix on 0.4.5.3-rc.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5

2021-02-05 Thread ahf

commit f420eacf1858220f1cb284353f975e03464b15e4
Merge: 4f4728a004 49c61c1bb8
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 19:18:47 2021 +

Merge branch 'maint-0.4.4' into maint-0.4.5

___
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.4.4' into maint-0.4.5

2021-02-05 Thread ahf

commit f420eacf1858220f1cb284353f975e03464b15e4
Merge: 4f4728a004 49c61c1bb8
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 19:18:47 2021 +

Merge branch 'maint-0.4.4' into maint-0.4.5




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.5] Delete changes/40241_v2 as it breaks CI.

2021-02-05 Thread ahf

commit 49c61c1bb85fa557a6a47f41cfab435a82a6d82f
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 19:18:13 2021 +

Delete changes/40241_v2 as it breaks CI.

Unreviewed build fix. Discussed the cnage on IRC with Nick.
---
 changes/40241_v2 | 4 
 1 file changed, 4 deletions(-)

diff --git a/changes/40241_v2 b/changes/40241_v2
deleted file mode 100644
index 85038297f7..00
--- a/changes/40241_v2
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (compilation):
-- Fix another warning about unreachable fallthrough annotations
-  when building with "--enable-all-bugs-are-fatal" on some compilers.
-  Fixes bug 40241; bugfix on 0.4.5.3-rc.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Delete changes/40241_v2 as it breaks CI.

2021-02-05 Thread ahf

commit 49c61c1bb85fa557a6a47f41cfab435a82a6d82f
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 19:18:13 2021 +

Delete changes/40241_v2 as it breaks CI.

Unreviewed build fix. Discussed the cnage on IRC with Nick.
---
 changes/40241_v2 | 4 
 1 file changed, 4 deletions(-)

diff --git a/changes/40241_v2 b/changes/40241_v2
deleted file mode 100644
index 85038297f7..00
--- a/changes/40241_v2
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (compilation):
-- Fix another warning about unreachable fallthrough annotations
-  when building with "--enable-all-bugs-are-fatal" on some compilers.
-  Fixes bug 40241; bugfix on 0.4.5.3-rc.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.4] Delete changes/40241_v2 as it breaks CI.

2021-02-05 Thread ahf

commit 49c61c1bb85fa557a6a47f41cfab435a82a6d82f
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 19:18:13 2021 +

Delete changes/40241_v2 as it breaks CI.

Unreviewed build fix. Discussed the cnage on IRC with Nick.
---
 changes/40241_v2 | 4 
 1 file changed, 4 deletions(-)

diff --git a/changes/40241_v2 b/changes/40241_v2
deleted file mode 100644
index 85038297f7..00
--- a/changes/40241_v2
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (compilation):
-- Fix another warning about unreachable fallthrough annotations
-  when building with "--enable-all-bugs-are-fatal" on some compilers.
-  Fixes bug 40241; bugfix on 0.4.5.3-rc.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot

2021-02-05 Thread translation

commit 65ed4d94fdd8988eef5ecb2e4c1e841e349b0da5
Author: Translation commit bot 
Date:   Fri Feb 5 19:15:15 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+ka.po | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/contents+ka.po b/contents+ka.po
index 04e847db4a..5728c73ac0 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -9922,6 +9922,11 @@ msgid ""
 " on the machine. [Read more](https://balist.es/blog/2016/04/18/running-a;
 "-tor-exit-node-on-aruba-arubacloud-a-detailed-account/) | - |"
 msgstr ""
+"| [ArubaCloud /Aruba](https://cloud.it/) | - | áááá® | áááá® | 
áááá® |  "
+"ááááá§áááááá¡ ááá ááááá¨á 
ááááááá áááááááá£ááá á áá 
ááááááªáááá¡ áááá¨áááá 
ááááááá£ááá"
+" á§áááá á¡áá¥ááááááááá, á ááª áá 
áááá áá¢á£á áá á¨áá¡á á£ááááá. 
[áá®áááá "
+"áá 
áªááá](https://balist.es/blog/2016/04/18/running-a-tor-exit-node-on-aruba-;
+"arubacloud-a-detailed-account/) | - |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -9931,6 +9936,10 @@ msgid ""
 "other than the well-known are filtered. Abuse complaints need to go through "
 "their support service | 11/2018 |"
 msgstr ""
+"| [SelfServer, á£áá á£áááááá§áá¤á 
Enter](https://selfserver.it/) | - | áááá® | "
+"áááá® | áááá® | ááá£á®áá á®ááááá, 
áááááááááá á CentOS 6.10 á«áááá ááá 
á¡ááá¡á áá NAT-"
+"áááá, áá®áááá IPv4-áá¡ áá¥ááá 
á¥á¡áááááá, áªáááááá ááá á¢áááá¡ 
ááá áá á§áááá ááá¦á£áááá. "
+"á¡áá©ááá áááá á¯áá  á£ááá ááááá áá 
áááá áá®áá ááááá áá¡ á¡ááá¡áá®á£á áá¡ 
á®ááá¨á | 11/2018 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -9945,6 +9954,11 @@ msgid ""
 "your Exit relay receive too much complaints, they will ask to you to stop or"
 " otherwise they will suspend. | 2015/03/06 |"
 msgstr ""
+"| [Yourserver](https://www.yourserver.se/) | - | áááá® | áááá® 
| ? | "
+"áá®áá ááááá áá¡ áá£ááá áá«áááá 
ááááá áááá¡ 
ááááááªááá/áááá¡áááááá¡ 
ááá¨ááááá¡, áá¦ááá Tor-"
+"áá¡ áááááªááááá áááááªáááááá¡ 
á¡áá©á¥áá á áá  á£ááá áá¦áááá¢áááááá¡ 
5áááá¢á¡ á¬ááá¨á. áá£ "
+"áá¥áááá áááá¡ááááá ááááá«á 
áá¦ááá¡ áááááá¢áá áááá  á¡áá©áááá á¡, 
ááá®áááá ááá¡ ááááá¨ááá¡, "
+"á¬ááááá¦áááá á¨áááá®ááááá¨á 
áááá¡áá®á£á áááá¡ á¨ááá©áá áááá. | 
2015/03/06 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -9957,6 +9971,8 @@ msgid ""
 "| [Baltic Servers](http://www.balticservers.com) | - |  Yes | Yes | Yes | "
 "All abuse mails they got yielded support tickets | - |"
 msgstr ""
+"| [Baltic Servers](http://www.balticservers.com) | - |  áááá® | 
áááá® | áááá® |"
+" á¡áá©ááá áá¡ á§áááá á¬áá áááá 
áá®á¡áááá áªáááá áááááá áá®áá 
ááááá áá¡áááá¡ | - |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -10024,7 +10040,7 @@ msgstr ""
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)
 msgid "### Netherlands"
-msgstr ""
+msgstr "### ááááá ááááááá"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: 
(content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.body)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json

2021-02-05 Thread translation

commit 16e7015956eedba1a56ec27c280c1399b6365073
Author: Translation commit bot 
Date:   Fri Feb 5 19:16:02 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 sv_SE/messages.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv_SE/messages.json b/sv_SE/messages.json
index fdf78c214f..d176990fa8 100644
--- a/sv_SE/messages.json
+++ b/sv_SE/messages.json
@@ -36,7 +36,7 @@
 "message": "Kakor Ã¤r inte aktiverade."
   },
   "websiteIntro": {
-"message": "Snowflake Ã¤r ett system fÃ¶r att besegra internetcensur. 
MÃ¤nniskor som censureras kan anvÃ¤nda Snowflake fÃ¶r att komma Ã¥t internet. 
Deras anslutning gÃ¥r igenom Snowflake-proxyservrar, som drivs av volontÃ¤rer. 
FÃ¶r mer detaljerad information om hur Snowflake fungerar se vÃ¥r https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\; 
data-msgid=\"__MSG_docWiki__\">dokumentations wiki."
+"message": "Snowflake Ã¤r ett system fÃ¶r att besegra internetcensur. 
Personer som censureras kan anvÃ¤nda Snowflake fÃ¶r att komma Ã¥t internet. 
Deras anslutning gÃ¥r igenom Snowflake-proxyservrar, som drivs av volontÃ¤rer. 
FÃ¶r mer detaljerad information om hur Snowflake fungerar se vÃ¥r https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\; 
data-msgid=\"__MSG_docWiki__\">dokumentations wiki."
   },
   "docWiki": {
 "message": "dokumentations wiki"
@@ -51,7 +51,7 @@
 "message": "TillÃ¤gg"
   },
   "installExtension": {
-"message": "Om din Internet-Ã¥tkomst inte censureras bÃ¶r 
du Ã¶vervÃ¤ga att installera Snowflake-tillÃ¤gget fÃ¶r att hjÃ¤lpa anvÃ¤ndare i 
censurerade nÃ¤tverk. Det finns ingen anledning att oroa sig fÃ¶r vilka 
webbplatser mÃ¤nniskor har tillgÃ¥ng till via din proxy. Deras synliga 
surfnings IP-adress kommer att matcha deras Tor-slutnod, inte din."
+"message": "Om din Internet-Ã¥tkomst inte censureras bÃ¶r 
du Ã¶vervÃ¤ga att installera Snowflake-tillÃ¤gget fÃ¶r att hjÃ¤lpa anvÃ¤ndare i 
censurerade nÃ¤tverk. Det finns ingen anledning att oroa sig fÃ¶r vilka 
webbplatser personer har tillgÃ¥ng till via din proxy. Deras synliga surfnings 
IP-adress kommer att matcha deras Tor-slutnod, inte din."
   },
   "installFirefox": {
 "message": "Installera i Firefox"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage

2021-02-05 Thread translation

commit 05cbd49ee93f68d22617a99389957b3d0057e888
Author: Translation commit bot 
Date:   Fri Feb 5 19:15:04 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
---
 sv-SE/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv-SE/aboutTor.dtd b/sv-SE/aboutTor.dtd
index 9d6bd5ed3c..44cf9c7c03 100644
--- a/sv-SE/aboutTor.dtd
+++ b/sv-SE/aboutTor.dtd
@@ -27,7 +27,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot

2021-02-05 Thread translation

commit f77ee07d72819d77df9f7362a6112f0b402ccb3a
Author: Translation commit bot 
Date:   Fri Feb 5 19:15:48 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+sv.po | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/code_of_conduct+sv.po b/code_of_conduct+sv.po
index 041322a945..0e38bcdfe7 100644
--- a/code_of_conduct+sv.po
+++ b/code_of_conduct+sv.po
@@ -5,7 +5,8 @@
 # FIRST AUTHOR , YEAR.
 # 
 # Translators:
-# Jonatan Nyberg, 2020
+# efef6ec5b435a041fce803c7f8af77d2_2341d43, 2020
+# Jonatan Nyberg , 2021
 # 
 #, fuzzy
 msgid ""
@@ -13,7 +14,7 @@ msgstr ""
 "Project-Id-Version: Code of conduct of the Tor Project\n"
 "POT-Creation-Date: 2019-08-02 12:00+\n"
 "PO-Revision-Date: 2019-08-27 18:54+\n"
-"Last-Translator: Jonatan Nyberg, 2020\n"
+"Last-Translator: Jonatan Nyberg , 2021\n"
 "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,7 +70,7 @@ msgstr ""
 "Denna uppfÃ¶randekod gÃ¤ller fÃ¶r Tor-projektet som helhet. Den Ã¤r avsedd 
att "
 "ge riktlinjer fÃ¶r bidragsgivare. AnstÃ¤llda och entreprenÃ¶rer av Tor 
Project,"
 " Inc. (TPI) Ã¤r ocksÃ¥ fÃ¶remÃ¥l fÃ¶r fÃ¶retagets riktlinjer och 
fÃ¶rfaranden. "
-"Dessa mÃ¤nniskor bÃ¶r gÃ¤rna kontakta HR med frÃ¥gor eller funderingar."
+"Dessa personer bÃ¶r gÃ¤rna kontakta HR med frÃ¥gor eller funderingar."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:23
@@ -103,7 +104,8 @@ msgstr ""
 #. type: Plain text
 #: ../code_of_conduct.txt:29
 msgid "The Tor community should be a good place where people are glad to be."
-msgstr "Tor-gemenskapen bÃ¶r vara en bra plats dÃ¤r mÃ¤nniskor gÃ¤rna Ã¤r."
+msgstr ""
+"Tor-gemenskapen borde vara en bra plats dÃ¤r mÃ¤nniskor Ã¤r glada att vara."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:31
@@ -212,7 +214,7 @@ msgid ""
 msgstr ""
 "En sÃ¤ker miljÃ¶ innebÃ¤r en fri frÃ¥n missbruk, oavsett om det Ã¤r isolerat "
 "eller systemiskt. Vi erkÃ¤nner uttryckligen att det Ã¤r ett sÃ¤kerhetsproblem 
"
-"att tolerera missbruk. Att tillÃ¥ta missbrukare och skadliga mÃ¤nniskor att "
+"att tolerera missbruk. Att tillÃ¥ta missbrukare och skadliga personer att "
 "stÃ¶ra vÃ¥rt samhÃ¤lle sÃ¤tter vÃ¥r programvara, utvecklare och anvÃ¤ndare i 
fara."
 
 #. type: Plain text
@@ -533,7 +535,7 @@ msgid ""
 msgstr ""
 "Vi tolererar inte oacceptabelt beteende frÃ¥n nÃ¥gon gemenskapsmedlem. Vi "
 "kommer inte att gÃ¶ra undantag fÃ¶r sponsorer och de med beslutsfattande "
-"auktoritet. MÃ¤nniskor i formella eller informella ledarroller mÃ¥ste vara "
+"auktoritet. Personer i formella eller informella ledarroller mÃ¥ste vara "
 "fÃ¶rebilder fÃ¶r de hÃ¶gsta standarderna fÃ¶r beteende."
 
 #. type: Plain text

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml

2021-02-05 Thread translation

commit fe0ce52895a8ca40cb796bc27e47b8455e92479e
Author: Translation commit bot 
Date:   Fri Feb 5 19:15:28 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
---
 sv-rSE/torbrowser_strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv-rSE/torbrowser_strings.xml b/sv-rSE/torbrowser_strings.xml
index 176cd399c5..e6b9759662 100644
--- a/sv-rSE/torbrowser_strings.xml
+++ b/sv-rSE/torbrowser_strings.xml
@@ -26,7 +26,7 @@
 Nuvarande 
sÃ¤kerhetsnivÃ¥: %s
 Ãppna 
sÃ¤kerhetsinstÃ¤llningar
 Donera och hÃ¥ll Tor 
sÃ¤ker
-Tor Ã¤r gratis att 
anvÃ¤nda pÃ¥ grund av donationer frÃ¥n mÃ¤nniskor som du.
+Tor Ã¤r gratis att 
anvÃ¤nda pÃ¥ grund av donationer frÃ¥n personer som du.
 Donera nu
 
 Utforska. Privat.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/master] Remove extra paragraphs of the job description

2021-02-05 Thread gus

commit 2329f723b1c54c1f35eaba674488d3b21331
Author: gus 
Date:   Fri Feb 5 12:58:03 2021 -0500

Remove extra paragraphs of the job description
---
 content/about/jobs/metrics-data-architect/contents.lr | 6 --
 1 file changed, 6 deletions(-)

diff --git a/content/about/jobs/metrics-data-architect/contents.lr 
b/content/about/jobs/metrics-data-architect/contents.lr
index 5ee03db2..be69a7bc 100644
--- a/content/about/jobs/metrics-data-architect/contents.lr
+++ b/content/about/jobs/metrics-data-architect/contents.lr
@@ -28,12 +28,6 @@ description:
 
 *February 4, 2021*
 
-The Tor Project, Inc., a 501(c)(3) nonprofit organization advancing human 
rights and freedoms by creating and deploying free and open source anonymity 
and privacy technologies, is seeking an experienced Data Architect to take our 
metrics work to the next level.
-
-Tor is for everyone, and we are actively working to build a team that 
represents people from all over the world â people from diverse ethnic, 
national, and cultural backgrounds; people from all walks of life. Racial 
minorities, non-gender-binary people, women, and people from any group that is 
generally underrepresented in tech are encouraged to apply.
-
-This is a full-time remote position.
-
 ### The team
 
 Historically our Metrics Team has been collecting data since 2004 to help 
improve the tools we build and learn more about the Tor network. For example, 
we monitor the number of relays and clients in the network, their respective 
capabilities, the number of clients connecting via bridges, fluctuations in 
network speed, etc. Gathering this data results in huge data archives, so we 
are also working to develop tools to process this data and make it available to 
everyone.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4

2021-02-05 Thread ahf

commit d9bfe605610181688313d9e5975fd517c8db9e3d
Merge: 817cf01831 aa1a053d55
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 17:40:25 2021 +

Merge branch 'maint-0.4.4' into release-0.4.4

 scripts/maint/practracker/exceptions.txt | 3 +--
 1 file changed, 1 insertion(+), 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 'maint-0.4.5'

2021-02-05 Thread ahf

commit db207329c789a16fb0a4bad661fa00505f80169a
Merge: 07ca2a8ee9 4f4728a004
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 17:40:25 2021 +

Merge branch 'maint-0.4.5'

 scripts/maint/practracker/exceptions.txt | 3 +--
 1 file changed, 1 insertion(+), 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.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5

2021-02-05 Thread ahf

commit 4f4728a0049efcaffdda00274c070dc702aff51c
Merge: 3496804827 aa1a053d55
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 17:40:25 2021 +

Merge branch 'maint-0.4.4' into maint-0.4.5

 scripts/maint/practracker/exceptions.txt | 3 +--
 1 file changed, 1 insertion(+), 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.4.4] Fix CI build: practracker error in connection_edge.c, take two.

2021-02-05 Thread ahf

commit aa1a053d5538d07252597f7d55f9bba9028a2d08
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 17:39:21 2021 +

Fix CI build: practracker error in connection_edge.c, take two.

This was a bad copy and paste error from the previous commit which
generated a duplicated entry error from practracker.

Unreviewed build fix.

See: tor#40275.
---
 scripts/maint/practracker/exceptions.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index a84a434cd6..711ef67d36 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -130,7 +130,6 @@ problem function-size 
/src/core/or/command.c:command_process_create_cell() 156
 problem function-size /src/core/or/command.c:command_process_relay_cell() 132
 problem dependency-violation /src/core/or/command.c 9
 problem file-size /src/core/or/connection_edge.c 4655
-problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 
130
 problem include-count /src/core/or/connection_edge.c 65
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_expire_beginning() 117
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_rewrite() 193
@@ -139,7 +138,7 @@ problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_rew
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_send_begin() 111
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_socks_resolved() 101
 problem function-size 
/src/core/or/connection_edge.c:connection_exit_begin_conn() 185
-problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 
102
+problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 
130
 problem dependency-violation /src/core/or/connection_edge.c 27
 problem dependency-violation /src/core/or/connection_edge.h 1
 problem function-size 
/src/core/or/connection_or.c:connection_or_group_set_badness_() 105



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5

2021-02-05 Thread ahf

commit ef0de1c0b20c5abafefecf093c899865bd26af46
Merge: 3929dc3010 4f4728a004
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 17:40:25 2021 +

Merge branch 'maint-0.4.5' into release-0.4.5

 scripts/maint/practracker/exceptions.txt | 3 +--
 1 file changed, 1 insertion(+), 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.4.5] Fix CI build: practracker error in connection_edge.c, take two.

2021-02-05 Thread ahf

commit aa1a053d5538d07252597f7d55f9bba9028a2d08
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 17:39:21 2021 +

Fix CI build: practracker error in connection_edge.c, take two.

This was a bad copy and paste error from the previous commit which
generated a duplicated entry error from practracker.

Unreviewed build fix.

See: tor#40275.
---
 scripts/maint/practracker/exceptions.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index a84a434cd6..711ef67d36 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -130,7 +130,6 @@ problem function-size 
/src/core/or/command.c:command_process_create_cell() 156
 problem function-size /src/core/or/command.c:command_process_relay_cell() 132
 problem dependency-violation /src/core/or/command.c 9
 problem file-size /src/core/or/connection_edge.c 4655
-problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 
130
 problem include-count /src/core/or/connection_edge.c 65
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_expire_beginning() 117
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_rewrite() 193
@@ -139,7 +138,7 @@ problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_rew
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_send_begin() 111
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_socks_resolved() 101
 problem function-size 
/src/core/or/connection_edge.c:connection_exit_begin_conn() 185
-problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 
102
+problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 
130
 problem dependency-violation /src/core/or/connection_edge.c 27
 problem dependency-violation /src/core/or/connection_edge.h 1
 problem function-size 
/src/core/or/connection_or.c:connection_or_group_set_badness_() 105



___
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.4.4' into maint-0.4.5

2021-02-05 Thread ahf

commit 4f4728a0049efcaffdda00274c070dc702aff51c
Merge: 3496804827 aa1a053d55
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 17:40:25 2021 +

Merge branch 'maint-0.4.4' into maint-0.4.5

 scripts/maint/practracker/exceptions.txt | 3 +--
 1 file changed, 1 insertion(+), 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] Fix CI build: practracker error in connection_edge.c, take two.

2021-02-05 Thread ahf

commit aa1a053d5538d07252597f7d55f9bba9028a2d08
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 17:39:21 2021 +

Fix CI build: practracker error in connection_edge.c, take two.

This was a bad copy and paste error from the previous commit which
generated a duplicated entry error from practracker.

Unreviewed build fix.

See: tor#40275.
---
 scripts/maint/practracker/exceptions.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index a84a434cd6..711ef67d36 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -130,7 +130,6 @@ problem function-size 
/src/core/or/command.c:command_process_create_cell() 156
 problem function-size /src/core/or/command.c:command_process_relay_cell() 132
 problem dependency-violation /src/core/or/command.c 9
 problem file-size /src/core/or/connection_edge.c 4655
-problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 
130
 problem include-count /src/core/or/connection_edge.c 65
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_expire_beginning() 117
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_rewrite() 193
@@ -139,7 +138,7 @@ problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_rew
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_send_begin() 111
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_socks_resolved() 101
 problem function-size 
/src/core/or/connection_edge.c:connection_exit_begin_conn() 185
-problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 
102
+problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 
130
 problem dependency-violation /src/core/or/connection_edge.c 27
 problem dependency-violation /src/core/or/connection_edge.h 1
 problem function-size 
/src/core/or/connection_or.c:connection_or_group_set_badness_() 105



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5

2021-02-05 Thread ahf

commit 4f4728a0049efcaffdda00274c070dc702aff51c
Merge: 3496804827 aa1a053d55
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 17:40:25 2021 +

Merge branch 'maint-0.4.4' into maint-0.4.5

 scripts/maint/practracker/exceptions.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.5] Fix CI build: practracker error in connection_edge.c, take two.

2021-02-05 Thread ahf

commit aa1a053d5538d07252597f7d55f9bba9028a2d08
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 17:39:21 2021 +

Fix CI build: practracker error in connection_edge.c, take two.

This was a bad copy and paste error from the previous commit which
generated a duplicated entry error from practracker.

Unreviewed build fix.

See: tor#40275.
---
 scripts/maint/practracker/exceptions.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index a84a434cd6..711ef67d36 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -130,7 +130,6 @@ problem function-size 
/src/core/or/command.c:command_process_create_cell() 156
 problem function-size /src/core/or/command.c:command_process_relay_cell() 132
 problem dependency-violation /src/core/or/command.c 9
 problem file-size /src/core/or/connection_edge.c 4655
-problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 
130
 problem include-count /src/core/or/connection_edge.c 65
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_expire_beginning() 117
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_rewrite() 193
@@ -139,7 +138,7 @@ problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_rew
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_send_begin() 111
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_socks_resolved() 101
 problem function-size 
/src/core/or/connection_edge.c:connection_exit_begin_conn() 185
-problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 
102
+problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 
130
 problem dependency-violation /src/core/or/connection_edge.c 27
 problem dependency-violation /src/core/or/connection_edge.h 1
 problem function-size 
/src/core/or/connection_or.c:connection_or_group_set_badness_() 105



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.4] Fix CI build: practracker error in connection_edge.c, take two.

2021-02-05 Thread ahf

commit aa1a053d5538d07252597f7d55f9bba9028a2d08
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 5 17:39:21 2021 +

Fix CI build: practracker error in connection_edge.c, take two.

This was a bad copy and paste error from the previous commit which
generated a duplicated entry error from practracker.

Unreviewed build fix.

See: tor#40275.
---
 scripts/maint/practracker/exceptions.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index a84a434cd6..711ef67d36 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -130,7 +130,6 @@ problem function-size 
/src/core/or/command.c:command_process_create_cell() 156
 problem function-size /src/core/or/command.c:command_process_relay_cell() 132
 problem dependency-violation /src/core/or/command.c 9
 problem file-size /src/core/or/connection_edge.c 4655
-problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 
130
 problem include-count /src/core/or/connection_edge.c 65
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_expire_beginning() 117
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_rewrite() 193
@@ -139,7 +138,7 @@ problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_rew
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_send_begin() 111
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_socks_resolved() 101
 problem function-size 
/src/core/or/connection_edge.c:connection_exit_begin_conn() 185
-problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 
102
+problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 
130
 problem dependency-violation /src/core/or/connection_edge.c 27
 problem dependency-violation /src/core/or/connection_edge.h 1
 problem function-size 
/src/core/or/connection_or.c:connection_or_group_set_badness_() 105

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 1658881 - When failing to create a channel and an image request, make sure to set the image blocking status appropriately. r=tnikkel

2021-02-05 Thread sysrqb

commit 131f3d27b9f651a014d7d569d9c203bf6efe011a
Author: Emilio Cobos Ãlvarez 
Date:   Wed Sep 9 22:58:29 2020 +

Bug 1658881 - When failing to create a channel and an image request, make 
sure to set the image blocking status appropriately. r=tnikkel

This is the same status as we do for known no-data protocols here:

  
https://searchfox.org/mozilla-central/rev/ac142717cc067d875e83e4b1316f004f6e063a46/dom/base/nsNoDataProtocolContentPolicy.cpp#59

This ensures we treat these two cases the same.

Differential Revision: https://phabricator.services.mozilla.com/D89382
---
 dom/base/nsImageLoadingContent.cpp  | 7 ++-
 layout/reftests/image/reftest.list  | 1 +
 layout/reftests/image/unknown-protocol-ref.html | 1 +
 layout/reftests/image/unknown-protocol.html | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/dom/base/nsImageLoadingContent.cpp 
b/dom/base/nsImageLoadingContent.cpp
index 23b1fd791c1f..85de63bef02d 100644
--- a/dom/base/nsImageLoadingContent.cpp
+++ b/dom/base/nsImageLoadingContent.cpp
@@ -1207,7 +1207,12 @@ nsresult nsImageLoadingContent::LoadImage(nsIURI* 
aNewURI, bool aForce,
 MOZ_ASSERT(!req, "Shouldn't have non-null request here");
 // If we don't have a current URI, we might as well store this URI so 
people
 // know what we tried (and failed) to load.
-if (!mCurrentRequest) mCurrentURI = aNewURI;
+if (!mCurrentRequest) {
+  mCurrentURI = aNewURI;
+  if (mImageBlockingStatus == nsIContentPolicy::ACCEPT) {
+mImageBlockingStatus = nsIContentPolicy::REJECT_REQUEST;
+  }
+}
 
 FireEvent(NS_LITERAL_STRING("error"));
 FireEvent(NS_LITERAL_STRING("loadend"));
diff --git a/layout/reftests/image/reftest.list 
b/layout/reftests/image/reftest.list
index a8a91c13ed3a..3c561fe3a7c8 100644
--- a/layout/reftests/image/reftest.list
+++ b/layout/reftests/image/reftest.list
@@ -69,3 +69,4 @@ random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 
image-srcset-basic-selec
 pref(dom.image-lazy-loading.enabled,true) == 
moz-broken-matching-lazy-load.html moz-broken-matching-1-ref.html
 
 == img-invalidation-local-transform-1.html 
img-invalidation-local-transform-1-ref.html
+== unknown-protocol.html unknown-protocol-ref.html
diff --git a/layout/reftests/image/unknown-protocol-ref.html 
b/layout/reftests/image/unknown-protocol-ref.html
new file mode 100644
index ..b5bb326eef57
--- /dev/null
+++ b/layout/reftests/image/unknown-protocol-ref.html
@@ -0,0 +1 @@
+mailto://foo;>
diff --git a/layout/reftests/image/unknown-protocol.html 
b/layout/reftests/image/unknown-protocol.html
new file mode 100644
index ..ef06881b7bcb
--- /dev/null
+++ b/layout/reftests/image/unknown-protocol.html
@@ -0,0 +1 @@
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 28125 - Prevent non-Necko network connections

2021-02-05 Thread sysrqb

commit ed6ab267d2cfd01fc9827da5e212bfca3418afd1
Author: Matthew Finkel 
Date:   Thu Oct 25 19:17:09 2018 +

Bug 28125 - Prevent non-Necko network connections
---
 .../gecko/media/GeckoMediaDrmBridgeV21.java| 49 +-
 .../exoplayer2/upstream/DefaultHttpDataSource.java | 47 +
 2 files changed, 3 insertions(+), 93 deletions(-)

diff --git 
a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java
 
b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java
index 3ba59bfd6776..eb57b1013642 100644
--- 
a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java
+++ 
b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java
@@ -488,54 +488,7 @@ public class GeckoMediaDrmBridgeV21 implements 
GeckoMediaDrm {
 
 @Override
 protected Void doInBackground(final Void... params) {
-HttpURLConnection urlConnection = null;
-BufferedReader in = null;
-try {
-URI finalURI = new URI(mURL + "=" + 
URLEncoder.encode(new String(mDrmRequest), "UTF-8"));
-urlConnection = (HttpURLConnection) 
ProxySelector.openConnectionWithProxy(finalURI);
-urlConnection.setRequestMethod("POST");
-if (DEBUG) Log.d(LOGTAG, "Provisioning, posting url =" + 
finalURI.toString());
-
-// Add data
-urlConnection.setRequestProperty("Accept", "*/*");
-urlConnection.setRequestProperty("User-Agent", 
getCDMUserAgent());
-urlConnection.setRequestProperty("Content-Type", 
"application/json");
-
-// Execute HTTP Post Request
-urlConnection.connect();
-
-int responseCode = urlConnection.getResponseCode();
-if (responseCode == HttpURLConnection.HTTP_OK) {
-in = new BufferedReader(new 
InputStreamReader(urlConnection.getInputStream(), StringUtils.UTF_8));
-String inputLine;
-StringBuffer response = new StringBuffer();
-
-while ((inputLine = in.readLine()) != null) {
-response.append(inputLine);
-}
-in.close();
-mResponseBody = 
String.valueOf(response).getBytes(StringUtils.UTF_8);
-if (DEBUG) Log.d(LOGTAG, "Provisioning, response 
received.");
-if (mResponseBody != null) Log.d(LOGTAG, "response 
length=" + mResponseBody.length);
-} else {
-Log.d(LOGTAG, "Provisioning, server returned HTTP error 
code :" + responseCode);
-}
-} catch (IOException e) {
-Log.e(LOGTAG, "Got exception during posting provisioning 
request ...", e);
-} catch (URISyntaxException e) {
-Log.e(LOGTAG, "Got exception during creating uri ...", e);
-} finally {
-if (urlConnection != null) {
-urlConnection.disconnect();
-}
-try {
-if (in != null) {
-in.close();
-}
-} catch (IOException e) {
-Log.e(LOGTAG, "Exception during closing in ...", e);
-}
-}
+Log.i(LOGTAG, "This is Tor Browser. Skipping.");
 return null;
 }
 
diff --git 
a/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
 
b/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
index fdb44cc2ea1f..7a2044721d2d 100644
--- 
a/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
+++ 
b/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
@@ -395,51 +395,8 @@ public class DefaultHttpDataSource implements 
HttpDataSource {
*/
   private HttpURLConnection makeConnection(URL url, byte[] postBody, long 
position,
   long length, boolean allowGzip, boolean followRedirects) throws 
IOException, URISyntaxException {
-/**
- * Tor Project modified the way the connection object was created. For the 
sake of
- * simplicity, instead of duplicating the whole file we changed the 
connection object
- * to use the ProxySelector.
- */
-HttpURLConnection connection = (HttpURLConnection) 
ProxySelector.openConnectionWithProxy(url.toURI());
-
-connection.setConnectTimeout(connectTimeoutMillis);
-connection.setReadTimeout(readTimeoutMillis);
-if (defaultRequestProperties != null) {
-  for (Map.Entry property :

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 33342: Avoid disconnect search addon error after removal.

2021-02-05 Thread sysrqb

commit 19021b06d4223f037e05f793d78acdd817bd41de
Author: Alex Catarineu 
Date:   Fri Mar 13 18:19:30 2020 +0100

Bug 33342: Avoid disconnect search addon error after removal.

We removed the addon in #32767, but it was still being loaded
from addonStartup.json.lz4 and throwing an error on startup
because its resource: location is not available anymore.
---
 toolkit/mozapps/extensions/internal/XPIProvider.jsm | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm 
b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 5e467fb4f14c..794c206fb453 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -970,6 +970,12 @@ var BuiltInLocation = new (class _BuiltInLocation extends 
XPIStateLocation {
   get enumerable() {
 return false;
   }
+
+  restore(saved) {
+super.restore(saved);
+// Bug 33342: avoid restoring disconnect addon from addonStartup.json.lz4.
+this.removeAddon("disconn...@search.mozilla.org");
+  }
 })();
 
 /**



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 40073: Disable remote Public Suffix List fetching

2021-02-05 Thread sysrqb

commit 1629c3f2425a3b0512e2010d2dd926995573f28e
Author: Alex Catarineu 
Date:   Thu Aug 13 11:05:03 2020 +0200

Bug 40073: Disable remote Public Suffix List fetching

In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented
fetching the Public Suffix List via RemoteSettings and replacing the default
one at runtime, which we do not want.
---
 browser/components/BrowserGlue.jsm | 5 -
 1 file changed, 5 deletions(-)

diff --git a/browser/components/BrowserGlue.jsm 
b/browser/components/BrowserGlue.jsm
index e08e461a27ff..ec38d0ca8b33 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -695,7 +695,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   PluralForm: "resource://gre/modules/PluralForm.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
   ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm",
-  PublicSuffixList: "resource://gre/modules/netwerk-dns/PublicSuffixList.jsm",
   RemoteSettings: "resource://services-settings/remote-settings.js",
   RemoteSecuritySettings:
 "resource://gre/modules/psm/RemoteSecuritySettings.jsm",
@@ -2575,10 +2574,6 @@ BrowserGlue.prototype = {
 this._addBreachesSyncHandler();
   },
 
-  () => {
-PublicSuffixList.init();
-  },
-
   () => {
 RemoteSecuritySettings.init();
   },



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 1650281 - P2: Make sure `gCombinedSizes` won't be underflowed r=gerald

2021-02-05 Thread sysrqb

commit 0d75c782deb93a7b7a734aa7478a775ab228d2d4
Author: Chun-Min Chang 
Date:   Tue Jul 21 23:39:14 2020 +

Bug 1650281 - P2: Make sure `gCombinedSizes` won't be underflowed r=gerald

In any case, `gCombinedSizes` should be larger than or equal to the
buffer within `MemoryClockCache`.

Differential Revision: https://phabricator.services.mozilla.com/D84274
---
 dom/media/MemoryBlockCache.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dom/media/MemoryBlockCache.cpp b/dom/media/MemoryBlockCache.cpp
index bf073e6769d0..2848a3f3812c 100644
--- a/dom/media/MemoryBlockCache.cpp
+++ b/dom/media/MemoryBlockCache.cpp
@@ -52,6 +52,7 @@ MemoryBlockCache::MemoryBlockCache(int64_t aContentLength)
 }
 
 MemoryBlockCache::~MemoryBlockCache() {
+  MOZ_ASSERT(gCombinedSizes >= mBuffer.Length());
   size_t sizes = static_cast(gCombinedSizes -= mBuffer.Length());
   LOG("~MemoryBlockCache() - destroying buffer of size %zu; combined sizes now 
"
   "%zu",



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots

2021-02-05 Thread sysrqb

commit 88ef1ab540bdb5f1193b13bdd48947bae86c9066
Author: Alex Catarineu 
Date:   Fri Oct 9 12:55:35 2020 +0200

Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots
---
 browser/app/profile/000-tor-browser.js |  3 +++
 browser/components/BrowserGlue.jsm | 14 ++
 2 files changed, 17 insertions(+)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index c87bd050b8f5..1218ebfe3d49 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -321,6 +321,9 @@ pref("security.enterprise_roots.enabled", false);
 // Don't ping Mozilla for MitM detection, see bug 32321
 pref("security.certerrors.mitm.priming.enabled", false);
 
+// Don't automatically enable enterprise roots, see bug 40166
+pref("security.certerrors.mitm.auto_enable_enterprise_roots", false);
+
 // Disable the language pack signing check for now on macOS, see #31942
 #ifdef XP_MACOSX
 pref("extensions.langpacks.signatures.required", false);
diff --git a/browser/components/BrowserGlue.jsm 
b/browser/components/BrowserGlue.jsm
index 057a2121533c..3750230a250b 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -1319,6 +1319,20 @@ BrowserGlue.prototype = {
 // handle any UI migration
 this._migrateUI();
 
+// Clear possibly auto enabled enterprise_roots prefs (see bug 40166)
+if (
+  !Services.prefs.getBoolPref(
+"security.certerrors.mitm.auto_enable_enterprise_roots"
+  ) &&
+  Services.prefs.getBoolPref(
+"security.enterprise_roots.auto-enabled",
+false
+  )
+) {
+  Services.prefs.clearUserPref("security.enterprise_roots.enabled");
+  Services.prefs.clearUserPref("security.enterprise_roots.auto-enabled");
+}
+
 if (!Services.prefs.prefHasUserValue(PREF_PDFJS_ISDEFAULT_CACHE_STATE)) {
   PdfJs.checkIsDefault(this._isNewProfile);
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop

2021-02-05 Thread sysrqb

commit 13615017eff199eee583eb9bf13d49472105d621
Author: Alex Catarineu 
Date:   Fri Sep 4 12:34:35 2020 +0200

Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop

This loads HTTPS Everywhere as a builtin addon from a hardcoded
resource:// URI in desktop. It also ensures that the non-builtin
HTTPS Everywhere addon is always uninstalled on browser startup.

The reason of making this desktop-only is that there are some issues
when installing a builtin extension from geckoview side, making
the extension not available on first startup. So, at least for
now we handle the Fenix case separately. See #40118 for a followup
for investigating these.
---
 browser/components/BrowserGlue.jsm | 37 ++
 toolkit/components/extensions/Extension.jsm| 14 ++--
 .../mozapps/extensions/internal/XPIProvider.jsm| 13 
 3 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/browser/components/BrowserGlue.jsm 
b/browser/components/BrowserGlue.jsm
index ec38d0ca8b33..057a2121533c 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -56,6 +56,13 @@ XPCOMUtils.defineLazyServiceGetter(
   "nsIPushService"
 );
 
+XPCOMUtils.defineLazyServiceGetters(this, {
+  resProto: [
+"@mozilla.org/network/protocol;1?name=resource",
+"nsISubstitutingProtocolHandler",
+  ],
+});
+
 const PREF_PDFJS_ISDEFAULT_CACHE_STATE = "pdfjs.enabledCache.state";
 
 /**
@@ -675,6 +682,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
 "resource://gre/modules/ContextualIdentityService.jsm",
   Corroborate: "resource://gre/modules/Corroborate.jsm",
   Discovery: "resource:///modules/Discovery.jsm",
+  ExtensionData: "resource://gre/modules/Extension.jsm",
   ExtensionsUI: "resource:///modules/ExtensionsUI.jsm",
   FirefoxMonitor: "resource:///modules/FirefoxMonitor.jsm",
   FxAccounts: "resource://gre/modules/FxAccounts.jsm",
@@ -1330,6 +1338,35 @@ BrowserGlue.prototype = {
   "resource:///modules/themes/dark/"
 );
 
+// Install https-everywhere builtin addon if needed.
+(async () => {
+  const HTTPS_EVERYWHERE_ID = "https-everywhere-...@eff.org";
+  const HTTPS_EVERYWHERE_BUILTIN_URL =
+"resource://torbutton/content/extensions/https-everywhere/";
+  // This does something similar as GeckoViewWebExtension.jsm: it tries
+  // to load the manifest to retrieve the version of the builtin and
+  // compares it to the currently installed one to see whether we need
+  // to install or not. Here we delegate that to
+  // AddonManager.maybeInstallBuiltinAddon.
+  try {
+const resolvedURI = Services.io.newURI(
+  resProto.resolveURI(Services.io.newURI(HTTPS_EVERYWHERE_BUILTIN_URL))
+);
+const extensionData = new ExtensionData(resolvedURI);
+const manifest = await extensionData.loadManifest();
+
+await AddonManager.maybeInstallBuiltinAddon(
+  HTTPS_EVERYWHERE_ID,
+  manifest.version,
+  HTTPS_EVERYWHERE_BUILTIN_URL
+);
+  } catch (e) {
+const log = Log.repository.getLogger("HttpsEverywhereBuiltinLoader");
+log.addAppender(new Log.ConsoleAppender(new Log.BasicFormatter()));
+log.error("Could not install https-everywhere extension", e);
+  }
+})();
+
 if (AppConstants.MOZ_NORMANDY) {
   Normandy.init();
 }
diff --git a/toolkit/components/extensions/Extension.jsm 
b/toolkit/components/extensions/Extension.jsm
index 876e636be3db..7dbd888b1710 100644
--- a/toolkit/components/extensions/Extension.jsm
+++ b/toolkit/components/extensions/Extension.jsm
@@ -211,6 +211,7 @@ const LOGGER_ID_BASE = "addons.webextension.";
 const UUID_MAP_PREF = "extensions.webextensions.uuids";
 const LEAVE_STORAGE_PREF = "extensions.webextensions.keepStorageOnUninstall";
 const LEAVE_UUID_PREF = "extensions.webextensions.keepUuidOnUninstall";
+const PERSISTENT_EXTENSIONS = new Set(["https-everywhere-...@eff.org"]);
 
 const COMMENT_REGEXP = new RegExp(
   String.raw`
@@ -331,7 +332,10 @@ var ExtensionAddonObserver = {
   return;
 }
 
-if (!Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false)) {
+if (
+  !Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false) &&
+  !PERSISTENT_EXTENSIONS.has(addon.id)
+) {
   // Clear browser.storage.local backends.
   AsyncShutdown.profileChangeTeardown.addBlocker(
 `Clear Extension Storage ${addon.id} (File Backend)`,
@@ -384,7 +388,10 @@ var ExtensionAddonObserver = {
 
 ExtensionPermissions.removeAll(addon.id);
 
-if (!Services.prefs.getBoolPref(LEAVE_UUID_PREF, false)) {
+if (
+  !Services.prefs.getBoolPref(LEAVE_UUID_PREF, false) &&
+  !PERSISTENT_EXTENSIONS.has(addon.id)
+) {
   // Clear the entry in the UUID map
   UUIDMap.remove(addon.id);
 }
@@ -2474,7 +2481,8 @@ class Extension extends ExtensionData {
   );
 } else if

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 1650281 - P1: Widen `gCombinedSizes` once the buffers grow r=gerald

2021-02-05 Thread sysrqb

commit 270e2ce9ca977c905ea63ecc69b083756029d176
Author: Chun-Min Chang 
Date:   Tue Jul 21 23:38:57 2020 +

Bug 1650281 - P1: Widen `gCombinedSizes` once the buffers grow r=gerald

The `gCombinedSizes` need to be enlarged once the inner buffer within
`MemoryBlockCache` grows. Otherwise, when the `MemoryBlockCache` is
released, subtracting the buffer-size of the `MemoryBlockCache` from
`gCombinedSizes` lead to a underflow.

Differential Revision: https://phabricator.services.mozilla.com/D84273
---
 dom/media/MemoryBlockCache.cpp | 4 
 1 file changed, 4 insertions(+)

diff --git a/dom/media/MemoryBlockCache.cpp b/dom/media/MemoryBlockCache.cpp
index 2d31119dca0a..bf073e6769d0 100644
--- a/dom/media/MemoryBlockCache.cpp
+++ b/dom/media/MemoryBlockCache.cpp
@@ -114,6 +114,10 @@ bool MemoryBlockCache::EnsureBufferCanContain(size_t 
aContentLength) {
 // possibly bypass some future growths that would fit in this new capacity.
 mBuffer.SetLength(capacity);
   }
+  const size_t newSizes = gCombinedSizes += (extra + extraCapacity);
+  LOG("EnsureBufferCanContain(%zu) - buffer size %zu + requested %zu + bonus "
+  "%zu = %zu; combined sizes %zu",
+  aContentLength, initialLength, extra, extraCapacity, capacity, newSizes);
   mHasGrown = true;
   return true;
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Revert "Bug 21907: Fix runtime error on CentOS 6"

2021-02-05 Thread sysrqb

commit a33ea34c009548309c9d4eccfaf6908fefa7c760
Author: Georg Koppen 
Date:   Thu Sep 17 08:46:57 2020 +

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/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, );
+  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 */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 1673237 - Always allow SVGs on about: pages r=acat, tjr, emilio

2021-02-05 Thread sysrqb

commit 6cd70d7c4475897b7ae3512b55daa365c9aecd86
Author: sanketh 
Date:   Tue Nov 3 17:34:20 2020 +

Bug 1673237 - Always allow SVGs on about: pages r=acat,tjr,emilio

- Updated layout/svg/tests/test_disabled.html to ensure that this doesn't 
allow
  rendering SVGs on about:blank and about:srcdoc.

Differential Revision: https://phabricator.services.mozilla.com/D95139
---
 dom/base/nsNodeInfoManager.cpp | 18 ++---
 layout/svg/tests/file_disabled_iframe.html | 31 +-
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/dom/base/nsNodeInfoManager.cpp b/dom/base/nsNodeInfoManager.cpp
index b0534b661a23..8bc6b0ba2bd6 100644
--- a/dom/base/nsNodeInfoManager.cpp
+++ b/dom/base/nsNodeInfoManager.cpp
@@ -352,9 +352,12 @@ void nsNodeInfoManager::RemoveNodeInfo(NodeInfo* 
aNodeInfo) {
   MOZ_ASSERT(ret, "Can't find mozilla::dom::NodeInfo to remove!!!");
 }
 
-static bool IsSystemOrAddonPrincipal(nsIPrincipal* aPrincipal) {
+static bool IsSystemOrAddonOrAboutPrincipal(nsIPrincipal* aPrincipal) {
   return aPrincipal->IsSystemPrincipal() ||
- BasePrincipal::Cast(aPrincipal)->AddonPolicy();
+ BasePrincipal::Cast(aPrincipal)->AddonPolicy() ||
+ // NOTE: about:blank and about:srcdoc inherit the principal of their
+ // parent, so aPrincipal->SchemeIs("about") returns false for them.
+ aPrincipal->SchemeIs("about");
 }
 
 bool nsNodeInfoManager::InternalSVGEnabled() {
@@ -375,17 +378,18 @@ bool nsNodeInfoManager::InternalSVGEnabled() {
   }
 
   // We allow SVG (regardless of the pref) if this is a system or add-on
-  // principal, or if this load was requested for a system or add-on principal
-  // (e.g. a remote image being served as part of system or add-on UI)
+  // principal or about: page, or if this load was requested for a system or
+  // add-on principal or about: page (e.g. a remote image being served as part
+  // of system or add-on UI or about: page)
   bool conclusion =
-  (SVGEnabled || IsSystemOrAddonPrincipal(mPrincipal) ||
+  (SVGEnabled || IsSystemOrAddonOrAboutPrincipal(mPrincipal) ||
(loadInfo &&
 (loadInfo->GetExternalContentPolicyType() ==
  nsIContentPolicy::TYPE_IMAGE ||
  loadInfo->GetExternalContentPolicyType() ==
  nsIContentPolicy::TYPE_OTHER) &&
-(IsSystemOrAddonPrincipal(loadInfo->GetLoadingPrincipal()) ||
- IsSystemOrAddonPrincipal(loadInfo->TriggeringPrincipal();
+(IsSystemOrAddonOrAboutPrincipal(loadInfo->GetLoadingPrincipal()) ||
+ IsSystemOrAddonOrAboutPrincipal(loadInfo->TriggeringPrincipal();
   mSVGEnabled = Some(conclusion);
   return conclusion;
 }
diff --git a/layout/svg/tests/file_disabled_iframe.html 
b/layout/svg/tests/file_disabled_iframe.html
index 6feae3024730..55eda75fdefb 100644
--- a/layout/svg/tests/file_disabled_iframe.html
+++ b/layout/svg/tests/file_disabled_iframe.html
@@ -48,5 +48,34 @@
   t.firstChild.firstChild.textContent = "1&2<3>4\xA0";
   is(t.innerHTML,

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 21952: Implement Onion-Location

2021-02-05 Thread sysrqb

commit fe826fc7b5b74b0f1325d922619fc09f259bf321
Author: Alex Catarineu 
Date:   Thu Mar 5 22:16:39 2020 +0100

Bug 21952: Implement Onion-Location

Whenever a valid Onion-Location HTTP header (or corresponding HTML
 http-equiv attribute) is found in a document load, we either
redirect to it (if the user opted-in via preference) or notify the
presence of an onionsite alternative with a badge in the urlbar.
---
 browser/base/content/browser.js|  12 ++
 browser/base/content/browser.xhtml |   3 +
 browser/components/BrowserGlue.jsm |   9 ++
 .../onionservices/OnionLocationChild.jsm   |  43 ++
 .../onionservices/OnionLocationParent.jsm  | 161 +
 .../content/onionlocation-notification-icons.css   |   5 +
 .../onionservices/content/onionlocation-urlbar.css |  27 
 .../content/onionlocation-urlbar.inc.xhtml |  10 ++
 .../onionservices/content/onionlocation.svg|   3 +
 .../content/onionlocationPreferences.inc.xhtml |  11 ++
 .../content/onionlocationPreferences.js|  31 
 browser/components/onionservices/jar.mn|   2 +
 browser/components/onionservices/moz.build |   2 +
 browser/components/preferences/privacy.inc.xhtml   |   2 +
 browser/components/preferences/privacy.js  |  17 +++
 browser/themes/shared/notification-icons.inc.css   |   2 +
 browser/themes/shared/urlbar-searchbar.inc.css |   2 +
 dom/base/Document.cpp  |  34 -
 dom/base/Document.h|   2 +
 dom/webidl/Document.webidl |   9 ++
 modules/libpref/init/StaticPrefList.yaml   |   5 +
 xpcom/ds/StaticAtoms.py|   1 +
 22 files changed, 392 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index bd5f10cb6f64..04f8752b93f4 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -44,6 +44,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   NetUtil: "resource://gre/modules/NetUtil.jsm",
   NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
   OpenInTabsUtils: "resource:///modules/OpenInTabsUtils.jsm",
+  OnionLocationParent: "resource:///modules/OnionLocationParent.jsm",
   PageActions: "resource:///modules/PageActions.jsm",
   PageThumbs: "resource://gre/modules/PageThumbs.jsm",
   PanelMultiView: "resource:///modules/PanelMultiView.jsm",
@@ -5422,6 +5423,7 @@ var XULBrowserWindow = {
 Services.obs.notifyObservers(null, "touchbar-location-change", location);
 UpdateBackForwardCommands(gBrowser.webNavigation);
 ReaderParent.updateReaderButton(gBrowser.selectedBrowser);
+OnionLocationParent.updateOnionLocationBadge(gBrowser.selectedBrowser);
 
 if (!gMultiProcessBrowser) {
   // Bug 1108553 - Cannot rotate images with e10s
@@ -5964,6 +5966,16 @@ const AccessibilityRefreshBlocker = {
 
 var TabsProgressListener = {
   onStateChange(aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) {
+// Clear OnionLocation UI
+if (
+  aStateFlags & Ci.nsIWebProgressListener.STATE_START &&
+  aStateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK &&
+  aRequest &&
+  aWebProgress.isTopLevel
+) {
+  OnionLocationParent.onStateChange(aBrowser);
+}
+
 // Collect telemetry data about tab load times.
 if (
   aWebProgress.isTopLevel &&
diff --git a/browser/base/content/browser.xhtml 
b/browser/base/content/browser.xhtml
index 4cab5fad6475..c2caecc1a416 100644
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -1077,6 +1077,9 @@
onclick="FullZoom.reset();"
tooltip="dynamic-shortcut-tooltip"
hidden="true"/>
+
+#include ../../components/onionservices/content/onionlocation-urlbar.inc.xhtml
+
 
  {},
+};
+
+const options = {
+  autofocus: true,
+  persistent: true,
+  removeOnDismissal: false,
+  eventCallback(aTopic) {
+if (aTopic === "removed") {
+  delete browser._onionLocationPrompt;
+  delete browser.onionpopupnotificationanchor;
+}
+  },
+  learnMoreURL: NOTIFICATION_LEARN_MORE_URL,
+  displayURI: {
+hostPort: NOTIFICATION_TITLE, // This is hacky, but allows us to have 
a title without extra markup/css.
+  },
+  hideClose: true,
+  popupIconClass: "onionlocation-notification-icon",
+};
+
+// A hacky way of setting the popup anchor outside the usual url bar icon 
box
+// onionlocationpopupnotificationanchor comes from 
`${ANCHOR_ID}popupnotificationanchor`
+// From 
https://searchfox.org/mozilla-esr68/rev/080f9ed47742644d2ff84f7aa0b10aea5c44301a/browser/components/newtab/lib/CFRPageActions.jsm#488
+browser.onionlocationpopupnotificationanchor = win.document.getElementById(

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.

2021-02-05 Thread sysrqb

commit 89d5347739427120512decbb3e930d0d389718a0
Author: Kathy Brade 
Date:   Tue Jul 14 11:15:07 2020 -0400

Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.

Hide elements on about:logins that mention sync, "Firefox LockWise", and
Mozilla's LockWise mobile apps.

Disable the "Create New Login" button when security.nocertdb is true.
---
 browser/components/aboutlogins/AboutLoginsParent.jsm   |  2 ++
 browser/components/aboutlogins/content/aboutLogins.css |  8 +++-
 browser/components/aboutlogins/content/aboutLogins.js  |  6 ++
 .../aboutlogins/content/components/fxaccounts-button.css   |  5 +
 .../components/aboutlogins/content/components/menu-button.css  | 10 ++
 5 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm 
b/browser/components/aboutlogins/AboutLoginsParent.jsm
index 015ce5f29332..d06d6d0ec6c7 100644
--- a/browser/components/aboutlogins/AboutLoginsParent.jsm
+++ b/browser/components/aboutlogins/AboutLoginsParent.jsm
@@ -62,6 +62,7 @@ const PASSWORD_SYNC_NOTIFICATION_ID = "enable-password-sync";
 const HIDE_MOBILE_FOOTER_PREF = "signon.management.page.hideMobileFooter";
 const SHOW_PASSWORD_SYNC_NOTIFICATION_PREF =
   "signon.management.page.showPasswordSyncNotification";
+const NOCERTDB_PREF = "security.nocertdb";
 
 // about:logins will always use the privileged content process,
 // even if it is disabled for other consumers such as about:newtab.
@@ -431,6 +432,7 @@ class AboutLoginsParent extends JSWindowActorParent {
 importVisible:
   Services.policies.isAllowed("profileImport") &&
   AppConstants.platform != "linux",
+canCreateLogins: !Services.prefs.getBoolPref(NOCERTDB_PREF, false),
   });
 
   await AboutLogins._sendAllLoginRelatedObjects(
diff --git a/browser/components/aboutlogins/content/aboutLogins.css 
b/browser/components/aboutlogins/content/aboutLogins.css
index 7ed29bda8297..dca63da2e649 100644
--- a/browser/components/aboutlogins/content/aboutLogins.css
+++ b/browser/components/aboutlogins/content/aboutLogins.css
@@ -69,6 +69,11 @@ login-item {
   grid-area: login;
 }
 
+/* Do not promote Mozilla Sync in Tor Browser. */
+login-intro {
+  display: none !important;
+}
+
 #branding-logo {
   flex-basis: var(--sidebar-width);
   flex-shrink: 0;
@@ -83,7 +88,8 @@ login-item {
   }
 }
 
-:root:not(.official-branding) #branding-logo {
+/* Hide "Firefox LockWise" branding in Tor Browser. */
+#branding-logo {
   visibility: hidden;
 }
 
diff --git a/browser/components/aboutlogins/content/aboutLogins.js 
b/browser/components/aboutlogins/content/aboutLogins.js
index da7d9016a2eb..361b2b0d02bf 100644
--- a/browser/components/aboutlogins/content/aboutLogins.js
+++ b/browser/components/aboutlogins/content/aboutLogins.js
@@ -19,6 +19,9 @@ const gElements = {
   get loginFooter() {
 return this.loginItem.shadowRoot.querySelector("login-footer");
   },
+  get createNewLoginButton() {
+return this.loginList.shadowRoot.querySelector(".create-login-button");
+  },
 };
 
 let numberOfLogins = 0;
@@ -100,6 +103,9 @@ window.addEventListener("AboutLoginsChromeToContent", event 
=> {
   gElements.loginList.setSortDirection(event.detail.value.selectedSort);
   document.documentElement.classList.add("initialized");
   gElements.loginList.classList.add("initialized");
+  if (!event.detail.value.canCreateLogins) {
+gElements.createNewLoginButton.disabled = true;
+  }
   break;
 }
 case "ShowLoginItemError": {
diff --git 
a/browser/components/aboutlogins/content/components/fxaccounts-button.css 
b/browser/components/aboutlogins/content/components/fxaccounts-button.css
index aefda548c84d..a02707980158 100644
--- a/browser/components/aboutlogins/content/components/fxaccounts-button.css
+++ b/browser/components/aboutlogins/content/components/fxaccounts-button.css
@@ -8,6 +8,11 @@
   align-items: center;
 }
 
+/* Do not promote Mozilla Sync in Tor Browser. */
+.logged-out-view {
+  display: none !important;
+}
+
 .fxaccounts-extra-text {
   /* Only show at most 3 lines of text to limit the
  text from overflowing the header. */
diff --git a/browser/components/aboutlogins/content/components/menu-button.css 
b/browser/components/aboutlogins/content/components/menu-button.css
index 3c93d409b2c7..2d7380b2ea37 100644
--- a/browser/components/aboutlogins/content/components/menu-button.css
+++ b/browser/components/aboutlogins/content/components/menu-button.css
@@ -85,3 +85,13 @@
 .menuitem-mobile-android {
   background-image: url("chrome://browser/skin/logo-android.svg");
 }
+
+/*
+ * Do not promote LockWise mobile apps in Tor Browser: hide the menu items
+ * and the separator line that precedes them.
+ */
+.menuitem-mobile-android,
+.menuitem-mobile-ios,
+button[data-event-name="AboutLoginsGetHelp"] + hr {
+  display: none !important;
+}

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 40025: Remove Mozilla add-on install permissions

2021-02-05 Thread sysrqb

commit 1716e41e783df69b8f687d0ad63e58aa7be9838d
Author: Alex Catarineu 
Date:   Mon Jul 27 18:12:55 2020 +0200

Bug 40025: Remove Mozilla add-on install permissions
---
 browser/app/permissions | 6 --
 1 file changed, 6 deletions(-)

diff --git a/browser/app/permissions b/browser/app/permissions
index da6b6728043d..5c4c302f5ba5 100644
--- a/browser/app/permissions
+++ b/browser/app/permissions
@@ -11,12 +11,6 @@
 origin uitour  1   https://3g2upl4pq6kufc4m.onion
 origin uitour  1   about:tor
 
-# XPInstall
-origin install 1   https://addons.mozilla.org
-
 # Remote troubleshooting
 origin remote-troubleshooting  1   https://support.mozilla.org
 
-# addon install
-origin install 1   https://private-network.firefox.com
-origin install 1   https://fpn.firefox.com



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 40002: Remove about:pioneer

2021-02-05 Thread sysrqb

commit cc5b0ae5c2bd4a08b83b78b73acc4aca50efe000
Author: Kathy Brade 
Date:   Fri Aug 14 09:06:33 2020 -0400

Bug 40002: Remove about:pioneer

Firefox Pioneer is an opt-in program in which people volunteer to
participate in studies that collect detailed, sensitive data about
how they use their browser.
---
 browser/components/about/AboutRedirector.cpp | 2 --
 browser/components/about/components.conf | 1 -
 2 files changed, 3 deletions(-)

diff --git a/browser/components/about/AboutRedirector.cpp 
b/browser/components/about/AboutRedirector.cpp
index 544e21782729..e7c377d655e7 100644
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -114,8 +114,6 @@ static const RedirEntry kRedirMap[] = {
  nsIAboutModule::URI_MUST_LOAD_IN_CHILD |
  nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
  nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},
-{"pioneer", "chrome://browser/content/pioneer.html",
- nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},
 #ifdef TOR_BROWSER_UPDATE
 {"tbupdate", "chrome://browser/content/abouttbupdate/aboutTBUpdate.xhtml",
  nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
diff --git a/browser/components/about/components.conf 
b/browser/components/about/components.conf
index d78de142e2e4..8e04467c05da 100644
--- a/browser/components/about/components.conf
+++ b/browser/components/about/components.conf
@@ -14,7 +14,6 @@ pages = [
 'logins',
 'newinstall',
 'newtab',
-'pioneer',
 'pocket-saved',
 'pocket-signup',
 'policies',



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 32418: Allow updates to be disabled via an enterprise policy.

2021-02-05 Thread sysrqb

commit 94913d00b290b73349ae2d5e4d3eca4148eb9505
Author: Kathy Brade 
Date:   Thu Apr 16 17:07:09 2020 -0400

Bug 32418: Allow updates to be disabled via an enterprise policy.

Restrict the Enterprise Policies mechanism to only consult a
policies.json file (avoiding the Windows Registry and macOS's
file system attributes).

Add a few disabledByPolicy() checks to the update service to
avoid extraneous (and potentially confusing) log messages when
updates are disabled by policy.

Sample content for distribution/policies.json:
{
  "policies": {
"DisableAppUpdate": true
  }
}

On Linux, avoid reading policies from /etc/firefox/policies/policies.json
---
 .../components/enterprisepolicies/EnterprisePolicies.js  | 12 
 toolkit/components/enterprisepolicies/moz.build  |  4 +++-
 toolkit/mozapps/update/UpdateService.jsm | 16 
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/toolkit/components/enterprisepolicies/EnterprisePolicies.js 
b/toolkit/components/enterprisepolicies/EnterprisePolicies.js
index aa8a2e54024e..8f9cd6f5039d 100644
--- a/toolkit/components/enterprisepolicies/EnterprisePolicies.js
+++ b/toolkit/components/enterprisepolicies/EnterprisePolicies.js
@@ -2,6 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+// To ensure that policies intended for Firefox or another browser will not
+// be used, Tor Browser only looks for policies in ${InstallDir}/distribution
+#define AVOID_SYSTEM_POLICIES MOZ_PROXY_BYPASS_PROTECTION
+
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
@@ -11,9 +15,11 @@ const { AppConstants } = ChromeUtils.import(
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
+#ifndef AVOID_SYSTEM_POLICIES
   WindowsGPOParser: "resource://gre/modules/policies/WindowsGPOParser.jsm",
   macOSPoliciesParser:
 "resource://gre/modules/policies/macOSPoliciesParser.jsm",
+#endif
   Policies: "resource:///modules/policies/Policies.jsm",
   JsonSchemaValidator:
 "resource://gre/modules/components-utils/JsonSchemaValidator.jsm",
@@ -114,6 +120,7 @@ EnterprisePoliciesManager.prototype = {
 
   _chooseProvider() {
 let provider = null;
+#ifndef AVOID_SYSTEM_POLICIES
 if (AppConstants.platform == "win") {
   provider = new WindowsGPOPoliciesProvider();
 } else if (AppConstants.platform == "macosx") {
@@ -122,6 +129,7 @@ EnterprisePoliciesManager.prototype = {
 if (provider && provider.hasPolicies) {
   return provider;
 }
+#endif
 
 provider = new JSONPoliciesProvider();
 if (provider.hasPolicies) {
@@ -473,6 +481,7 @@ class JSONPoliciesProvider {
   _getConfigurationFile() {
 let configFile = null;
 
+#ifndef AVOID_SYSTEM_POLICIES
 if (AppConstants.platform == "linux") {
   let systemConfigFile = Cc["@mozilla.org/file/local;1"].createInstance(
 Ci.nsIFile
@@ -485,6 +494,7 @@ class JSONPoliciesProvider {
 return systemConfigFile;
   }
 }
+#endif
 
 try {
   let perUserPath = Services.prefs.getBoolPref(PREF_PER_USER_DIR, false);
@@ -566,6 +576,7 @@ class JSONPoliciesProvider {
   }
 }
 
+#ifndef AVOID_SYSTEM_POLICIES
 class WindowsGPOPoliciesProvider {
   constructor() {
 this._policies = null;
@@ -631,6 +642,7 @@ class macOSPoliciesProvider {
 return this._failed;
   }
 }
+#endif
 
 var components = [EnterprisePoliciesManager];
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
diff --git a/toolkit/components/enterprisepolicies/moz.build 
b/toolkit/components/enterprisepolicies/moz.build
index 8f7d7d8cfed7..7528f569bb3e 100644
--- a/toolkit/components/enterprisepolicies/moz.build
+++ b/toolkit/components/enterprisepolicies/moz.build
@@ -19,10 +19,12 @@ TEST_DIRS += [
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != "android":
 EXTRA_COMPONENTS += [
-'EnterprisePolicies.js',
 'EnterprisePolicies.manifest',
 'EnterprisePoliciesContent.js',
 ]
+EXTRA_PP_COMPONENTS += [
+'EnterprisePolicies.js',
+]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
 EXTRA_JS_MODULES.policies += [
diff --git a/toolkit/mozapps/update/UpdateService.jsm 
b/toolkit/mozapps/update/UpdateService.jsm
index 2c565cecadd7..1fb397373151 100644
--- a/toolkit/mozapps/update/UpdateService.jsm
+++ b/toolkit/mozapps/update/UpdateService.jsm
@@ -3268,6 +3268,14 @@ UpdateService.prototype = {
* See nsIUpdateService.idl
*/
   get canApplyUpdates() {
+if (this.disabledByPolicy) {
+  LOG(
+"UpdateService.canApplyUpdates - unable to apply updates, " +
+  "the option has been disabled by the administrator."
+  );
+  return false;
+}
+
 return getCanApplyUpdates() && hasUpdateMutex();
   },
 
@@ -3275,6 +3283,14 @@ UpdateService.prototype = {
* See nsIUpdateService.idl
*/

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 25741 - TBA: Disable GeckoNetworkManager

2021-02-05 Thread sysrqb

commit 5ddaf16e7bbb41de95c94e5d9a3493ff44cf05ff
Author: Matthew Finkel 
Date:   Thu Apr 26 22:22:51 2018 +

Bug 25741 - TBA: Disable GeckoNetworkManager

The browser should not need information related to the network
interface or network state, tor should take care of that.
---
 .../src/main/java/org/mozilla/geckoview/GeckoRuntime.java | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java
 
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java
index ed86dcc5c299..f5587dd7e59c 100644
--- 
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java
+++ 
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java
@@ -121,7 +121,9 @@ public final class GeckoRuntime implements Parcelable {
 mPaused = false;
 // Monitor network status and send change notifications to Gecko
 // while active.
-
GeckoNetworkManager.getInstance().start(GeckoAppShell.getApplicationContext());
+if (BuildConfig.TOR_BROWSER_VERSION == "") {
+
GeckoNetworkManager.getInstance().start(GeckoAppShell.getApplicationContext());
+}
 }
 
 @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
@@ -129,7 +131,9 @@ public final class GeckoRuntime implements Parcelable {
 Log.d(LOGTAG, "Lifecycle: onPause");
 mPaused = true;
 // Stop monitoring network status while inactive.
-GeckoNetworkManager.getInstance().stop();
+if (BuildConfig.TOR_BROWSER_VERSION == "") {
+GeckoNetworkManager.getInstance().stop();
+}
 GeckoThread.onPause();
 }
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 28005: Implement .onion alias urlbar rewrites

2021-02-05 Thread sysrqb

commit cb132169a1ab18844c5c6b7c9dc9c6d59e318489
Author: Alex Catarineu 
Date:   Thu Feb 13 13:24:33 2020 +0100

Bug 28005: Implement .onion alias urlbar rewrites

A custom HTTPS Everywhere update channel is installed,
which provides rules for locally redirecting some memorable
.tor.onion URLs to non-memorable .onion URLs.

When these redirects occur, we also rewrite the URL in the urlbar
to display the human-memorable hostname instead of the actual
.onion.

Bug 34196: Update site info URL with the onion name
---
 browser/actors/ClickHandlerChild.jsm   |  20 ++
 browser/actors/ClickHandlerParent.jsm  |   1 +
 browser/actors/ContextMenuChild.jsm|   4 +
 browser/base/content/browser-places.js |  12 +-
 browser/base/content/browser-siteIdentity.js   |  12 +-
 browser/base/content/browser.js|  43 -
 browser/base/content/nsContextMenu.js  |  18 ++
 browser/base/content/pageinfo/pageInfo.js  |   2 +-
 browser/base/content/pageinfo/pageInfo.xhtml   |  10 +
 browser/base/content/pageinfo/security.js  |  17 +-
 browser/base/content/tabbrowser.js |   7 +
 browser/base/content/utilityOverlay.js |  12 ++
 browser/components/BrowserGlue.jsm |   8 +
 .../onionservices/ExtensionMessaging.jsm   |  86 +
 .../onionservices/HttpsEverywhereControl.jsm   | 119 
 .../components/onionservices/OnionAliasStore.jsm   | 201 +
 browser/components/onionservices/moz.build |   6 +
 browser/components/urlbar/UrlbarInput.jsm  |  13 +-
 docshell/base/nsDocShell.cpp   |  52 ++
 docshell/base/nsDocShell.h |   6 +
 docshell/base/nsDocShellLoadState.cpp  |   4 +
 docshell/base/nsIDocShell.idl  |   5 +
 docshell/base/nsIWebNavigation.idl |   5 +
 docshell/shistory/SessionHistoryEntry.cpp  |  14 ++
 docshell/shistory/SessionHistoryEntry.h|   1 +
 docshell/shistory/nsISHEntry.idl   |   5 +
 docshell/shistory/nsSHEntry.cpp|  22 ++-
 docshell/shistory/nsSHEntry.h  |   1 +
 dom/interfaces/base/nsIBrowser.idl |   3 +-
 dom/ipc/BrowserChild.cpp   |   2 +
 dom/ipc/BrowserParent.cpp  |   3 +-
 dom/ipc/PBrowser.ipdl  |   1 +
 modules/libpref/init/StaticPrefList.yaml   |   6 +
 netwerk/dns/effective_tld_names.dat|   2 +
 netwerk/ipc/DocumentLoadListener.cpp   |  10 +
 toolkit/content/widgets/browser-custom-element.js  |  13 +-
 toolkit/modules/sessionstore/SessionHistory.jsm|   5 +
 37 files changed, 729 insertions(+), 22 deletions(-)

diff --git a/browser/actors/ClickHandlerChild.jsm 
b/browser/actors/ClickHandlerChild.jsm
index 7dd060e83061..206a8fc97a4d 100644
--- a/browser/actors/ClickHandlerChild.jsm
+++ b/browser/actors/ClickHandlerChild.jsm
@@ -138,6 +138,26 @@ class ClickHandlerChild extends JSWindowActorChild {
   json.originStoragePrincipal = ownerDoc.effectiveStoragePrincipal;
   json.triggeringPrincipal = ownerDoc.nodePrincipal;
 
+  // Check if the link needs to be opened with .tor.onion urlbar rewrites
+  // allowed. Only when the owner doc has onionUrlbarRewritesAllowed = true
+  // and the same origin we should allow this.
+  json.onionUrlbarRewritesAllowed = false;
+  if (this.docShell.onionUrlbarRewritesAllowed) {
+const sm = Services.scriptSecurityManager;
+try {
+  let targetURI = Services.io.newURI(href);
+  let isPrivateWin =
+ownerDoc.nodePrincipal.originAttributes.privateBrowsingId > 0;
+  sm.checkSameOriginURI(
+docshell.currentDocumentChannel.URI,
+targetURI,
+false,
+isPrivateWin
+  );
+  json.onionUrlbarRewritesAllowed = true;
+} catch (e) {}
+  }
+
   // If a link element is clicked with middle button, user wants to open
   // the link somewhere rather than pasting clipboard content.  Therefore,
   // when it's clicked with middle button, we should prevent multiple
diff --git a/browser/actors/ClickHandlerParent.jsm 
b/browser/actors/ClickHandlerParent.jsm
index 454c0fe69b27..42ab7a0f6e2a 100644
--- a/browser/actors/ClickHandlerParent.jsm
+++ b/browser/actors/ClickHandlerParent.jsm
@@ -102,6 +102,7 @@ class ClickHandlerParent extends JSWindowActorParent {
   charset: browser.characterSet,
   referrerInfo: E10SUtils.deserializeReferrerInfo(data.referrerInfo),
   allowMixedContent: data.allowMixedContent,
+  onionUrlbarRewritesAllowed: data.onionUrlbarRewritesAllowed,
   isContentWindowPrivate: data.isContentWindowPrivate,
   originPrincipal: data.originPrincipal,

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.

2021-02-05 Thread sysrqb

commit 148e5986a168229167d268822ed08b0527b1ca4b
Author: Amogh Pradeep 
Date:   Fri Jun 12 02:07:45 2015 -0400

Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.

See Bug 1357997 for partial uplift.

Also:
Bug 28051 - Use our Orbot for proxying our connections

Bug 31144 - ESR68 Network Code Review
---
 .../main/java/org/mozilla/gecko/GeckoAppShell.java | 68 +++---
 .../java/org/mozilla/gecko/util/BitmapUtils.java   |  7 ---
 .../java/org/mozilla/gecko/util/ProxySelector.java | 25 +++-
 3 files changed, 59 insertions(+), 41 deletions(-)

diff --git 
a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java 
b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
index 995b23316c32..b9ca73bee2eb 100644
--- 
a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
+++ 
b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
@@ -1764,39 +1764,41 @@ public class GeckoAppShell {
 
 @WrapForJNI
 private static URLConnection getConnection(final String url) {
-try {
-String spec;
-if (url.startsWith("android://")) {
-spec = url.substring(10);
-} else {
-spec = url.substring(8);
-}
-
-// Check if we are loading a package icon.
-try {
-if (spec.startsWith("icon/")) {
-String[] splits = spec.split("/");
-if (splits.length != 2) {
-return null;
-}
-final String pkg = splits[1];
-final PackageManager pm = 
getApplicationContext().getPackageManager();
-final Drawable d = pm.getApplicationIcon(pkg);
-final Bitmap bitmap = BitmapUtils.getBitmapFromDrawable(d);
-return new BitmapConnection(bitmap);
-}
-} catch (Exception ex) {
-Log.e(LOGTAG, "error", ex);
-}
-
-// if the colon got stripped, put it back
-int colon = spec.indexOf(':');
-if (colon == -1 || colon > spec.indexOf('/')) {
-spec = spec.replaceFirst("/", ":/");
-}
-} catch (Exception ex) {
-return null;
-}
+// Bug 31144 - Prevent potential proxy-bypass
+
+//try {
+//String spec;
+//if (url.startsWith("android://")) {
+//spec = url.substring(10);
+//} else {
+//spec = url.substring(8);
+//}
+
+//// Check if we are loading a package icon.
+//try {
+//if (spec.startsWith("icon/")) {
+//String[] splits = spec.split("/");
+//if (splits.length != 2) {
+//return null;
+//}
+//final String pkg = splits[1];
+//final PackageManager pm = 
getApplicationContext().getPackageManager();
+//final Drawable d = pm.getApplicationIcon(pkg);
+//final Bitmap bitmap = 
BitmapUtils.getBitmapFromDrawable(d);
+//return new BitmapConnection(bitmap);
+//}
+//} catch (Exception ex) {
+//Log.e(LOGTAG, "error", ex);
+//}
+
+//// if the colon got stripped, put it back
+//int colon = spec.indexOf(':');
+//if (colon == -1 || colon > spec.indexOf('/')) {
+//spec = spec.replaceFirst("/", ":/");
+//}
+//} catch (Exception ex) {
+//return null;
+//}
 return null;
 }
 
diff --git 
a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java
 
b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java
index 73a69a3abd66..f795dacffb47 100644
--- 
a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java
+++ 
b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java
@@ -101,13 +101,6 @@ public final class BitmapUtils {
 public static Bitmap decodeUrl(final URL url) {
 InputStream stream = null;
 
-try {
-stream = url.openStream();
-} catch (IOException e) {
-Log.w(LOGTAG, "decodeUrl: IOException downloading " + url);
-return null;
-}
-
 if (stream == null) {
 Log.w(LOGTAG, "decodeUrl: stream not found downloading " + url);
 return null;
diff --git 
a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
 
b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
index 3940d3c84249..9515975f680a 100644
---

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 32220: Improve the letterboxing experience

2021-02-05 Thread sysrqb

commit b909879efae1c687dfb2d75ba30b7466b0150f70
Author: Richard Pospesel 
Date:   Mon Oct 28 17:42:17 2019 -0700

Bug 32220: Improve the letterboxing experience

CSS and JS changes to alter the UX surrounding letterboxing. The
browser element containing page content is now anchored to the bottom
of the toolbar, and the remaining letterbox margin is the same color
as the firefox chrome. The letterbox margin and border are tied to
the currently selected theme.

Also adds a 'needsLetterbox' property to tabbrowser.xml to fix a race
condition present when using the 'isEmpty' property. Using 'isEmpty'
as a proxy for 'needsLetterbox' resulted in over-zealous/unnecessary
letterboxing of about:blank tabs.
---
 browser/base/content/browser.css   |  8 ++
 browser/base/content/tabbrowser-tab.js |  9 +++
 browser/themes/shared/tabs.inc.css |  6 ++
 .../components/resistfingerprinting/RFPHelper.jsm  | 94 +++---
 4 files changed, 105 insertions(+), 12 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 808c03e88223..a0b1bf4a8951 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -85,6 +85,14 @@ body {
   display: none;
 }
 
+
+.browserStack > browser.letterboxing {
+  border-color: var(--chrome-content-separator-color);
+  border-style: solid;
+  border-width : 1px;
+  border-top: none;
+}
+
 %ifdef MENUBAR_CAN_AUTOHIDE
 #toolbar-menubar[autohide="true"] {
   overflow: hidden;
diff --git a/browser/base/content/tabbrowser-tab.js 
b/browser/base/content/tabbrowser-tab.js
index 183eff1bab86..7f376ab1d122 100644
--- a/browser/base/content/tabbrowser-tab.js
+++ b/browser/base/content/tabbrowser-tab.js
@@ -225,6 +225,15 @@
   return true;
 }
 
+get needsLetterbox() {
+  let browser = this.linkedBrowser;
+  if (isBlankPageURL(browser.currentURI.spec)) {
+return false;
+  }
+
+  return true;
+}
+
 get lastAccessed() {
   return this._lastAccessed == Infinity ? Date.now() : this._lastAccessed;
 }
diff --git a/browser/themes/shared/tabs.inc.css 
b/browser/themes/shared/tabs.inc.css
index b47842af766c..019da6ecf76f 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -33,6 +33,12 @@
   background-color: #f9f9fa;
 }
 
+/* extend down the toolbar's colors when letterboxing is enabled*/
+#tabbrowser-tabpanels.letterboxing {
+  background-color: var(--toolbar-bgcolor);
+  background-image: var(--toolbar-bgimage);
+}
+
 :root[privatebrowsingmode=temporary] #tabbrowser-tabpanels {
   /* Value for --in-content-page-background in aboutPrivateBrowsing.css */
   background-color: #25003e;
diff --git a/toolkit/components/resistfingerprinting/RFPHelper.jsm 
b/toolkit/components/resistfingerprinting/RFPHelper.jsm
index 49010d1c8cb1..b906a067fd63 100644
--- a/toolkit/components/resistfingerprinting/RFPHelper.jsm
+++ b/toolkit/components/resistfingerprinting/RFPHelper.jsm
@@ -40,6 +40,7 @@ class _RFPHelper {
   // 

   constructor() {
 this._initialized = false;
+this._borderDimensions = null;
   }
 
   init() {
@@ -361,6 +362,24 @@ class _RFPHelper {
 });
   }
 
+  getBorderDimensions(aBrowser) {
+if (this._borderDimensions) {
+  return this._borderDimensions;
+}
+
+const win = aBrowser.ownerGlobal;
+const browserStyle = win.getComputedStyle(aBrowser);
+
+this._borderDimensions = {
+  top : parseInt(browserStyle.borderTopWidth),
+  right: parseInt(browserStyle.borderRightWidth),
+  bottom : parseInt(browserStyle.borderBottomWidth),
+  left : parseInt(browserStyle.borderLeftWidth),
+};
+
+return this._borderDimensions;
+  }
+
   _addOrClearContentMargin(aBrowser) {
 let tab = aBrowser.getTabBrowser().getTabForBrowser(aBrowser);
 
@@ -369,9 +388,13 @@ class _RFPHelper {
   return;
 }
 
+// we add the letterboxing class even if the content does not need 
letterboxing
+// in which case margins are set such that the borders are hidden
+aBrowser.classList.add("letterboxing");
+
 // We should apply no margin around an empty tab or a tab with system
 // principal.
-if (tab.isEmpty || aBrowser.contentPrincipal.isSystemPrincipal) {
+if (!tab.needsLetterbox || aBrowser.contentPrincipal.isSystemPrincipal) {
   this._clearContentViewMargin(aBrowser);
 } else {
   this._roundContentView(aBrowser);
@@ -539,10 +562,29 @@ class _RFPHelper {
 // Calculating the margins around the browser element in order to round the
 // content viewport. We will use a 200x100 stepping if the dimension set
 // is not given.
-let margins = calcMargins(containerWidth, containerHeight);
+
+const borderDimensions = this.getBorderDimensions(aBrowser);
+const marginDims =

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 27604: Fix addon issues when moving TB directory

2021-02-05 Thread sysrqb

commit 521891b840313ef44eaf9442472ccefaabc17b78
Author: Alex Catarineu 
Date:   Wed Oct 30 10:44:48 2019 +0100

Bug 27604: Fix addon issues when moving TB directory
---
 toolkit/mozapps/extensions/internal/XPIProvider.jsm | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm 
b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index bf31932b59f1..5e467fb4f14c 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -485,7 +485,7 @@ class XPIState {
 
 // Builds prior to be 1512436 did not include the rootURI property.
 // If we're updating from such a build, add that property now.
-if (!("rootURI" in this) && this.file) {
+if (this.file) {
   this.rootURI = getURIForResourceInFile(this.file, "").spec;
 }
 
@@ -498,7 +498,10 @@ class XPIState {
   saved.currentModifiedTime != this.lastModifiedTime
 ) {
   this.lastModifiedTime = saved.currentModifiedTime;
-} else if (saved.currentModifiedTime === null) {
+} else if (
+  saved.currentModifiedTime === null &&
+  (!this.file || !this.file.exists())
+) {
   this.missing = true;
 }
   }
@@ -1439,6 +1442,7 @@ var XPIStates = {
 
   if (oldState[loc.name]) {
 loc.restore(oldState[loc.name]);
+changed = changed || loc.path != oldState[loc.name].path;
   }
   changed = changed || loc.changed;
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 30541: Disable WebGL readPixel() for web content

2021-02-05 Thread sysrqb

commit 9aeddd0bb23f774bafc2689478f63afdeb4f98b6
Author: Georg Koppen 
Date:   Wed May 29 12:29:19 2019 +

Bug 30541: Disable WebGL readPixel() for web content
---
 dom/canvas/ClientWebGLContext.cpp | 8 
 1 file changed, 8 insertions(+)

diff --git a/dom/canvas/ClientWebGLContext.cpp 
b/dom/canvas/ClientWebGLContext.cpp
index 01f68aa795b7..8261829e2250 100644
--- a/dom/canvas/ClientWebGLContext.cpp
+++ b/dom/canvas/ClientWebGLContext.cpp
@@ -4115,6 +4115,14 @@ bool ClientWebGLContext::ReadPixels_SharedPrecheck(
 return false;
   }
 
+  // Security check passed, but don't let content readPixel calls through for
+  // now, if Resist Fingerprinting Mode is enabled.
+  if (nsContentUtils::ResistFingerprinting(aCallerType)) {
+JsWarning("readPixels: Not allowed in Resist Fingerprinting Mode");
+out_error.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+return false;
+  }
+
   return true;
 }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 27511: Add new identity button to toolbar

2021-02-05 Thread sysrqb

commit 4d961f3acaa4ecb1cd48cb20ac2a5997ca6d8249
Author: Alex Catarineu 
Date:   Fri Oct 4 19:08:33 2019 +0200

Bug 27511: Add new identity button to toolbar

Also added 'New circuit for this site' button to CustomizableUI, but
not visible by default.
---
 browser/base/content/browser.xhtml  | 10 ++
 .../components/customizableui/CustomizableUI.jsm| 21 +
 browser/themes/shared/icons/new_circuit.svg |  8 
 browser/themes/shared/icons/new_identity.svg|  9 +
 browser/themes/shared/jar.inc.mn|  3 +++
 browser/themes/shared/menupanel.inc.css |  8 
 browser/themes/shared/toolbarbutton-icons.inc.css   |  8 
 7 files changed, 67 insertions(+)

diff --git a/browser/base/content/browser.xhtml 
b/browser/base/content/browser.xhtml
index 72c415b8f843..ddf5d766126b 100644
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -1295,6 +1295,16 @@
  ondragenter="newWindowButtonObserver.onDragOver(event)"
  ondragexit="newWindowButtonObserver.onDragExit(event)"/>
 
+  
+
+  
+
   
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+Icon / New Circuit@1.5x
+
+
+
+
+
diff --git a/browser/themes/shared/icons/new_identity.svg 
b/browser/themes/shared/icons/new_identity.svg
new file mode 100644
index ..91d5b35f7e80
--- /dev/null
+++ b/browser/themes/shared/icons/new_identity.svg
@@ -0,0 +1,9 @@
+
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+New Identity Icon
+
+
+
+
+
+
\ No newline at end of file
diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
index 71fea38eb829..e4a3c8d2d41c 100644
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -302,3 +302,6 @@
   skin/classic/browser/install-ssb.svg 
(../shared/install-ssb.svg)
   skin/classic/browser/critical.svg
(../shared/icons/critical.svg)
   skin/classic/browser/webRTC-indicator.css
(../shared/webRTC-indicator.css)
+
+  skin/classic/browser/new_circuit.svg 
(../shared/icons/new_circuit.svg)
+  skin/classic/browser/new_identity.svg
(../shared/icons/new_identity.svg)
diff --git a/browser/themes/shared/menupanel.inc.css 
b/browser/themes/shared/menupanel.inc.css
index c919f32a1454..eae453ec5004 100644
--- a/browser/themes/shared/menupanel.inc.css
+++ b/browser/themes/shared/menupanel.inc.css
@@ -183,3 +183,11 @@ toolbarpaletteitem[place="palette"] > 
#bookmarks-menu-button,
   -moz-context-properties: fill, fill-opacity;
   fill-opacity: 0;
 }
+
+#appMenuNewIdentity {
+  list-style-image: url("chrome://browser/skin/new_identity.svg");
+}
+
+#appMenuNewCircuit {
+  list-style-image: url("chrome://browser/skin/new_circuit.svg");
+}
diff --git a/browser/themes/shared/toolbarbutton-icons.inc.css 
b/browser/themes/shared/toolbarbutton-icons.inc.css
index 9514eb1d5338..cf02f871c9a4 100644
--- a/browser/themes/shared/toolbarbutton-icons.inc.css
+++ b/browser/themes/shared/toolbarbutton-icons.inc.css
@@ -233,6 +233,14 @@ toolbar[brighttext] {
   list-style-image: url("chrome://browser/skin/new-tab.svg");
 }
 
+#new-identity-button {
+  list-style-image: url("chrome://browser/skin/new_identity.svg");
+}
+
+#new-circuit-button {
+  list-style-image: url("chrome://browser/skin/new_circuit.svg");
+}
+
 #privatebrowsing-button {
   list-style-image: url("chrome://browser/skin/privateBrowsing.svg");
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 31607: App menu items stop working on macOS

2021-02-05 Thread sysrqb

commit 30eb4ced25347e6cecb72b881ebe557a39e02bb3
Author: Kathy Brade 
Date:   Thu Oct 3 10:53:43 2019 -0400

Bug 31607: App menu items stop working on macOS

Avoid re-creating the hidden window, since this causes the nsMenuBarX
object that is associated with the app menu to be freed (which in
turn causes all of the app menu items to stop working).

More detail: There should only be one hidden window.
XREMain::XRE_mainRun() contains an explicit call to create the
hidden window and that is the normal path by which it is created.
However, when Tor Launcher's wizard/progress window is opened during
startup, a hidden window is created earlier as a side effect of
calls to nsAppShellService::GetHiddenWindow(). Then, when
XREMain::XRE_mainRun() creates its hidden window, the original one
is freed which also causes the app menu's nsMenuBarX object which
is associated with that window to be destroyed. When that happens,
the menuGroupOwner property within each Cocoa menu items's MenuItemInfo
object is cleared. This breaks the link that is necessary for
NativeMenuItemTarget's menuItemHit method to dispatch a menu item
event.
---
 xpfe/appshell/nsAppShellService.cpp | 4 
 1 file changed, 4 insertions(+)

diff --git a/xpfe/appshell/nsAppShellService.cpp 
b/xpfe/appshell/nsAppShellService.cpp
index 719684ceb072..1600a3fea789 100644
--- a/xpfe/appshell/nsAppShellService.cpp
+++ b/xpfe/appshell/nsAppShellService.cpp
@@ -93,6 +93,10 @@ void nsAppShellService::EnsureHiddenWindow() {
 
 NS_IMETHODIMP
 nsAppShellService::CreateHiddenWindow() {
+  if (mHiddenWindow) {
+return NS_OK;
+  }
+
   if (!XRE_IsParentProcess()) {
 return NS_ERROR_NOT_IMPLEMENTED;
   }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 24796 - Comment out excess permissions from GeckoView

2021-02-05 Thread sysrqb

commit 96c6a2912ae8e2b8e1613854d79870e0f424d23f
Author: Matthew Finkel 
Date:   Wed Apr 11 17:52:59 2018 +

Bug 24796 - Comment out excess permissions from GeckoView

The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's
manifest, so we can't use the ifdef preprocessor guards around the
permissions we do not want. Commenting the permissions is the
next-best-thing.
---
 .../android/geckoview/src/main/AndroidManifest.xml   | 20 +---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/mobile/android/geckoview/src/main/AndroidManifest.xml 
b/mobile/android/geckoview/src/main/AndroidManifest.xml
index 87ad6dc28047..4c8ab2a9d996 100644
--- a/mobile/android/geckoview/src/main/AndroidManifest.xml
+++ b/mobile/android/geckoview/src/main/AndroidManifest.xml
@@ -6,20 +6,32 @@
 http://schemas.android.com/apk/res/android;
   package="org.mozilla.geckoview">
 
+
+
+
 
 
 
 
+
+
+
 
+
+
+
+
 
 
 https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 32092: Fix Tor Browser Support link in preferences

2021-02-05 Thread sysrqb

commit afe22acb47164c659ea193abc19562ff0057c552
Author: Alex Catarineu 
Date:   Tue Oct 15 22:54:10 2019 +0200

Bug 32092: Fix Tor Browser Support link in preferences
---
 browser/components/preferences/preferences.js | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/browser/components/preferences/preferences.js 
b/browser/components/preferences/preferences.js
index 089533f20ade..586e32e277cb 100644
--- a/browser/components/preferences/preferences.js
+++ b/browser/components/preferences/preferences.js
@@ -121,10 +121,7 @@ function init_all() {
 
   gotoPref().then(() => {
 let helpButton = document.getElementById("helpButton");
-let helpUrl =
-  Services.urlFormatter.formatURLPref("app.support.baseURL") +
-  "preferences";
-helpButton.setAttribute("href", helpUrl);
+helpButton.setAttribute("href", "https://support.torproject.org/tbb;);
 
 document.getElementById("addonsButton").addEventListener("click", e => {
   if (e.button >= 2) {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 31740: Remove some unnecessary RemoteSettings instances

2021-02-05 Thread sysrqb

commit 81d4dc11341532cb99929aa292d7c1ff46a09926
Author: Alex Catarineu 
Date:   Wed Oct 16 23:01:12 2019 +0200

Bug 31740: Remove some unnecessary RemoteSettings instances

More concretely, SearchService.jsm 'hijack-blocklists' and
url-classifier-skip-urls.

Avoid creating instance for 'anti-tracking-url-decoration'.

If prefs are disabling their usage, avoid creating instances for
'cert-revocations' and 'intermediates'.

Do not ship JSON dumps for collections we do not expect to need. For
the ones in the 'main' bucket, this prevents them from being synced
unnecessarily (the code in remote-settings does so for collections
in the main bucket for which a dump or local data exists). For the
collections in the other buckets, we just save some size by not
shipping their dumps.

We also clear the collections database on the v2 -> v3 migration.
---
 .../url-classifier/UrlClassifierFeatureBase.cpp|  2 +-
 netwerk/url-classifier/components.conf |  6 --
 security/manager/ssl/RemoteSecuritySettings.jsm| 22 ++
 services/settings/IDBHelpers.jsm   |  4 
 services/settings/dumps/blocklists/moz.build   |  1 -
 services/settings/dumps/main/moz.build |  5 -
 services/settings/dumps/security-state/moz.build   |  1 -
 .../components/antitracking/antitracking.manifest  |  2 +-
 toolkit/components/antitracking/components.conf|  7 ---
 toolkit/components/search/SearchService.jsm|  2 --
 10 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/netwerk/url-classifier/UrlClassifierFeatureBase.cpp 
b/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
index 9bc7fc5d6e9a..3fb3b74a4f08 100644
--- a/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
+++ b/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
@@ -76,7 +76,7 @@ void UrlClassifierFeatureBase::InitializePreferences() {
 
   nsCOMPtr skipListService =
   do_GetService("@mozilla.org/url-classifier/skip-list-service;1");
-  if (NS_WARN_IF(!skipListService)) {
+  if (!skipListService) {
 return;
   }
 
diff --git a/netwerk/url-classifier/components.conf 
b/netwerk/url-classifier/components.conf
index 7f49d94b6488..b2e667247317 100644
--- a/netwerk/url-classifier/components.conf
+++ b/netwerk/url-classifier/components.conf
@@ -13,10 +13,4 @@ Classes = [
 'constructor': 'mozilla::net::ChannelClassifierService::GetSingleton',
 'headers': ['mozilla/net/ChannelClassifierService.h'],
 },
-{
-'cid': '{b9f4fd03-9d87-4bfd-9958-85a821750ddc}',
-'contract_ids': ['@mozilla.org/url-classifier/skip-list-service;1'],
-'jsm': 'resource://gre/modules/UrlClassifierSkipListService.jsm',
-'constructor': 'UrlClassifierSkipListService',
-},
 ]
diff --git a/security/manager/ssl/RemoteSecuritySettings.jsm 
b/security/manager/ssl/RemoteSecuritySettings.jsm
index 199eeb5b58e1..96d6a7a2de48 100644
--- a/security/manager/ssl/RemoteSecuritySettings.jsm
+++ b/security/manager/ssl/RemoteSecuritySettings.jsm
@@ -350,6 +350,16 @@ var RemoteSecuritySettings = {
 
 class IntermediatePreloads {
   constructor() {
+this.maybeInit();
+  }
+
+  maybeInit() {
+if (
+  this.client ||
+  !Services.prefs.getBoolPref(INTERMEDIATES_ENABLED_PREF, true)
+) {
+  return;
+}
 this.client = RemoteSettings(
   Services.prefs.getCharPref(INTERMEDIATES_COLLECTION_PREF),
   {
@@ -379,6 +389,7 @@ class IntermediatePreloads {
   );
   return;
 }
+this.maybeInit();
 
 // Download attachments that are awaiting download, up to a max.
 const maxDownloadsPerRun = Services.prefs.getIntPref(
@@ -704,6 +715,16 @@ function compareFilters(filterA, filterB) {
 
 class CRLiteFilters {
   constructor() {
+this.maybeInit();
+  }
+
+  maybeInit() {
+if (
+  this.client ||
+  !Services.prefs.getBoolPref(CRLITE_FILTERS_ENABLED_PREF, true)
+) {
+  return;
+}
 this.client = RemoteSettings(
   Services.prefs.getCharPref(CRLITE_FILTERS_COLLECTION_PREF),
   {
@@ -729,6 +750,7 @@ class CRLiteFilters {
   );
   return;
 }
+this.maybeInit();
 let current = await this.client.db.list();
 let fullFilters = current.filter(filter => !filter.incremental);
 if (fullFilters.length < 1) {
diff --git a/services/settings/IDBHelpers.jsm b/services/settings/IDBHelpers.jsm
index 5dc59c3687ef..010a5ea82987 100644
--- a/services/settings/IDBHelpers.jsm
+++ b/services/settings/IDBHelpers.jsm
@@ -188,6 +188,10 @@ async function openIDB(allowUpgrades = true) {
 });
   }
   if (event.oldVersion < 3) {
+// Clear existing stores for a fresh start
+transaction.objectStore("records").clear();
+transaction.objectStore("timestamps").clear();
+transaction.objectStore("collections").clear();
 // Attachment store
 db.createObjectStore("attachments",

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 30237: Add v3 onion services client authentication prompt

2021-02-05 Thread sysrqb

commit d73b5c17cd9c2ca7916048680601bfea39d82ee7
Author: Kathy Brade 
Date:   Tue Nov 12 16:11:05 2019 -0500

Bug 30237: Add v3 onion services client authentication prompt

When Tor informs the browser that client authentication is needed,
temporarily load about:blank instead of about:neterror and prompt
for the user's key.

If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD
control port command to add the key (via Torbutton's control port
module) and reload the page.

If the user cancels the prompt, display the standard about:neterror
"Unable to connect" page. This requires a small change to
browser/actors/NetErrorChild.jsm to account for the fact that the
docShell no longer has the failedChannel information. The failedChannel
is used to extract TLS-related error info, which is not applicable
in the case of a canceled .onion authentication prompt.

Add a leaveOpen option to PopupNotifications.show so we can display
error messages within the popup notification doorhanger without
closing the prompt.

Add support for onion services strings to the TorStrings module.

Add support for Tor extended SOCKS errors (Tor proposal 304) to the
socket transport and SOCKS layers. Improved display of all of these
errors will be implemented as part of bug 30025.

Also fixes bug 19757:
 Add a "Remember this key" checkbox to the client auth prompt.

 Add an "Onion Services Authentication" section within the
 about:preferences "Privacy & Security section" to allow
 viewing and removal of v3 onion client auth keys that have
 been stored on disk.

Also fixes bug 19251: use enhanced error pages for onion service errors.
---
 browser/actors/NetErrorChild.jsm   |   7 +
 browser/base/content/aboutNetError.js  |  10 +-
 browser/base/content/aboutNetError.xhtml   |   1 +
 browser/base/content/browser.js|  10 +
 browser/base/content/browser.xhtml |   3 +
 browser/base/content/tab-content.js|   5 +
 browser/components/moz.build   |   1 +
 .../content/authNotificationIcon.inc.xhtml |   6 +
 .../onionservices/content/authPopup.inc.xhtml  |  16 ++
 .../onionservices/content/authPreferences.css  |  20 ++
 .../content/authPreferences.inc.xhtml  |  19 ++
 .../onionservices/content/authPreferences.js   |  66 +
 .../components/onionservices/content/authPrompt.js | 316 +
 .../components/onionservices/content/authUtil.jsm  |  47 +++
 .../onionservices/content/netError/browser.svg |   3 +
 .../onionservices/content/netError/network.svg |   3 +
 .../content/netError/onionNetError.css |  65 +
 .../content/netError/onionNetError.js  | 244 
 .../onionservices/content/netError/onionsite.svg   |   7 +
 .../onionservices/content/onionservices.css|  69 +
 .../onionservices/content/savedKeysDialog.js   | 259 +
 .../onionservices/content/savedKeysDialog.xhtml|  42 +++
 browser/components/onionservices/jar.mn|   9 +
 browser/components/onionservices/moz.build |   1 +
 browser/components/preferences/preferences.xhtml   |   1 +
 browser/components/preferences/privacy.inc.xhtml   |   2 +
 browser/components/preferences/privacy.js  |   7 +
 browser/themes/shared/notification-icons.inc.css   |   3 +
 docshell/base/nsDocShell.cpp   |  81 +-
 dom/ipc/BrowserParent.cpp  |  21 ++
 dom/ipc/BrowserParent.h|   3 +
 dom/ipc/PBrowser.ipdl  |   9 +
 js/xpconnect/src/xpc.msg   |  10 +
 netwerk/base/nsSocketTransport2.cpp|   6 +
 netwerk/socket/nsSOCKSIOLayer.cpp  |  49 
 toolkit/modules/PopupNotifications.jsm |   6 +
 toolkit/modules/RemotePageAccessManager.jsm|   1 +
 .../lib/environments/frame-script.js   |   1 +
 xpcom/base/ErrorList.py|  22 ++
 39 files changed, 1449 insertions(+), 2 deletions(-)

diff --git a/browser/actors/NetErrorChild.jsm b/browser/actors/NetErrorChild.jsm
index af9d6bd46128..de66e9eeda18 100644
--- a/browser/actors/NetErrorChild.jsm
+++ b/browser/actors/NetErrorChild.jsm
@@ -13,6 +13,8 @@ const { RemotePageChild } = ChromeUtils.import(
   "resource://gre/actors/RemotePageChild.jsm"
 );
 
+const { TorStrings } = 
ChromeUtils.import("resource:///modules/TorStrings.jsm");
+
 XPCOMUtils.defineLazyServiceGetter(
   this,
   "gSerializationHelper",
@@ -29,6 +31,7 @@ class NetErrorChild extends RemotePageChild {
   "RPMPrefIsLocked",
   "RPMAddToHistogram",
   "RPMRecordTelemetryEvent",
+  "RPMGetTorStrings",
 ];
 this.exportFunctions(exportableFunctions);
   }
@@ -82,4

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 32658: Create a new MAR signing key

2021-02-05 Thread sysrqb

commit 52970808706c7028ad2d0c40ae36a98bf96dffa8
Author: Georg Koppen 
Date:   Fri Jan 17 12:54:31 2020 +

Bug 32658: Create a new MAR signing key

It's time for our rotation again: Move the backup key in the front
position and add a new backup key.

squash! Bug 32658: Create a new MAR signing key

Bug 33803: Move our primary nightly MAR signing key to tor-browser

Bug 33803: Add a secondary nightly MAR signing key
---
 .../update/updater/nightly_aurora_level3_primary.der  | Bin 1225 -> 1245 bytes
 .../updater/nightly_aurora_level3_secondary.der   | Bin 1225 -> 1245 bytes
 toolkit/mozapps/update/updater/release_primary.der| Bin 1225 -> 1229 bytes
 toolkit/mozapps/update/updater/release_secondary.der  | Bin 1225 -> 1229 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der 
b/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der
index 44fd95dcff89..d579cf801e1a 100644
Binary files a/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der 
and b/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der differ
diff --git a/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der 
b/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der
index 90f8e6e82c63..7cbfa77d06e7 100644
Binary files 
a/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der and 
b/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der differ
diff --git a/toolkit/mozapps/update/updater/release_primary.der 
b/toolkit/mozapps/update/updater/release_primary.der
index 1d94f88ad73b..0103a171de88 100644
Binary files a/toolkit/mozapps/update/updater/release_primary.der and 
b/toolkit/mozapps/update/updater/release_primary.der differ
diff --git a/toolkit/mozapps/update/updater/release_secondary.der 
b/toolkit/mozapps/update/updater/release_secondary.der
index 474706c4b73c..fcee3944e9b7 100644
Binary files a/toolkit/mozapps/update/updater/release_secondary.der and 
b/toolkit/mozapps/update/updater/release_secondary.der differ



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor

2021-02-05 Thread sysrqb

commit d0efd6617c313f2c10bd014372521746acc60193
Author: Richard Pospesel 
Date:   Mon Sep 16 15:25:39 2019 -0700

Bug 31286: Implementation of bridge, proxy, and firewall settings in 
about:preferences#tor

This patch adds a new about:preferences#tor page which allows modifying
bridge, proxy, and firewall settings from within Tor Browser. All of the
functionality present in tor-launcher's Network Configuration panel is
present:

 - Setting built-in bridges
 - Requesting bridges from BridgeDB via moat
 - Using user-provided bridges
 - Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies
 - Setting firewall ports
 - Viewing and Copying Tor's logs
 - The Networking Settings in General preferences has been removed
---
 browser/components/moz.build   |   1 +
 browser/components/preferences/main.inc.xhtml  |  55 --
 browser/components/preferences/main.js |  14 -
 browser/components/preferences/preferences.js  |   9 +
 browser/components/preferences/preferences.xhtml   |   5 +
 browser/components/preferences/privacy.js  |   1 +
 .../torpreferences/content/parseFunctions.jsm  |  89 +++
 .../torpreferences/content/requestBridgeDialog.jsm | 202 +
 .../content/requestBridgeDialog.xhtml  |  35 +
 .../torpreferences/content/torBridgeSettings.jsm   | 325 
 .../torpreferences/content/torCategory.inc.xhtml   |   9 +
 .../torpreferences/content/torFirewallSettings.jsm |  72 ++
 .../torpreferences/content/torLogDialog.jsm|  66 ++
 .../torpreferences/content/torLogDialog.xhtml  |  23 +
 .../components/torpreferences/content/torPane.js   | 857 +
 .../torpreferences/content/torPane.xhtml   | 123 +++
 .../torpreferences/content/torPreferences.css  |  77 ++
 .../torpreferences/content/torPreferencesIcon.svg  |   5 +
 .../torpreferences/content/torProxySettings.jsm| 245 ++
 browser/components/torpreferences/jar.mn   |  14 +
 browser/components/torpreferences/moz.build|   1 +
 browser/modules/BridgeDB.jsm   | 110 +++
 browser/modules/TorProtocolService.jsm | 212 +
 browser/modules/moz.build  |   2 +
 24 files changed, 2483 insertions(+), 69 deletions(-)

diff --git a/browser/components/moz.build b/browser/components/moz.build
index cb6eeb9164ef..09e209dc9c3b 100644
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -58,6 +58,7 @@ DIRS += [
 'syncedtabs',
 'uitour',
 'urlbar',
+'torpreferences',
 'translation',
 ]
 
diff --git a/browser/components/preferences/main.inc.xhtml 
b/browser/components/preferences/main.inc.xhtml
index f3502e87af98..37ac50ee940b 100644
--- a/browser/components/preferences/main.inc.xhtml
+++ b/browser/components/preferences/main.inc.xhtml
@@ -676,59 +676,4 @@
 
   
 
-
-
-  
-
-
-
-
-  
-
-  
-
-  
-  
-  
-  
-  
-
-
-
-
-  
-
-  
-
 
diff --git a/browser/components/preferences/main.js 
b/browser/components/preferences/main.js
index 9f36871d6303..6b258429e773 100644
--- a/browser/components/preferences/main.js
+++ b/browser/components/preferences/main.js
@@ -361,15 +361,6 @@ var gMainPane = {
 });
 this.updatePerformanceSettingsBox({ duringChangeEvent: false });
 this.displayUseSystemLocale();
-let connectionSettingsLink = document.getElementById(
-  "connectionSettingsLearnMore"
-);
-let connectionSettingsUrl =
-  Services.urlFormatter.formatURLPref("app.support.baseURL") +
-  "prefs-connection-settings";
-connectionSettingsLink.setAttribute("href", connectionSettingsUrl);
-this.updateProxySettingsUI();
-initializeProxyUI(gMainPane);
 
 if (Services.prefs.getBoolPref("intl.multilingual.enabled")) {
   gMainPane.initBrowserLocale();
@@ -503,11 +494,6 @@ var gMainPane = {
   "change",
   gMainPane.updateHardwareAcceleration.bind(gMainPane)
 );
-setEventListener(
-  "connectionSettings",
-  "command",
-  gMainPane.showConnections
-);
 setEventListener(
   "browserContainersCheckbox",
   "command",
diff --git a/browser/components/preferences/preferences.js 
b/browser/components/preferences/preferences.js
index 27e9763a1f9e..089533f20ade 100644
--- a/browser/components/preferences/preferences.js
+++ b/browser/components/preferences/preferences.js
@@ -13,6 +13,7 @@
 /* import-globals-from findInPage.js */
 /* import-globals-from ../../base/content/utilityOverlay.js */
 /* import-globals-from ../../../toolkit/content/preferencesBindings.js */
+/* import-globals-from ../torpreferences/content/torPane.js */
 
 "use strict";
 
@@ -91,6 +92,14 @@ function init_all() {
 document.getElementById("template-paneSync").remove();
   }
   register_module("paneSearchResults", gSearchResultsPane);
+  if (gTorPane.enabled) {
+document.getElementById("category-tor").hidden =

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 31575: Replace Firefox Home (newtab) with about:tor

2021-02-05 Thread sysrqb

commit 132042b830bb55c226c22cae0f2af57e75293c6a
Author: Alex Catarineu 
Date:   Mon Sep 9 13:04:34 2019 +0200

Bug 31575: Replace Firefox Home (newtab) with about:tor

Avoid loading AboutNewTab in BrowserGlue.jsm in order
to avoid several network requests that we do not need. Besides,
about:newtab will now point to about:blank or about:tor (depending
on browser.newtabpage.enabled) and about:home will point to
about:tor.
---
 browser/components/BrowserGlue.jsm   | 29 ++--
 browser/components/newtab/AboutNewTabService.jsm | 15 +---
 browser/components/preferences/home.inc.xhtml|  4 ++--
 browser/components/preferences/preferences.xhtml |  5 +++-
 browser/modules/HomePage.jsm |  2 +-
 5 files changed, 10 insertions(+), 45 deletions(-)

diff --git a/browser/components/BrowserGlue.jsm 
b/browser/components/BrowserGlue.jsm
index 3363e24a9b56..44b1426b92e0 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -29,12 +29,6 @@ ChromeUtils.defineModuleGetter(
   "resource:///modules/CustomizableUI.jsm"
 );
 
-ChromeUtils.defineModuleGetter(
-  this,
-  "AboutNewTab",
-  "resource:///modules/AboutNewTab.jsm"
-);
-
 ChromeUtils.defineModuleGetter(
   this,
   "E10SUtils",
@@ -123,19 +117,6 @@ let JSWINDOWACTORS = {
 matches: ["about:newinstall"],
   },
 
-  AboutNewTab: {
-child: {
-  moduleURI: "resource:///actors/AboutNewTabChild.jsm",
-  events: {
-DOMContentLoaded: {},
-  },
-},
-// The wildcard on about:newtab is for the ?endpoint query parameter
-// that is used for snippets debugging.
-matches: ["about:home", "about:welcome", "about:newtab*"],
-remoteTypes: ["privilegedabout"],
-  },
-
   AboutPlugins: {
 parent: {
   moduleURI: "resource:///actors/AboutPluginsParent.jsm",
@@ -1730,8 +1711,6 @@ BrowserGlue.prototype = {
 
   // the first browser window has finished initializing
   _onFirstWindowLoaded: function BG__onFirstWindowLoaded(aWindow) {
-AboutNewTab.init();
-
 TabCrashHandler.init();
 
 ProcessHangMonitor.init();
@@ -5199,12 +5178,8 @@ var AboutHomeStartupCache = {
   return { pageInputStream: null, scriptInputStream: null };
 }
 
-let state = AboutNewTab.activityStream.store.getState();
-return new Promise(resolve => {
-  this._cacheDeferred = resolve;
-  this.log.trace("Parent received cache streams.");
-  this._procManager.sendAsyncMessage(this.CACHE_REQUEST_MESSAGE, { state 
});
-});
+this.log.error("Activity Stream is disabled in Tor Browser.");
+return { pageInputStream: null, scriptInputStream: null };
   },
 
   /**
diff --git a/browser/components/newtab/AboutNewTabService.jsm 
b/browser/components/newtab/AboutNewTabService.jsm
index 506b521f528c..3962ebf94ab5 100644
--- a/browser/components/newtab/AboutNewTabService.jsm
+++ b/browser/components/newtab/AboutNewTabService.jsm
@@ -286,20 +286,7 @@ class BaseAboutNewTabService {
* the newtab page has no effect on the result of this function.
*/
   get defaultURL() {
-// Generate the desired activity stream resource depending on state, e.g.,
-// "resource://activity-stream/prerendered/activity-stream.html"
-// "resource://activity-stream/prerendered/activity-stream-debug.html"
-// "resource://activity-stream/prerendered/activity-stream-noscripts.html"
-return [
-  "resource://activity-stream/prerendered/",
-  "activity-stream",
-  // Debug version loads dev scripts but noscripts separately loads scripts
-  this.activityStreamDebug && !this.privilegedAboutProcessEnabled
-? "-debug"
-: "",
-  this.privilegedAboutProcessEnabled ? "-noscripts" : "",
-  ".html",
-].join("");
+return "about:tor";
   }
 
   /*
diff --git a/browser/components/preferences/home.inc.xhtml 
b/browser/components/preferences/home.inc.xhtml
index 2e900ccd296c..2a7412944d73 100644
--- a/browser/components/preferences/home.inc.xhtml
+++ b/browser/components/preferences/home.inc.xhtml
@@ -37,7 +37,7 @@
 class="check-home-page-controlled"
 data-preference-related="browser.startup.homepage">
 
-  
+  
   
   
 
@@ -97,7 +97,7 @@
 flex="1"
 preference="browser.newtabpage.enabled">
   
-
+
 
   
 
diff --git a/browser/components/preferences/preferences.xhtml 
b/browser/components/preferences/preferences.xhtml
index 3d89ddf00808..c176457c68fd 100644
--- a/browser/components/preferences/preferences.xhtml
+++ b/browser/components/preferences/preferences.xhtml
@@ -14,7 +14,10 @@
 
 
 
-
+
+  %aboutTorDTD;
+]>
 
 http://www.w3.org/1999/xhtml;
 xmlns:html="http://www.w3.org/1999/xhtml;
diff --git a/browser/modules/HomePage.jsm b/browser/modules/HomePage.jsm
index c903787fde48..bf67b1c5d173 100644
--- a/browser/modules/HomePage.jsm

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 13543: Spoof smooth and powerEfficient for Media Capabilities

2021-02-05 Thread sysrqb

commit 13c80ca72f18d71be46e54b28d0fe8bd78aa3236
Author: Alex Catarineu 
Date:   Thu Oct 10 15:08:12 2019 +0200

Bug 13543: Spoof smooth and powerEfficient for Media Capabilities
---
 dom/media/mediacapabilities/MediaCapabilities.cpp | 5 +
 1 file changed, 5 insertions(+)

diff --git a/dom/media/mediacapabilities/MediaCapabilities.cpp 
b/dom/media/mediacapabilities/MediaCapabilities.cpp
index fb1b1a2cb32c..3bc6b97eac63 100644
--- a/dom/media/mediacapabilities/MediaCapabilities.cpp
+++ b/dom/media/mediacapabilities/MediaCapabilities.cpp
@@ -290,6 +290,11 @@ already_AddRefed MediaCapabilities::DecodingInfo(
   if (aValue.IsReject()) {
 p = CapabilitiesPromise::CreateAndReject(
 std::move(aValue.RejectValue()), __func__);
+  } else if (nsContentUtils::
+ ShouldResistFingerprinting()) {
+p = CapabilitiesPromise::CreateAndResolve(
+MediaCapabilitiesInfo(true, true, false),
+__func__);
   } else {
 MOZ_ASSERT(config->IsVideo());
 if 
(StaticPrefs::media_mediacapabilities_from_database()) {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 26345: Hide tracking protection UI

2021-02-05 Thread sysrqb

commit 501bd1f0c5aaedc25344076c6a9e476efcc541d0
Author: Alex Catarineu 
Date:   Tue Sep 10 16:29:31 2019 +0200

Bug 26345: Hide tracking protection UI
---
 browser/base/content/browser-siteIdentity.js| 4 ++--
 browser/components/about/AboutRedirector.cpp| 4 
 browser/components/about/components.conf| 1 -
 browser/components/customizableui/content/panelUI.inc.xhtml | 4 ++--
 browser/components/moz.build| 1 -
 browser/themes/shared/preferences/privacy.css   | 4 
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/browser/base/content/browser-siteIdentity.js 
b/browser/base/content/browser-siteIdentity.js
index 9da8fab971c6..b8172d6a85f6 100644
--- a/browser/base/content/browser-siteIdentity.js
+++ b/browser/base/content/browser-siteIdentity.js
@@ -847,10 +847,10 @@ var gIdentityHandler = {
 
 this._refreshPermissionIcons();
 
-// Hide the shield icon if it is a chrome page.
+// Bug 26345: Hide tracking protection UI.
 gProtectionsHandler._trackingProtectionIconContainer.classList.toggle(
   "chromeUI",
-  this._isSecureInternalUI
+  true
 );
   },
 
diff --git a/browser/components/about/AboutRedirector.cpp 
b/browser/components/about/AboutRedirector.cpp
index 933d519bd959..544e21782729 100644
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -114,10 +114,6 @@ static const RedirEntry kRedirMap[] = {
  nsIAboutModule::URI_MUST_LOAD_IN_CHILD |
  nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
  nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},
-{"protections", "chrome://browser/content/protections.html",
- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
- nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT 
|
- nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS},
 {"pioneer", "chrome://browser/content/pioneer.html",
  nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},
 #ifdef TOR_BROWSER_UPDATE
diff --git a/browser/components/about/components.conf 
b/browser/components/about/components.conf
index f31159d30e15..d78de142e2e4 100644
--- a/browser/components/about/components.conf
+++ b/browser/components/about/components.conf
@@ -20,7 +20,6 @@ pages = [
 'policies',
 'preferences',
 'privatebrowsing',
-'protections',
 'profiling',
 'reader',
 'restartrequired',
diff --git a/browser/components/customizableui/content/panelUI.inc.xhtml 
b/browser/components/customizableui/content/panelUI.inc.xhtml
index 719eee14e681..45f4a10ace7b 100644
--- a/browser/components/customizableui/content/panelUI.inc.xhtml
+++ b/browser/components/customizableui/content/panelUI.inc.xhtml
@@ -244,7 +244,7 @@
 oncommand="gSync.toggleAccountPanel('PanelUI-fxa', 
this, event)"/>
 
 
-
+
   
@@ -255,7 +255,7 @@
 
   
 
-
+
  description {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 23247: Communicating security expectations for .onion

2021-02-05 Thread sysrqb

commit 5163125963defef116cbd61bcd5741136d35f740
Author: Richard Pospesel 
Date:   Fri Jun 8 13:38:40 2018 -0700

Bug 23247: Communicating security expectations for .onion

Encrypting pages hosted on Onion Services with SSL/TLS is redundant
(in terms of hiding content) as all traffic within the Tor network is
already fully encrypted.  Therefore, serving HTTP pages from an Onion
Service is more or less fine.

Prior to this patch, Tor Browser would mostly treat pages delivered
via Onion Services as well as pages delivered in the ordinary fashion
over the internet in the same way.  This created some inconsistencies
in behaviour and misinformation presented to the user relating to the
security of pages delivered via Onion Services:

 - HTTP Onion Service pages did not have any 'lock' icon indicating
   the site was secure
 - HTTP Onion Service pages would be marked as unencrypted in the Page
   Info screen
 - Mixed-mode content restrictions did not apply to HTTP Onion Service
   pages embedding Non-Onion HTTP content

This patch fixes the above issues, and also adds several new 'Onion'
icons to the mix to indicate all of the various permutations of Onion
Services hosted HTTP or HTTPS pages with HTTP or HTTPS content.

Strings for Onion Service Page Info page are pulled from Torbutton's
localization strings.
---
 browser/base/content/browser-siteIdentity.js   | 39 -
 browser/base/content/pageinfo/security.js  | 64 ++
 .../shared/identity-block/identity-block.inc.css   | 19 +++
 .../themes/shared/identity-block/onion-slash.svg   |  5 ++
 .../themes/shared/identity-block/onion-warning.svg |  6 ++
 browser/themes/shared/identity-block/onion.svg |  3 +
 browser/themes/shared/jar.inc.mn   |  3 +
 dom/base/nsContentUtils.cpp| 19 +++
 dom/base/nsContentUtils.h  |  5 ++
 dom/base/nsGlobalWindowOuter.cpp   |  3 +-
 dom/ipc/WindowGlobalActor.cpp  |  4 +-
 dom/ipc/WindowGlobalChild.cpp  |  6 +-
 dom/presentation/PresentationRequest.cpp   |  3 +-
 dom/security/nsMixedContentBlocker.cpp | 16 +-
 security/manager/ssl/nsSecureBrowserUI.cpp | 12 
 15 files changed, 175 insertions(+), 32 deletions(-)

diff --git a/browser/base/content/browser-siteIdentity.js 
b/browser/base/content/browser-siteIdentity.js
index 80c3f2a86538..9da8fab971c6 100644
--- a/browser/base/content/browser-siteIdentity.js
+++ b/browser/base/content/browser-siteIdentity.js
@@ -131,6 +131,10 @@ var gIdentityHandler = {
 );
   },
 
+  get _uriIsOnionHost() {
+return this._uriHasHost ? this._uri.host.toLowerCase().endsWith(".onion") 
: false;
+  },
+
   // smart getters
   get _identityPopup() {
 delete this._identityPopup;
@@ -624,9 +628,9 @@ var gIdentityHandler = {
   get pointerlockFsWarningClassName() {
 // Note that the fullscreen warning does not handle _isSecureInternalUI.
 if (this._uriHasHost && this._isSecureConnection) {
-  return "verifiedDomain";
+  return this._uriIsOnionHost ? "onionVerifiedDomain" : "verifiedDomain";
 }
-return "unknownIdentity";
+return this._uriIsOnionHost ? "onionUnknownIdentity" : "unknownIdentity";
   },
 
   /**
@@ -634,6 +638,10 @@ var gIdentityHandler = {
* built-in (returns false) or imported (returns true).
*/
   _hasCustomRoot() {
+if (!this._secInfo) {
+  return false;
+}
+
 let issuerCert = null;
 issuerCert = this._secInfo.succeededCertChain[
   this._secInfo.succeededCertChain.length - 1
@@ -676,11 +684,13 @@ var gIdentityHandler = {
 "identity.extension.label",
 [extensionName]
   );
-} else if (this._uriHasHost && this._isSecureConnection) {
+} else if (this._uriHasHost && this._isSecureConnection && this._secInfo) {
   // This is a secure connection.
-  this._identityBox.className = "verifiedDomain";
+  // _isSecureConnection implicitly includes onion services, which may not 
have an SSL certificate
+  const uriIsOnionHost = this._uriIsOnionHost;
+  this._identityBox.className = uriIsOnionHost ? "onionVerifiedDomain" : 
"verifiedDomain";
   if (this._isMixedActiveContentBlocked) {
-this._identityBox.classList.add("mixedActiveBlocked");
+this._identityBox.classList.add(uriIsOnionHost ? 
"onionMixedActiveBlocked" : "mixedActiveBlocked");
   }
   if (!this._isCertUserOverridden) {
 // It's a normal cert, verifier is the CA Org.
@@ -691,17 +701,17 @@ var gIdentityHandler = {
   }
 } else if (this._isBrokenConnection) {
   // This is a secure connection, but something is wrong.
-  this._identityBox.className = "unknownIdentity";
+  const uriIsOnionHost = this._uriIsOnionHost;
+  this._identityBox.className = uriIsOnionHost ?

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 28369: Stop shipping pingsender executable

2021-02-05 Thread sysrqb

commit 1ed238ea6d403309c241e077c16a0e6a236da8bf
Author: Alex Catarineu 
Date:   Wed Apr 10 17:52:51 2019 +0200

Bug 28369: Stop shipping pingsender executable
---
 browser/app/macbuild/Contents/MacOS-files.in   |  1 -
 browser/installer/package-manifest.in  |  4 
 browser/installer/windows/nsis/shared.nsh  |  1 -
 python/mozbuild/mozbuild/artifacts.py  |  2 --
 toolkit/components/telemetry/app/TelemetrySend.jsm | 19 +--
 toolkit/components/telemetry/moz.build |  4 
 6 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/browser/app/macbuild/Contents/MacOS-files.in 
b/browser/app/macbuild/Contents/MacOS-files.in
index a0cac14ef7e3..38c3766c6375 100644
--- a/browser/app/macbuild/Contents/MacOS-files.in
+++ b/browser/app/macbuild/Contents/MacOS-files.in
@@ -13,7 +13,6 @@
 #if defined(MOZ_CRASHREPORTER)
 /minidump-analyzer
 #endif
-/pingsender
 /pk12util
 /ssltunnel
 /xpcshell
diff --git a/browser/installer/package-manifest.in 
b/browser/installer/package-manifest.in
index ad7dd023a92e..9e36326dee5b 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -444,10 +444,6 @@ bin/libfreebl_64int_3.so
 @BINPATH@/minidump-analyzer@BIN_SUFFIX@
 #endif
 
-; [ Ping Sender ]
-;
-@BINPATH@/pingsender@BIN_SUFFIX@
-
 ; Shutdown Terminator
 @RESPATH@/components/terminator.manifest
 
diff --git a/browser/installer/windows/nsis/shared.nsh 
b/browser/installer/windows/nsis/shared.nsh
index 84f702fd54a1..b08a0ec5580b 100755
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/browser/installer/windows/nsis/shared.nsh
@@ -1472,7 +1472,6 @@ ${EndIf}
   Push "crashreporter.exe"
   Push "default-browser-agent.exe"
   Push "minidump-analyzer.exe"
-  Push "pingsender.exe"
   Push "updater.exe"
   Push "updateagent.exe"
   Push "${FileMainEXE}"
diff --git a/python/mozbuild/mozbuild/artifacts.py 
b/python/mozbuild/mozbuild/artifacts.py
index d1de6bca15d9..35107ac894fd 100644
--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -420,7 +420,6 @@ class LinuxArtifactJob(ArtifactJob):
 '{product}/{product}',
 '{product}/{product}-bin',
 '{product}/minidump-analyzer',
-'{product}/pingsender',
 '{product}/plugin-container',
 '{product}/updater',
 '{product}/**/*.so',
@@ -482,7 +481,6 @@ class MacArtifactJob(ArtifactJob):
 'libosclientcerts.dylib',
 'libsoftokn3.dylib',
 'minidump-analyzer',
-'pingsender',
 'plugin-container.app/Contents/MacOS/plugin-container',
 'updater.app/Contents/MacOS/org.mozilla.updater',
 # 'xpcshell',
diff --git a/toolkit/components/telemetry/app/TelemetrySend.jsm 
b/toolkit/components/telemetry/app/TelemetrySend.jsm
index f0f61b74026b..502416431b24 100644
--- a/toolkit/components/telemetry/app/TelemetrySend.jsm
+++ b/toolkit/components/telemetry/app/TelemetrySend.jsm
@@ -1578,23 +1578,6 @@ var TelemetrySendImpl = {
   },
 
   runPingSender(pings, observer) {
-if (AppConstants.platform === "android") {
-  throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED);
-}
-
-const exeName =
-  AppConstants.platform === "win" ? "pingsender.exe" : "pingsender";
-
-let exe = Services.dirsvc.get("GreBinD", Ci.nsIFile);
-exe.append(exeName);
-
-let params = pings.flatMap(ping => [ping.url, ping.path]);
-let process = Cc["@mozilla.org/process/util;1"].createInstance(
-  Ci.nsIProcess
-);
-process.init(exe);
-process.startHidden = true;
-process.noShell = true;
-process.runAsync(params, params.length, observer);
+throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED);
   },
 };
diff --git a/toolkit/components/telemetry/moz.build 
b/toolkit/components/telemetry/moz.build
index 8d9104f632a6..520d2da3acf1 100644
--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -8,10 +8,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
-DIRS = [
-'pingsender',
-]
-
 DEFINES['MOZ_APP_VERSION'] = '"%s"' % CONFIG['MOZ_APP_VERSION']
 
 LOCAL_INCLUDES += [



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 31563: force reloading search extensions if extensions.enabledScopes has changed

2021-02-05 Thread sysrqb

commit ac673b840fab076c41dfb8531f483cf6c4acd99c
Author: Alex Catarineu 
Date:   Sat Aug 31 16:23:20 2019 +0200

Bug 31563: force reloading search extensions if extensions.enabledScopes 
has changed
---
 toolkit/components/search/SearchService.jsm | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/toolkit/components/search/SearchService.jsm 
b/toolkit/components/search/SearchService.jsm
index 46b992bec8ec..608f3c475458 100644
--- a/toolkit/components/search/SearchService.jsm
+++ b/toolkit/components/search/SearchService.jsm
@@ -975,6 +975,7 @@ SearchService.prototype = {
 let locale = Services.locale.requestedLocale;
 let buildID = Services.appinfo.platformBuildID;
 let appVersion = Services.appinfo.version;
+let enabledScopes = Services.prefs.getIntPref("extensions.enabledScopes", 
-1);
 
 // Allows us to force a cache refresh should the cache format change.
 cache.version = SearchUtils.CACHE_VERSION;
@@ -988,6 +989,10 @@ SearchService.prototype = {
 cache.appVersion = appVersion;
 cache.locale = locale;
 
+// Bug 31563: we want to force reloading engines if 
extensions.enabledScopes
+// pref changes
+cache.enabledScopes = enabledScopes;
+
 if (gModernConfig) {
   cache.builtInEngineList = this._searchOrder;
   // For built-in engines we don't want to store all their data in the 
cache
@@ -1049,7 +1054,8 @@ SearchService.prototype = {
   !cache.engines ||
   cache.version != SearchUtils.CACHE_VERSION ||
   cache.locale != Services.locale.requestedLocale ||
-  cache.buildID != buildID;
+  cache.buildID != buildID ||
+  cache.enabledScopes != 
Services.prefs.getIntPref("extensions.enabledScopes", -1);
 
 let enginesCorrupted = false;
 if (!rebuildCache) {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 26353: Prevent speculative connect that violated FPI.

2021-02-05 Thread sysrqb

commit 78a902b2848611778aa7a1d3d8578684ef43d0ed
Author: Arthur Edelstein 
Date:   Sat Jul 14 08:50:55 2018 -0700

Bug 26353: Prevent speculative connect that violated FPI.

Connections were observed in the catch-all circuit when
the user entered an https or http URL in the URL bar, or
typed a search term.
---
 toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm | 4 
 1 file changed, 4 insertions(+)

diff --git a/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm 
b/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm
index ffa42297073e..82c7a3b950c2 100644
--- a/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm
+++ b/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm
@@ -74,6 +74,9 @@ class RemoteWebNavigation {
 fixupFlags |= Services.uriFixup.FIXUP_FLAG_PRIVATE_CONTEXT;
   }
   uri = Services.uriFixup.createFixupURI(aURI, fixupFlags);
+/***
+   TOR BROWSER: Disable the following speculative connect until
+   we can make it properly obey first-party isolation.
 
   // We know the url is going to be loaded, let's start requesting network
   // connection before the content process asks.
@@ -97,6 +100,7 @@ class RemoteWebNavigation {
 }
 Services.io.speculativeConnect(uri, principal, null);
   }
+***/
 } catch (ex) {
   // Can't setup speculative connection for this uri string for some
   // reason (such as failing to parse the URI), just ignore it.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 23104: Add a default line height compensation

2021-02-05 Thread sysrqb

commit 3faddde75d592a62a86beb666cad8f1fe450f7eb
Author: Igor Oliveira 
Date:   Sun Dec 10 18:16:59 2017 -0200

Bug 23104: Add a default line height compensation

Many fonts have issues with their vertical metrics. they
are used to influence the height of ascenders and depth
of descenders. Gecko uses it to calculate the line height
(font height + ascender + descender), however because of
that idiosyncratic behavior across multiple operating
systems, it can be used to identify the user's OS.

The solution proposed in the patch uses a default factor
to be multiplied with the font size, simulating the concept
of ascender and descender. This way all operating
systems will have the same line height only and only if the
frame is outside the chrome.
---
 layout/generic/ReflowInput.cpp | 19 +---
 layout/generic/test/mochitest.ini  |  1 +
 layout/generic/test/test_tor_bug23104.html | 50 ++
 3 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/layout/generic/ReflowInput.cpp b/layout/generic/ReflowInput.cpp
index 5b1f6d62043a..5da354f86558 100644
--- a/layout/generic/ReflowInput.cpp
+++ b/layout/generic/ReflowInput.cpp
@@ -30,6 +30,7 @@
 #include 
 #include "mozilla/dom/HTMLInputElement.h"
 #include "nsGridContainerFrame.h"
+#include "nsContentUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::css;
@@ -2690,7 +2691,8 @@ void 
ReflowInput::CalculateBlockSideMargins(LayoutFrameType aFrameType) {
 
 // For risk management, we use preference to control the behavior, and
 // eNoExternalLeading is the old behavior.
-static nscoord GetNormalLineHeight(nsFontMetrics* aFontMetrics) {
+static nscoord GetNormalLineHeight(nsIContent* aContent,
+   nsFontMetrics* aFontMetrics) {
   MOZ_ASSERT(nullptr != aFontMetrics, "no font metrics");
 
   nscoord normalLineHeight;
@@ -2698,6 +2700,12 @@ static nscoord GetNormalLineHeight(nsFontMetrics* 
aFontMetrics) {
   nscoord externalLeading = aFontMetrics->ExternalLeading();
   nscoord internalLeading = aFontMetrics->InternalLeading();
   nscoord emHeight = aFontMetrics->EmHeight();
+
+  if (nsContentUtils::ShouldResistFingerprinting() &&
+  !aContent->IsInChromeDocument()) {
+return NSToCoordRound(emHeight * NORMAL_LINE_HEIGHT_FACTOR);
+  }
+
   switch (GetNormalLineHeightCalcControl()) {
 case eIncludeExternalLeading:
   normalLineHeight = emHeight + internalLeading + externalLeading;
@@ -2715,7 +2723,8 @@ static nscoord GetNormalLineHeight(nsFontMetrics* 
aFontMetrics) {
   return normalLineHeight;
 }
 
-static inline nscoord ComputeLineHeight(ComputedStyle* aComputedStyle,
+static inline nscoord ComputeLineHeight(nsIContent* aContent,
+ComputedStyle* aComputedStyle,
 nsPresContext* aPresContext,
 nscoord aBlockBSize,
 float aFontSizeInflation) {
@@ -2743,7 +2752,7 @@ static inline nscoord ComputeLineHeight(ComputedStyle* 
aComputedStyle,
 
   RefPtr fm = nsLayoutUtils::GetFontMetricsForComputedStyle(
   aComputedStyle, aPresContext, aFontSizeInflation);
-  return GetNormalLineHeight(fm);
+  return GetNormalLineHeight(aContent, fm);
 }
 
 nscoord ReflowInput::CalcLineHeight() const {
@@ -2765,7 +2774,7 @@ nscoord ReflowInput::CalcLineHeight(nsIContent* aContent,
 float aFontSizeInflation) {
   MOZ_ASSERT(aComputedStyle, "Must have a ComputedStyle");
 
-  nscoord lineHeight = ComputeLineHeight(aComputedStyle, aPresContext,
+  nscoord lineHeight = ComputeLineHeight(aContent, aComputedStyle, 
aPresContext,
  aBlockBSize, aFontSizeInflation);
 
   NS_ASSERTION(lineHeight >= 0, "ComputeLineHeight screwed up");
@@ -2778,7 +2787,7 @@ nscoord ReflowInput::CalcLineHeight(nsIContent* aContent,
 if (!lh.IsNormal()) {
   RefPtr fm = nsLayoutUtils::GetFontMetricsForComputedStyle(
   aComputedStyle, aPresContext, aFontSizeInflation);
-  nscoord normal = GetNormalLineHeight(fm);
+  nscoord normal = GetNormalLineHeight(aContent, fm);
   if (lineHeight < normal) {
 lineHeight = normal;
   }
diff --git a/layout/generic/test/mochitest.ini 
b/layout/generic/test/mochitest.ini
index f6678d8d8e4e..c1602bbbc6b1 100644
--- a/layout/generic/test/mochitest.ini
+++ b/layout/generic/test/mochitest.ini
@@ -161,3 +161,4 @@ skip-if = debug == true || tsan # the test is slow. tsan: 
bug 1612707
 [test_reframe_for_lazy_load_image.html]
 support-files =
 file_reframe_for_lazy_load_image.html
+[test_tor_bug23104.html]
diff --git a/layout/generic/test/test_tor_bug23104.html 
b/layout/generic/test/test_tor_bug23104.html
new file mode 100644
index ..8ff1d2190c45
--- /dev/null
+++ b/layout/generic/test/test_tor_bug23104.html
@@ -0,0 +1,50 @@
+
+
+
+
+

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing

2021-02-05 Thread sysrqb

commit ce59b465be7528dfbe03e4f92ae6061575170615
Author: Mike Perry 
Date:   Fri May 5 03:41:57 2017 -0700

Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, 
eBay, bing

eBay and Amazon don't treat Tor users very well. Accounts often get locked 
and
payments reversed.

Also:
Bug 16322: Update DuckDuckGo search engine

We are replacing the clearnet URL with an onion service one (thanks to a
patch by a cypherpunk) and are removing the duplicated DDG search
engine. Duplicating DDG happend due to bug 1061736 where Mozilla
included DDG itself into Firefox. Interestingly, this caused breaking
the DDG search if JavaScript is disabled as the Mozilla engine, which
gets loaded earlier, does not use the html version of the search page.
Moreover, the Mozilla engine tracked where the users were searching from
by adding a respective parameter to the search query. We got rid of that
feature as well.

Also:
This fixes bug 20809: the DuckDuckGo team has changed its server-side
code in a way that lets users with JavaScript enabled use the default
landing page while those without JavaScript available get redirected
directly to the non-JS page. We adapt the search engine URLs
accordingly.

Also fixes bug 29798 by making sure we only specify the Google search
engine we actually ship an .xml file for.

Also regression tests.
---
 browser/app/profile/000-tor-browser.js |   9 +-
 .../search/extensions/ddg-onion/favicon.ico| Bin 0 -> 973 bytes
 .../search/extensions/ddg-onion/manifest.json  |  26 
 .../components/search/extensions/ddg/favicon.ico   | Bin 5430 -> 0 bytes
 .../components/search/extensions/ddg/favicon.png   | Bin 0 -> 1150 bytes
 .../components/search/extensions/ddg/manifest.json |  40 +-
 .../extensions/google/_locales/b-1-d/messages.json |  23 
 .../extensions/google/_locales/b-1-e/messages.json |  23 
 .../extensions/google/_locales/b-d/messages.json   |  23 
 .../extensions/google/_locales/b-e/messages.json   |  23 
 .../extensions/google/_locales/en/messages.json|  24 
 .../search/extensions/google/manifest.json |  17 ++-
 browser/components/search/extensions/list.json | 141 ++---
 .../search/extensions/startpage/favicon.png| Bin 0 -> 1150 bytes
 .../search/extensions/startpage/manifest.json  |  26 
 .../search/extensions/twitter/favicon.ico  | Bin 0 -> 1650 bytes
 .../search/extensions/twitter/manifest.json|  26 
 .../extensions/wikipedia/_locales/NN/messages.json |  20 ---
 .../extensions/wikipedia/_locales/NO/messages.json |  20 ---
 .../extensions/wikipedia/_locales/af/messages.json |  20 ---
 .../extensions/wikipedia/_locales/an/messages.json |  20 ---
 .../extensions/wikipedia/_locales/ar/messages.json |  20 ---
 .../wikipedia/_locales/ast/messages.json   |  20 ---
 .../extensions/wikipedia/_locales/az/messages.json |  20 ---
 .../wikipedia/_locales/be-tarask/messages.json |  20 ---
 .../extensions/wikipedia/_locales/be/messages.json |  20 ---
 .../extensions/wikipedia/_locales/bg/messages.json |  20 ---
 .../extensions/wikipedia/_locales/bn/messages.json |  20 ---
 .../extensions/wikipedia/_locales/br/messages.json |  20 ---
 .../extensions/wikipedia/_locales/bs/messages.json |  20 ---
 .../extensions/wikipedia/_locales/ca/messages.json |  20 ---
 .../extensions/wikipedia/_locales/cy/messages.json |  20 ---
 .../extensions/wikipedia/_locales/cz/messages.json |  20 ---
 .../extensions/wikipedia/_locales/da/messages.json |  20 ---
 .../extensions/wikipedia/_locales/de/messages.json |  20 ---
 .../wikipedia/_locales/dsb/messages.json   |  20 ---
 .../extensions/wikipedia/_locales/el/messages.json |  20 ---
 .../extensions/wikipedia/_locales/en/messages.json |  20 ---
 .../extensions/wikipedia/_locales/eo/messages.json |  20 ---
 .../extensions/wikipedia/_locales/es/messages.json |  20 ---
 .../extensions/wikipedia/_locales/et/messages.json |  20 ---
 .../extensions/wikipedia/_locales/eu/messages.json |  20 ---
 .../extensions/wikipedia/_locales/fa/messages.json |  20 ---
 .../extensions/wikipedia/_locales/fi/messages.json |  20 ---
 .../extensions/wikipedia/_locales/fr/messages.json |  20 ---
 .../wikipedia/_locales/fy-NL/messages.json |  20 ---
 .../wikipedia/_locales/ga-IE/messages.json |  20 ---
 .../extensions/wikipedia/_locales/gd/messages.json |  20 ---
 .../extensions/wikipedia/_locales/gl/messages.json |  20 ---
 .../extensions/wikipedia/_locales/gn/messages.json |  20 ---
 .../extensions/wikipedia/_locales/gu/messages.json |  20 ---
 .../extensions/wikipedia/_locales/he/messages.json |  20 ---
 .../extensions/wikipedia/_locales/hi/messages.json |  20 ---
 .../extensions/wikipedia/_locales/hr/messages.json |  20 ---
 .../wikipedia/_locales/hsb/messages.json   |  20 ---

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 25658: Replace security slider with security level UI

2021-02-05 Thread sysrqb

commit b1fab128b820fadf0e37deee80fc093fee8b693d
Author: Richard Pospesel 
Date:   Mon Mar 4 16:09:51 2019 -0800

Bug 25658: Replace security slider with security level UI

This patch adds a new 'securitylevel' component to Tor Browser intended
to replace the torbutton 'Security Slider'.

This component adds a new Security Level toolbar button which visually
indicates the current global security level via icon (as defined by the
extensions.torbutton.security_slider pref), a drop-down hanger with a
short description of the current security level, and a new section in
the about:preferences#privacy page where users can change their current
security level. In addition, the hanger and the preferences page will
show a visual warning when the user has modified prefs associated with
the security level and provide a one-click 'Restore Defaults' button to
get the user back on recommended settings.

Strings used by this patch are pulled from the torbutton extension, but
en-US defaults are provided if there is an error loading from the
extension. With this patch applied, the usual work-flow of "./mach build
&& ./mach run" work as expected, even if the torbutton extension is
disabled.
---
 browser/base/content/browser.js|  10 +
 browser/base/content/browser.xhtml |   5 +
 browser/components/moz.build   |   1 +
 browser/components/preferences/preferences.xhtml   |   1 +
 browser/components/preferences/privacy.inc.xhtml   |   2 +
 browser/components/preferences/privacy.js  |  19 +
 .../securitylevel/content/securityLevel.js | 501 +
 .../securitylevel/content/securityLevelButton.css  |   9 +
 .../content/securityLevelButton.inc.xhtml  |   7 +
 .../securitylevel/content/securityLevelButton.svg  |  21 +
 .../securitylevel/content/securityLevelPanel.css   |  82 
 .../content/securityLevelPanel.inc.xhtml   |  38 ++
 .../content/securityLevelPreferences.css   |  26 ++
 .../content/securityLevelPreferences.inc.xhtml |  62 +++
 browser/components/securitylevel/jar.mn|   6 +
 browser/components/securitylevel/moz.build |   1 +
 16 files changed, 791 insertions(+)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 036d92e131da..a851be586c0c 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -216,6 +216,11 @@ XPCOMUtils.defineLazyScriptGetter(
   ["DownloadsButton", "DownloadsIndicatorView"],
   "chrome://browser/content/downloads/indicator.js"
 );
+XPCOMUtils.defineLazyScriptGetter(
+  this,
+  ["SecurityLevelButton"],
+  "chrome://browser/content/securitylevel/securityLevel.js"
+);
 XPCOMUtils.defineLazyScriptGetter(
   this,
   "gEditItemOverlay",
@@ -1876,6 +1881,9 @@ var gBrowserInit = {
 // doesn't flicker as the window is being shown.
 DownloadsButton.init();
 
+// Init the SecuritySettingsButton
+SecurityLevelButton.init();
+
 // Certain kinds of automigration rely on this notification to complete
 // their tasks BEFORE the browser window is shown. SessionStore uses it to
 // restore tabs into windows AFTER important parts like 
gMultiProcessBrowser
@@ -2558,6 +2566,8 @@ var gBrowserInit = {
 
 DownloadsButton.uninit();
 
+SecurityLevelButton.uninit();
+
 gAccessibilityServiceIndicator.uninit();
 
 AccessibilityRefreshBlocker.uninit();
diff --git a/browser/base/content/browser.xhtml 
b/browser/base/content/browser.xhtml
index 229fc2a26dd2..72c415b8f843 100644
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -20,6 +20,8 @@
 
 
 
+
+
 
 
 
@@ -623,6 +625,7 @@
 #include ../../components/controlcenter/content/protectionsPanel.inc.xhtml
 #include ../../components/downloads/content/downloadsPanel.inc.xhtml
 #include ../../../devtools/startup/enableDevToolsPopup.inc.xhtml
+#include ../../components/securitylevel/content/securityLevelPanel.inc.xhtml
 #include browser-allTabsMenu.inc.xhtml
 
 
@@ -1136,6 +1139,8 @@
 
   
 
+#include ../../components/securitylevel/content/securityLevelButton.inc.xhtml
+
 
 
 
+
 
 
 
diff --git a/browser/components/preferences/privacy.inc.xhtml 
b/browser/components/preferences/privacy.inc.xhtml
index 572b0233c8c4..f36145ea80d4 100644
--- a/browser/components/preferences/privacy.inc.xhtml
+++ b/browser/components/preferences/privacy.inc.xhtml
@@ -913,6 +913,8 @@
   
 
 
+#include ../securitylevel/content/securityLevelPreferences.inc.xhtml
+
 
 
   
diff --git a/browser/components/preferences/privacy.js 
b/browser/components/preferences/privacy.js
index 2cff75726546..949fa84c24ab 100644
--- a/browser/components/preferences/privacy.js
+++ b/browser/components/preferences/privacy.js
@@ -77,6 +77,12 @@ XPCOMUtils.defineLazyGetter(this, "AlertsServiceDND", 
function() {
   }
 });

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 21907: Fix runtime error on CentOS 6

2021-02-05 Thread sysrqb

commit 977f50ff4a5d93ee17e75536cf057849367deae2
Author: Nicolas Vigier 
Date:   Mon Apr 10 16:07:23 2017 +0200

Bug 21907: Fix runtime error on CentOS 6

In Mozilla bug 1324780, support for building with glib 2.28 (the version
available in CentOS 6) was added. However we are building on Debian
Wheezy which has glib 2.32. We fix that by backing out all glib > 2.28
code paths.
---
 gfx/harfbuzz/src/hb-glib.cc | 53 -
 gfx/harfbuzz/src/hb-glib.h  |  5 -
 2 files changed, 58 deletions(-)

diff --git a/gfx/harfbuzz/src/hb-glib.cc b/gfx/harfbuzz/src/hb-glib.cc
index 058f65ae69c3..2fd39610203d 100644
--- a/gfx/harfbuzz/src/hb-glib.cc
+++ b/gfx/harfbuzz/src/hb-glib.cc
@@ -49,7 +49,6 @@
  **/
 
 
-#if !GLIB_CHECK_VERSION(2,29,14)
 static const hb_script_t
 glib_script_to_script[] =
 {
@@ -171,7 +170,6 @@ glib_script_to_script[] =
   HB_SCRIPT_SORA_SOMPENG,
   HB_SCRIPT_TAKRI
 };
-#endif
 
 /**
  * hb_glib_script_to_script:
@@ -187,9 +185,6 @@ 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];
 
@@ -197,7 +192,6 @@ hb_glib_script_to_script (GUnicodeScript script)
 return HB_SCRIPT_INVALID;
 
   return HB_SCRIPT_UNKNOWN;
-#endif
 }
 
 /**
@@ -214,9 +208,6 @@ 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)
@@ -226,7 +217,6 @@ hb_glib_script_from_script (hb_script_t script)
 return G_UNICODE_SCRIPT_INVALID_CODE;
 
   return G_UNICODE_SCRIPT_UNKNOWN;
-#endif
 }
 
 
@@ -273,10 +263,6 @@ 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. */
 
@@ -310,10 +296,6 @@ 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. */
 
@@ -415,39 +397,4 @@ 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, );
-  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 5f04183ba19f..4adbd7c332cb 100644
--- a/gfx/harfbuzz/src/hb-glib.h
+++ b/gfx/harfbuzz/src/hb-glib.h
@@ -46,11 +46,6 @@ 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 */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 16285: Exclude ClearKey system for now

2021-02-05 Thread sysrqb

commit 6806086aa504e98ebc5ba0f9572825676ee66de4
Author: Georg Koppen 
Date:   Mon May 22 12:44:40 2017 +

Bug 16285: Exclude ClearKey system for now

In the past the ClearKey system had not been compiled when specifying
--disable-eme. But that changed and it is even bundled nowadays (see:
Mozilla's bug 1300654). We don't want to ship it right now as the use
case for it is not really visible while the code had security
vulnerabilities in the past.
---
 browser/installer/package-manifest.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/installer/package-manifest.in 
b/browser/installer/package-manifest.in
index 792acb870afa..53b0b7ddf731 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -465,8 +465,8 @@ bin/libfreebl_64int_3.so
 #endif
 
 ; media
-@RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@
-@RESPATH@/gmp-clearkey/0.1/manifest.json
+;@RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@
+;@RESPATH@/gmp-clearkey/0.1/manifest.json
 
 #ifdef MOZ_DMD
 ; DMD



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 21830: Copying large text from web console leaks to /tmp

2021-02-05 Thread sysrqb

commit 2b27c66568c19de3900541b2191f96c3cfde0bf6
Author: Georg Koppen 
Date:   Fri Aug 4 05:55:49 2017 +

Bug 21830: Copying large text from web console leaks to /tmp

Patch written by Neill Miller
---
 widget/nsTransferable.cpp | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/widget/nsTransferable.cpp b/widget/nsTransferable.cpp
index 9ccfc8639350..135135ab23a8 100644
--- a/widget/nsTransferable.cpp
+++ b/widget/nsTransferable.cpp
@@ -33,6 +33,7 @@ Notes to self:
 #include "nsILoadContext.h"
 #include "nsXULAppAPI.h"
 #include "mozilla/UniquePtr.h"
+#include "mozilla/Preferences.h"
 
 using namespace mozilla;
 
@@ -195,6 +196,11 @@ nsTransferable::Init(nsILoadContext* aContext) {
 
   if (aContext) {
 mPrivateData = aContext->UsePrivateBrowsing();
+  } else {
+// without aContext here to provide PrivateBrowsing information,
+// we defer to the active configured setting
+mPrivateData =
+mozilla::Preferences::GetBool("browser.privatebrowsing.autostart");
   }
 #ifdef DEBUG
   mInitialized = true;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 13379: Sign our MAR files.

2021-02-05 Thread sysrqb

commit 1d7d30755bf10244eb23860f03b5b1a311ba3935
Author: Kathy Brade 
Date:   Wed Dec 17 16:37:11 2014 -0500

Bug 13379: Sign our MAR files.

Configure with --enable-verify-mar (when updating, require a valid
  signature on the MAR file before it is applied).
Use the Tor Browser version instead of the Firefox version inside the
  MAR file info block (necessary to prevent downgrade attacks).
Use NSS on all platforms for checking MAR signatures (instead of using
  OS-native APIs, which Mozilla does on Mac OS and Windows). So that the
  NSS and NSPR libraries the updater depends on can be found at runtime,
  we add the firefox directory to the shared library search path on macOS.
  On Linux, rpath is used by Mozilla to solve that problem, but that
  approach won't work on macOS because the updater executable is copied
  during the update process to a location that is under TorBrowser-Data,
  and the location of TorBrowser-Data varies.

Also includes the fix for bug 18900.
---
 .mozconfig |  1 +
 .mozconfig-asan|  1 +
 .mozconfig-mac |  1 +
 .mozconfig-mingw   |  1 +
 modules/libmar/tool/mar.c  |  6 +--
 modules/libmar/tool/moz.build  | 12 --
 modules/libmar/verify/moz.build| 14 +++---
 .../mozapps/update/updater/updater-common.build| 24 +--
 toolkit/mozapps/update/updater/updater.cpp | 25 +++
 toolkit/xre/moz.build  |  3 ++
 toolkit/xre/nsUpdateDriver.cpp | 50 ++
 11 files changed, 113 insertions(+), 25 deletions(-)

diff --git a/.mozconfig b/.mozconfig
index 18cd1f9b6487..c50c57d410de 100755
--- a/.mozconfig
+++ b/.mozconfig
@@ -37,3 +37,4 @@ ac_add_options MOZ_TELEMETRY_REPORTING=
 ac_add_options --disable-tor-launcher
 ac_add_options --with-tor-browser-version=dev-build
 ac_add_options --disable-tor-browser-update
+ac_add_options --enable-verify-mar
diff --git a/.mozconfig-asan b/.mozconfig-asan
index 98ea6ac6f3fe..8bee813bfee8 100644
--- a/.mozconfig-asan
+++ b/.mozconfig-asan
@@ -30,6 +30,7 @@ ac_add_options --enable-official-branding
 ac_add_options --enable-default-toolkit=cairo-gtk3
 
 ac_add_options --enable-tor-browser-update
+ac_add_options --enable-verify-mar
 
 ac_add_options --disable-strip
 ac_add_options --disable-install-strip
diff --git a/.mozconfig-mac b/.mozconfig-mac
index 26e2b6b92fdb..5b4624ef1f67 100644
--- a/.mozconfig-mac
+++ b/.mozconfig-mac
@@ -43,6 +43,7 @@ ac_add_options --disable-debug
 
 ac_add_options --enable-tor-browser-data-outside-app-dir
 ac_add_options --enable-tor-browser-update
+ac_add_options --enable-verify-mar
 
 ac_add_options --disable-crashreporter
 ac_add_options --disable-webrtc
diff --git a/.mozconfig-mingw b/.mozconfig-mingw
index 3ec6ff18a3e9..ce6ace1dad67 100644
--- a/.mozconfig-mingw
+++ b/.mozconfig-mingw
@@ -15,6 +15,7 @@ ac_add_options --enable-strip
 ac_add_options --enable-official-branding
 
 ac_add_options --enable-tor-browser-update
+ac_add_options --enable-verify-mar
 ac_add_options --disable-bits-download
 
 # Let's make sure no preference is enabling either Adobe's or Google's CDM.
diff --git a/modules/libmar/tool/mar.c b/modules/libmar/tool/mar.c
index 0bf2cb4bd1d4..ea2b79924914 100644
--- a/modules/libmar/tool/mar.c
+++ b/modules/libmar/tool/mar.c
@@ -65,7 +65,7 @@ static void print_usage() {
   "signed_input_archive.mar base_64_encoded_signature_file "
   "changed_signed_output.mar\n");
   printf("(i) is the index of the certificate to extract\n");
-#  if defined(XP_MACOSX) || (defined(XP_WIN) && !defined(MAR_NSS))
+#  if (defined(XP_MACOSX) || defined(XP_WIN)) && !defined(MAR_NSS)
   printf("Verify a MAR file:\n");
   printf("  mar [-C workingDir] -D DERFilePath -v signed_archive.mar\n");
   printf(
@@ -149,7 +149,7 @@ int main(int argc, char** argv) {
   memset((void*)certBuffers, 0, sizeof(certBuffers));
 #endif
 #if !defined(NO_SIGN_VERIFY) && \
-((!defined(MAR_NSS) && defined(XP_WIN)) || defined(XP_MACOSX))
+(!defined(MAR_NSS) && (defined(XP_WIN) || defined(XP_MACOSX)))
   memset(DERFilePaths, 0, sizeof(DERFilePaths));
   memset(fileSizes, 0, sizeof(fileSizes));
 #endif
@@ -181,7 +181,7 @@ int main(int argc, char** argv) {
   argc -= 2;
 }
 #if !defined(NO_SIGN_VERIFY)
-#  if (!defined(MAR_NSS) && defined(XP_WIN)) || defined(XP_MACOSX)
+#  if (!defined(MAR_NSS) && (defined(XP_WIN) || defined(XP_MACOSX)))
 /* -D DERFilePath, also matches -D[index] DERFilePath
We allow an index for verifying to be symmetric
with the import and export command line arguments. */
diff --git a/modules/libmar/tool/moz.build b/modules/libmar/tool/moz.build
index 19653fb0b073..8953af0bb15c 100644
--- a/modules/libmar/tool/moz.build
+++

[tor-commits] [tor-browser/tor-browser-78.7.1esr-10.5-1] Bug 4234: Use the Firefox Update Process for Tor Browser.

2021-02-05 Thread sysrqb

commit ffb33c63c0a729688d29d38bbdfe697de99d8d3d
Author: Kathy Brade 
Date:   Fri Jan 13 11:40:24 2017 -0500

Bug 4234: Use the Firefox Update Process for Tor Browser.

The following files are never updated:
  TorBrowser/Data/Browser/profiles.ini
  TorBrowser/Data/Browser/profile.default/bookmarks.html
  TorBrowser/Data/Tor/torrc
Mac OS: Store update metadata under TorBrowser/UpdateInfo.
Removed the %OS_VERSION% component from the update URL (13047) and
  added support for minSupportedOSVersion, an attribute of the
   element that may be used to trigger Firefox's
  "unsupported platform" behavior.
Hide the "What's new" links (set app.releaseNotesURL value to about:blank).
Windows: disable "runas" code path in updater (15201).
Windows: avoid writing to the registry (16236).
Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406,
  16014, 16909, 24476, and 25909.

Also fix Bug 26049: reduce the delay before the update prompt is displayed.
Instead of Firefox's 2 days, we use 1 hour (after which time the update
doorhanger will be displayed).

Also fix bug 27221: purge the startup cache if the Tor Browser
version changed (even if the Firefox version and build ID did
not change), e.g., after a minor Tor Browser update.

Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality.

Bug 26048: potentially confusing "restart to update" message

Within the update doorhanger, remove the misleading message that mentions
that windows will be restored after an update is applied, and replace the
"Restart and Restore" button label with an existing
"Restart to update Tor Browser" string.

Bug 28885: notify users that update is downloading

Add a "Downloading Tor Browser update" item which appears in the
hamburger (app) menu while the update service is downloading a MAR
file. Before this change, the browser did not indicate to the user
that an update was in progress, which is especially confusing in
Tor Browser because downloads often take some time. If the user
clicks on the new menu item, the about dialog is opened to allow
the user to see download progress.

As part of this fix, the update service was changed to always show
update-related messages in the hamburger menu, even if the update
was started in the foreground via the about dialog or via the
"Check for Tor Browser Update" toolbar menu item. This change is
consistent with the Tor Browser goal of making sure users are
informed about the update process.

Removed #28885 parts of this patch which have been uplifted to Firefox.

Use a localized string from Torbutton for the app menu's
"Downloading update" message. This is a temporary fix that can
be removed once Tor Browser is based on Firefox 79 or newer (at
which point the localized string will be included in the Firefox
language packs).
---
 browser/app/Makefile.in|   2 +
 browser/app/profile/000-tor-browser.js |  16 +-
 browser/app/profile/firefox.js |  10 +-
 .../base/content/aboutDialog-appUpdater-legacy.js  |   2 +-
 browser/base/content/aboutDialog-appUpdater.js |   2 +-
 browser/base/content/aboutDialog.js|  12 +-
 browser/components/BrowserContentHandler.jsm   |  39 ++-
 .../customizableui/content/panelUI.inc.xhtml   |   8 +-
 .../components/customizableui/content/panelUI.js   |  22 ++
 browser/confvars.sh|  35 +--
 browser/installer/package-manifest.in  |   2 +
 build/application.ini.in   |   2 +-
 build/moz.configure/init.configure |   3 +-
 config/createprecomplete.py|  17 +-
 .../client/aboutdebugging/src/actions/runtimes.js  |   5 +
 toolkit/modules/UpdateUtils.jsm|  34 +--
 toolkit/mozapps/extensions/AddonManager.jsm|  24 ++
 toolkit/mozapps/extensions/test/browser/head.js|   1 +
 .../extensions/test/xpcshell/head_addons.js|   1 +
 toolkit/mozapps/update/UpdateService.jsm   | 127 +++-
 toolkit/mozapps/update/UpdateServiceStub.jsm   |   4 +
 toolkit/mozapps/update/common/updatehelper.cpp |   8 +
 toolkit/mozapps/update/moz.build   |   5 +-
 toolkit/mozapps/update/updater/launchchild_osx.mm  |   2 +
 toolkit/mozapps/update/updater/moz.build   |   2 +-
 toolkit/mozapps/update/updater/updater.cpp | 339 ++---
 toolkit/xre/MacLaunchHelper.h  |   2 +
 toolkit/xre/MacLaunchHelper.mm |   2 +
 toolkit/xre/nsAppRunner.cpp|  22 +-
 toolkit/xre/nsUpdateDriver.cpp | 109 ++-
 toolkit/xre/nsXREDirProvider.cpp   |  42 ++-
 tools/update-packaging/common.sh

1 2 3 >

1 - 100 of 251 matches

Mail list logo