date:20210616

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

2021-06-16 Thread translation

commit 3709bf0d6e6e14ab1420a0f7e57a7960c237dc88
Author: Translation commit bot 
Date:   Thu Jun 17 06:45:12 2021 +


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

diff --git a/contents+ka.po b/contents+ka.po
index 75c6728373..d4412adcc2 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -837,7 +837,7 @@ msgstr ""
 #: (content/user-research/guidelines/contents+en.lrpage.body)
 msgid ""
 "The two of you should work together to hand out post-its to the audience."
-msgstr ""
+msgstr "áá¥ááá áá áá áá ááá á£ááá ááá 
á£ááá á©áááá¬áá áááá¡ 
ááááá¬ááááááááá¡ ááá ááááááá."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -846,6 +846,9 @@ msgid ""
 " to fill it in with what they think about: 1. the software, service or skill"
 " they just learned; 2. the Tor Project; and 3. Tor in general."
 msgstr ""
+"áááááá£á ááááá¬áááá¡ ááááªáá 
áááá¡á®áááááá£áá á¤áá áá¡ ááá ááá, 
áªááááá£áá áááá®ááá¡áááá¡ áá"
+" á¡áá®áááá, ááá¬áá áá á¡ááá£ááá á 
ááá¡ááá ááá: 1. á¨áá¡á¬áááááá áá ááá 
áááá¡, áááá¡áá®á£á áááá¡ "
+"áá á£ááá áá¡ á¨áá¡áá®áá; 2. Tor-áá 
ááá¥á¢áá¡á áá 3. ááááááá, Tor-áá¡ 
á¨áá¡áá®áá."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -859,7 +862,7 @@ msgstr ""
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
 msgid "It's very important for us to hear back from you too."
-msgstr "á©ááááááá¡ áááá¨áááááááááá 
áá¥áááá ááááá®ááá£á ááá."
+msgstr "á©ááááááá¡ áááá¨áááááááááá 
ááááá®ááá£á ááá áá¥ááááááááª."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -868,6 +871,9 @@ msgid ""
 "going forward, and if you plan to keep running user research for Tor in the "
 "future."
 msgstr ""
+"ááá¡á£á á¡ ááááááá, á áááá  á©áááá á 
á¨áá®áááá áá áá¥ááááááá¡, á áááá  
á¨ááááá«ááá á©áááá "
+"áá®áá ááááá áá¡ ááá£áá¯áááá¡ááá áá 
ááááááá áá£ áá á, áááááá á«áá, 
á¡ááááá®ááá áááá "
+"ááááááááá¡ á©áá¢áá ááá Tor-áá, 
á¡áááááááááááª."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -876,6 +882,9 @@ msgid ""
 "address so we can send you a researcher kit too (including a t-shirt and "
 "stickers)."
 msgstr ""
+"ááááááá¡ ááá¡á á£ááááá¡ á¨áááááá, 
ááá®ááá, á¨áááá¡áá áááá®ááá á, 
ááá¡áááá ááá¡ ááá áááá, "
+"á áá á¨ááá«ááá ááááááááááááá 
áááááááá áá¡ áááá ááá (ááá á¨áá áá¡ 
áááá¡á£á á áá "
+"ááá¡áá¬áááááááá)."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -886,6 +895,11 @@ msgid ""
 " we will happily accept your findings another way - for example, you can "
 "take pictures or send us your raw notes."
 msgstr ""
+"áá£ ááááá©áááá, á áá áá  ááá¥ááááá 
áá á ááá®á¡ááááá, [á¡ááááá®ááá áááá 
ááááááá¡ "
+"áááá£á¨áá¡](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/community/user_research_reporting.md)"
+" ááá®ááááá á¬áá ááááááááá, 
á¡áááááááááá ááááá¦ááá 
ááááááá£á ááá¡ááááá¡ á¡á®áá 
á¡áá®ááááª "
+"- ááááááááá, á¨áááá«áááá 
áááááááááááááá ááááá¦ááá£áá 
á¡á£á ááááá áá á©áááá¨áá£áá "
+"á©áááá¬áá ááá ááá ááááá , 
ááá£áá£á¨ááááááá."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/g

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

2021-06-16 Thread translation

commit 95ba7eef8237c3005c27a2540e548299d65faaa9
Author: Translation commit bot 
Date:   Thu Jun 17 06:15:12 2021 +


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

diff --git a/contents+ka.po b/contents+ka.po
index 0cdd256023..75c6728373 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -611,6 +611,9 @@ msgid ""
 "At Tor, we don't collect invasive data about user behavior, only the data "
 "necessary to improve our services. We test our software, not people."
 msgstr ""
+"Tor-á¨á, á©ááá áá  áááá ááááá 
ááá¡áá¢ááªáááá áááááªááááá¡ 
áááá®ááá ááááá¡ á¥áªáááá¡ "
+"á¨áá¡áá®áá, áá®áááá áááá¡áá®á£á 
áááá¡ ááá¡áá£áá¯áááá¡áááá ááá¤áá 
áááªááá¡. á©ááá ááááá¬áááá "
+"áá ááá áááá¡ áá áá á á®ááá®á¡."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -623,6 +626,8 @@ msgid ""
 "Listening is a skill that helps build bridges. We believe this doesn't just "
 "apply to our services, but our communities too."
 msgstr ""
+"ááá¡ááááá¡ á£ááá á á¥áááá¡ á£á áááá 
áááááá¡. áááááá©ááá, á áá áá¡ 
áá®ááá áá á áá®áááá á©áááá¡ "
+"áááá¡áá®á£á ááááá¡, áá áááá á©áááá¡ 
á¡ááááááááááá¡ááª."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -636,6 +641,8 @@ msgid ""
 "their lives, the laws of the jurisdictions they live in, and the "
 "difficulties they are going through."
 msgstr ""
+"áááááááááááá¡áá¡, á©ááá 
ááá¡áááá á®ááá®áá¡ áááááá¡ ááá 
áªá®ááá ááááá, á¡áááá ááááá áá "
+"ááá ááááá, á ááááá¨ááª 
ááá§áá¤ááááá áá á¡áá ááááááá, á 
áááááááª áá¬á§áááááá."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -643,6 +650,8 @@ msgid ""
 "This way, we can learn how to facilitate better access to information "
 "through Tor. By listening, we learn."
 msgstr ""
+"áá áááá, á©ááá áááááá, áá£ á áááá  
áááá£ááááááá á®ááá®á¡ ááá¤áá 
áááªááá¡ááá á¬ááááá Tor-"
+"áá¡ á¡áá¨á£áááááá. á¡á®ááááá¡ 
ááá¡ááááá, á©ááá áá¡á¬áááááá."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -659,6 +668,13 @@ msgid ""
 
"form](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2021/consent_form.md)"
 " beforehand."
 msgstr ""
+"á©ááá áá  ááááá®ááá áá áá  
ááá¥ááá§áááá á¡áá®ááááá¡ áá 
á¡ááááá¢áá¥á¢á ááá¤áá áááªááá¡ 
ááááááá¡"
+" ááááá¬ááááááá¡ á¨áá¡áá®áá, 
áááá¡ááá, ááááá¡áááá  áá áá¡, á ááªá 
áááááá ááá áááá "
+"áááááªáááááá¡ áááá£á¨áááááá¡ 
(ááááá®ááá£á áááá¡ ááá¦áááá¡áá¡, 
áááá®ááá áá¡ á¬áá áááááá¡áá¡ áá "
+"á¡á®áá á©áááá¬áá áááá¡áááá¡) 
áá£áªááááááá á£ááá ááá®áááá á¬áá 
ááááááá ááááá ááá, "
+"[áááá®ááááá¡ "
+"á¡ááá£ááá](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scriptsndctivities/2021/consent_form.md),"
+" á¬áááá¡á¬áá áá."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -671,6 +687,8 @@ msgid ""
 "You don't have to do this alone - we can support you with meetings, guides, "
 "and mentorship too if you wish."
 msgstr ""
+"ááá á¢áá¡ áá  ááááá¬ááá áááá¡ 
áááááááá - áá®áá á¡ ááááááá á 
á¨áá®áááá áááá, "
+"á¡áá®áááá«á¦ááááááááááá áá áá 
á©ááááááá, á¡á£á ááááá¡ 
á¨áááá®ááááá¨á."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research

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

2021-06-16 Thread translation

commit 94f91aceed3060fdfbc3d2720804e816b549a80c
Author: Translation commit bot 
Date:   Thu Jun 17 05:45:16 2021 +


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

diff --git a/contents+ka.po b/contents+ka.po
index 1866a6df75..0cdd256023 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -752,7 +752,7 @@ msgstr ""
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
 msgid "## The interview process"
-msgstr ""
+msgstr "## ááá¡áá£áá áááá¡ áááááááá 
áááá"
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -760,11 +760,13 @@ msgid ""
 "Thank the participant for their willingness to participate and explain that "
 "we are testing the product, not them."
 msgstr ""
+"ááááááá áááá®á¡áá¡ááá 
áááááá£áá¡, ááááá¬ááááááá¡ á¡á£á 
ááááá¡ áááááá¥ááá¡áááá¡ áá "
+"áááá£ááá á¢áá, á áá á©ááá 
ááááá¬áááá áá®áááá áá ááá£á¥á¢á¡ áá 
áá á ááá."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
 msgid "The interview should not last longer than 20 minutes."
-msgstr ""
+msgstr "ááá¡áá£áá áááá, áá  á£ááá 
ááá¡á¢áááá¡ 20 á¬á£ááá ááá¢á®ááá¡."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -772,6 +774,7 @@ msgid ""
 "You can take notes on the printed material you will carry with you, or on "
 "your computer."
 msgstr ""
+"á©áááá¨áááááá¡áááá¡ á¨áááá«ááá 
áááááá§áááá áááááááááá 
ááá¡ááááá áá áááááá£á¢áá á."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -793,6 +796,7 @@ msgstr ""
 msgid ""
 "Don't forget to thank the participant again at the end of the interview."
 msgstr ""
+"áá  ááááááá¬á§ááá, ááááá 
ááááá£á®áááá ááááááá 
ááááá¬áááááá¡ ááá¡áá£áá áááá¡ 
ááááá¡."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -826,11 +830,13 @@ msgid ""
 "Their feedback can also take the form of questions - keep in mind that any "
 "feedback is a good feedback."
 msgstr ""
+"ááááá®ááá£á ááá á¨áá¡áá«ááá áá§áá¡ 
áááá®ááááá¡ á¡áá®ááááª â 
áááá®á¡áááá, ááááá¡áááá á á¡áá®áá¡ "
+"á£áá£áááá¨áá á ááá¡áá¦áááá."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
 msgid "It's very important for us to hear back from you too."
-msgstr ""
+msgstr "á©ááááááá¡ áááá¨áááááááááá 
áá¥áááá ááááá®ááá£á ááá."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -889,6 +895,8 @@ msgid ""
 "3. Create issues in the [Research "
 "repository](https://gitlab.torproject.org/tpo/ux/research/-/issues)."
 msgstr ""
+"3. á¬ááááá¬á§áá áááá®áááá, 
[ááááááááá¡ "
+"á¡ááªááá¨á](https://gitlab.torproject.org/tpo/ux/research/-/issues)."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -896,6 +904,8 @@ msgid ""
 "4. Allow the UX team time to discuss each issue and forward it to developers"
 " when necessary."
 msgstr ""
+"4. á¡áá¨á£áááááá¡ ááá¡áªááá¡ UX-áá£ááá¡ 
áááá¦áá¡ ááááá¬áááááá 
áááá®ááááá¨á áá "
+"áááááááá¡áááá áááá¡ 
á¨áááá£á¨áááááááááá, á¡áááá 
ááááá¡ á¨áááá®ááááá¨á."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -905,7 +915,7 @@ msgstr "## ááááá¢ááááá 
ááá£áááá"
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
 msgid "From the Tor Project:"
-msgstr ""
+msgstr "Tor-áá ááá¥á¢áááá:"
 
 #:

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

2021-06-16 Thread translation

commit c21b7d4443f3dc377037dbd8c82db824dbfed069
Author: Translation commit bot 
Date:   Thu Jun 17 05:15:19 2021 +


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

diff --git a/contents+ka.po b/contents+ka.po
index 442b892c35..1866a6df75 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -579,6 +579,8 @@ msgid ""
 "Congrats! You're going to run your first User Research session for Tor â 
and"
 " we're delighted to have you on board!"
 msgstr ""
+"áááááªááá! áá¥ááá áááá ááá ááá 
áááá á¡ááááá®ááá áááá ááááááá¡ 
á©áá¢áá áááá¡ Tor-áá â "
+"ááá®áá á£ááá ááá á á áá á¨áááááááá 
áááá!"
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -586,6 +588,8 @@ msgid ""
 "Here you will find helpful guidelines that are designed to make your "
 "research easier for both you and your audience."
 msgstr ""
+"áá¥, áá¥ááá áá®ááááá ááááá¡áááá 
áááááááááá¡, ááááá£áááááá¡ 
ááááááá¡ ááá¡ááááááááááá "
+"á áááá áª áá¥ááááááá¡, áá¡ááá 
áá¥áááá¡ ááááááá¨á 
ááá¬ááá£ááááááá¡."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -674,6 +678,8 @@ msgid ""
 "Join us at any time on our IRC channel #tor-ux or our [mailing "
 "list](https://lists.torproject.org/cgi-bin/mailman/listinfo/ux)."
 msgstr ""
+"ááá¬ááá áááááá á©áááá IRC-áá¡ áá 
á®áá #tor-ux áá [tor-áá¡ ááá ááááá¡ 
á¡áá¤áá¡á¢á "
+"á¯áá£á¤á¨á](https://lists.torproject.org/cgi-bin/mailman/listinfo/ux)."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -695,6 +701,8 @@ msgid ""
 "When the training commences, be sure to let everyone know your role and why "
 "you're taking notes during the session."
 msgstr ""
+"áááááááááááá¡ á¡áá¬á§áá¡ áá¢áááá, 
ááá á¬áá£áááá á áá á§ááááá ááªáá¡ 
áá¥áááá áááááááááááá¡ "
+"á¨áá¡áá®áá áá áá£ á áá¢áá ááááááá 
á©áááá¨ááááá¡ áááááááá ááááá¡áá¡."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -724,6 +732,8 @@ msgid ""
 "It's easier to have this material printed and in hand, however if you prefer"
 " you can use digital copies instead."
 msgstr ""
+"á£á¤á á ááá á¢áááá áá á¡ááá£ááááá¡ 
ááááááááá áá á®áááá á¥ááá, áááá 
áá áá£ ááá á©áááááá, "
+"á£áá áááá áááááá£á¢áá á¨á ááá 
áá¤ááááª ááááááááá."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -736,6 +746,8 @@ msgid ""
 "If you're planning to install any Tor software during your exercise or "
 "interviews you may need to download it before the session."
 msgstr ""
+"áá£ ááááááá á ááááááá Tor-áá ááá 
áááá¡ ááá§áááááá¡ áááááªááá¡ áá 
ááá¡áá£áá áááá¡ "
+"áááááááá ááááá¡áá¡, áááááá 
ááááá á¬áááá¡á¬áá  á©áááá¢ááá ááá, 
á¨áá®áááá áá¡ ááá¬á§áááááá."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/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/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed

2021-06-16 Thread translation

commit 924658ff047a6824dd82809db3d3f0459f7e10a1
Author: Translation commit bot 
Date:   Thu Jun 17 02:17:51 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
---
 zh-CN/network-settings.dtd | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/zh-CN/network-settings.dtd b/zh-CN/network-settings.dtd
index 8bfd7a82f1..eebd84f91a 100644
--- a/zh-CN/network-settings.dtd
+++ b/zh-CN/network-settings.dtd
@@ -66,6 +66,9 @@
 
 
 
+
+
+
 
 
 

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

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

2021-06-16 Thread translation

commit 7637043a6a8b2ffeb18ba3c75ad306cd6543ae0a
Author: Translation commit bot 
Date:   Thu Jun 17 02:17:49 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
---
 zh-CN/network-settings.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zh-CN/network-settings.dtd b/zh-CN/network-settings.dtd
index 3967500bfe..b22a8a662a 100644
--- a/zh-CN/network-settings.dtd
+++ b/zh-CN/network-settings.dtd
@@ -66,9 +66,9 @@
 
 
 
-
-
-
+
+
+
 
 
 

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

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

2021-06-16 Thread translation

commit f9863282f8acfe66a9bf317cd20a160824f9c3a0
Author: Translation commit bot 
Date:   Wed Jun 16 22:17:29 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
---
 pt-BR/network-settings.dtd | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pt-BR/network-settings.dtd b/pt-BR/network-settings.dtd
index e42900fe0b..f4cc539af1 100644
--- a/pt-BR/network-settings.dtd
+++ b/pt-BR/network-settings.dtd
@@ -66,6 +66,9 @@
 
 
 
+
+
+
 
 
 

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

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

2021-06-16 Thread translation

commit 6af43409356d1f3255506ac758d8934c3de75e90
Author: Translation commit bot 
Date:   Wed Jun 16 22:17:27 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
---
 pt-BR/network-settings.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pt-BR/network-settings.dtd b/pt-BR/network-settings.dtd
index 9e4504d1f5..e177e81c8f 100644
--- a/pt-BR/network-settings.dtd
+++ b/pt-BR/network-settings.dtd
@@ -66,9 +66,9 @@
 
 
 
-
-
-
+
+
+
 
 
 

___
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-06-16 Thread translation

commit 1e0e3122010711f3c66d5693c5b1d734b71bd50f
Author: Translation commit bot 
Date:   Wed Jun 16 22:16:22 2021 +

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

diff --git a/pt_BR.po b/pt_BR.po
index 47a365d070..fea8387264 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -36,8 +36,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-28 18:17-0500\n"
-"PO-Revision-Date: 2021-06-01 12:30+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-06-16 22:00+\n"
+"Last-Translator: Eduardo Addad de Oliveira \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2021-06-16 Thread translation

commit 05985a7f2f1c77f908bb3182d6adab0917f0665e
Author: Translation commit bot 
Date:   Wed Jun 16 22:15:44 2021 +

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

diff --git a/pt_BR.po b/pt_BR.po
index 262bd4348a..0ab93c8be0 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -36,8 +36,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-28 18:17-0500\n"
-"PO-Revision-Date: 2021-06-01 12:30+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-06-16 22:00+\n"
+"Last-Translator: Eduardo Addad de Oliveira \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2542,7 +2542,7 @@ msgstr "As pontes sÃ£o relÃ©s secretos do Tor. Use uma 
ponte como seu primeiro r
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:87
 msgid "Learn more about Tor bridges"
-msgstr ""
+msgstr "Saiba mais sobre as pontes 
Tor"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:123
 msgid "Use a default bridge"
@@ -2596,7 +2596,7 @@ msgstr "â¢ Rede pÃºblica"
 msgid ""
 "If you are in a shop, hotel, or airport, you might need to sign in to the "
 "local network using a captive portal."
-msgstr ""
+msgstr "Se vocÃª estiver em uma loja, hotel ou aeroporto, pode ser necessÃ¡rio 
entrar na rede local usando um portal cativo."
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:461
 msgid "Try Signing in to the Network"
@@ -2610,7 +2610,7 @@ msgstr "â¢ Proxy local"
 msgid ""
 "If you are on a corporate or university network, you might need to configure"
 " a local proxy."
-msgstr ""
+msgstr "Se vocÃª estiver em uma rede corporativa ou universitÃ¡ria, pode ser 
necessÃ¡rio configurar um proxy local."
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:531
 msgid "Configure a Local _Proxy"
@@ -2696,13 +2696,13 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1091
 msgid "Connect to a local network"
-msgstr ""
+msgstr "Conecte-se a uma rede local"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1108
 msgid ""
 "You are not connected to a local network yet. To be able to connect to the "
 "Tor network, you first need to connect to a Wi-Fi, wire, or mobile network."
-msgstr ""
+msgstr "VocÃª ainda nÃ£o estÃ¡ conectado a uma rede local. Para poder se 
conectar Ã  rede Tor, primeiro vocÃª precisa se conectar a uma rede Wi-Fi, com 
fio ou mÃ³vel."
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1124
 msgid ""
@@ -2761,7 +2761,7 @@ msgstr "Redefinir conexÃ£o do Tor"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1551
 msgid "Configure a Local Proxy"
-msgstr ""
+msgstr "Configurar um proxy local"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1577
 msgid "Proxy Type"

___
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-89.0-10.0-1] Bug 30605: Honor privacy.spoof_english in Android

2021-06-16 Thread boklm

commit d775894d3f541f26c0eb71a5208ff409e6c91d74
Author: Alex Catarineu 
Date:   Fri Oct 16 10:45:17 2020 +0200

Bug 30605: Honor privacy.spoof_english in Android

This checks `privacy.spoof_english` whenever `setLocales` is
called from Fenix side and sets `intl.accept_languages`
accordingly.
---
 mobile/android/components/geckoview/GeckoViewStartup.jsm | 5 +
 1 file changed, 5 insertions(+)

diff --git a/mobile/android/components/geckoview/GeckoViewStartup.jsm 
b/mobile/android/components/geckoview/GeckoViewStartup.jsm
index 3603c3743fa1..b73a5f4f0978 100644
--- a/mobile/android/components/geckoview/GeckoViewStartup.jsm
+++ b/mobile/android/components/geckoview/GeckoViewStartup.jsm
@@ -17,6 +17,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   EventDispatcher: "resource://gre/modules/Messaging.jsm",
   Preferences: "resource://gre/modules/Preferences.jsm",
   Services: "resource://gre/modules/Services.jsm",
+  RFPHelper: "resource://gre/modules/RFPHelper.jsm",
 });
 
 const { debug, warn } = GeckoViewUtils.initLogging("Startup");
@@ -252,6 +253,10 @@ class GeckoViewStartup {
 if (aData.requestedLocales) {
   Services.locale.requestedLocales = aData.requestedLocales;
 }
+RFPHelper._handleSpoofEnglishChanged();
+if (Services.prefs.getIntPref("privacy.spoof_english", 0) === 2) {
+  break;
+}
 const pls = Cc["@mozilla.org/pref-localizedstring;1"].createInstance(
   Ci.nsIPrefLocalizedString
 );



___
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-89.0-10.0-1] Bug 40432: Prevent probing installed applications

2021-06-16 Thread boklm

commit 6bfc20432cd05696d0e9cd24f68efbd6383766b8
Author: Matthew Finkel 
Date:   Mon May 17 18:09:09 2021 +

Bug 40432: Prevent probing installed applications
---
 .../exthandler/nsExternalHelperAppService.cpp  | 30 ++
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp 
b/uriloader/exthandler/nsExternalHelperAppService.cpp
index e46df70429c2..d5851413011a 100644
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -1049,8 +1049,33 @@ nsresult nsExternalHelperAppService::GetFileTokenForPath(
 
//
 // begin external protocol service default implementation...
 
//
+
+static const char kExternalProtocolPrefPrefix[] =
+"network.protocol-handler.external.";
+static const char kExternalProtocolDefaultPref[] =
+"network.protocol-handler.external-default";
+
 NS_IMETHODIMP nsExternalHelperAppService::ExternalProtocolHandlerExists(
 const char* aProtocolScheme, bool* aHandlerExists) {
+
+  // Replicate the same check performed in LoadURI.
+  // Deny load if the prefs say to do so
+  nsAutoCString externalPref(kExternalProtocolPrefPrefix);
+  externalPref += aProtocolScheme;
+  bool allowLoad = false;
+  *aHandlerExists = false;
+  if (NS_FAILED(Preferences::GetBool(externalPref.get(), &allowLoad))) {
+// no scheme-specific value, check the default
+if (NS_FAILED(
+Preferences::GetBool(kExternalProtocolDefaultPref, &allowLoad))) {
+  return NS_OK;  // missing default pref
+}
+  }
+
+  if (!allowLoad) {
+return NS_OK;  // explicitly denied
+  }
+
   nsCOMPtr handlerInfo;
   nsresult rv = GetProtocolHandlerInfo(nsDependentCString(aProtocolScheme),
getter_AddRefs(handlerInfo));
@@ -1093,11 +1118,6 @@ NS_IMETHODIMP 
nsExternalHelperAppService::IsExposedProtocol(
   return NS_OK;
 }
 
-static const char kExternalProtocolPrefPrefix[] =
-"network.protocol-handler.external.";
-static const char kExternalProtocolDefaultPref[] =
-"network.protocol-handler.external-default";
-
 NS_IMETHODIMP
 nsExternalHelperAppService::LoadURI(nsIURI* aURI,
 nsIPrincipal* aTriggeringPrincipal,

___
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-89.0-10.0-1] Bug 40025: Remove Mozilla add-on install permissions

2021-06-16 Thread boklm

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

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

diff --git a/browser/app/permissions b/browser/app/permissions
index 4938bd1e22e5..5c4c302f5ba5 100644
--- a/browser/app/permissions
+++ b/browser/app/permissions
@@ -11,11 +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://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-89.0-10.0-1] Bug 40309: Avoid using regional OS locales

2021-06-16 Thread boklm

commit 02a2e317b6b82173b28767179273dd4c751eb486
Author: Alex Catarineu 
Date:   Wed Jan 27 11:28:05 2021 +0100

Bug 40309: Avoid using regional OS locales

Only use regional OS locales if the pref
`intl.regional_prefs.use_os_locales` is set to true.
---
 intl/locale/LocaleService.cpp | 25 -
 1 file changed, 25 deletions(-)

diff --git a/intl/locale/LocaleService.cpp b/intl/locale/LocaleService.cpp
index 022d41cab2e2..ac001ee98991 100644
--- a/intl/locale/LocaleService.cpp
+++ b/intl/locale/LocaleService.cpp
@@ -452,31 +452,6 @@ 
LocaleService::GetRegionalPrefsLocales(nsTArray& aRetVal) {
 OSPreferences::GetInstance()->GetRegionalPrefsLocales(aRetVal))) {
   return NS_OK;
 }
-
-// If we fail to retrieve them, return the app locales.
-GetAppLocalesAsBCP47(aRetVal);
-return NS_OK;
-  }
-
-  // Otherwise, fetch OS Regional Preferences locales and compare the first one
-  // to the app locale. If the language subtag matches, we can safely use
-  // the OS Regional Preferences locale.
-  //
-  // This facilitates scenarios such as Firefox in "en-US" and User sets
-  // regional prefs to "en-GB".
-  nsAutoCString appLocale;
-  AutoTArray regionalPrefsLocales;
-  LocaleService::GetInstance()->GetAppLocaleAsBCP47(appLocale);
-
-  if (NS_FAILED(OSPreferences::GetInstance()->GetRegionalPrefsLocales(
-  regionalPrefsLocales))) {
-GetAppLocalesAsBCP47(aRetVal);
-return NS_OK;
-  }
-
-  if (LocaleService::LanguagesMatch(appLocale, regionalPrefsLocales[0])) {
-aRetVal = regionalPrefsLocales.Clone();
-return NS_OK;
   }
 
   // Otherwise use the app locales.



___
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-89.0-10.0-1] Bug 40073: Disable remote Public Suffix List fetching

2021-06-16 Thread boklm

commit 0ca09690e38766299807790e66a89e83134c9a8b
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 83ee86fc79cf..bf14d06f9c1d 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -68,7 +68,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",
@@ -2647,10 +2646,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-89.0-10.0-1] Bug 40198: Expose privacy.spoof_english pref in GeckoView

2021-06-16 Thread boklm

commit 00136a192b4cb51303f9206d5c76c0b5ee19d4fb
Author: Alex Catarineu 
Date:   Sun Oct 18 17:06:04 2020 +0200

Bug 40198: Expose privacy.spoof_english pref in GeckoView
---
 mobile/android/geckoview/api.txt   |  3 ++
 .../mozilla/geckoview/GeckoRuntimeSettings.java| 33 ++
 2 files changed, 36 insertions(+)

diff --git a/mobile/android/geckoview/api.txt b/mobile/android/geckoview/api.txt
index 36d6dd73a818..199428e13563 100644
--- a/mobile/android/geckoview/api.txt
+++ b/mobile/android/geckoview/api.txt
@@ -684,6 +684,7 @@ package org.mozilla.geckoview {
 method public boolean getRemoteDebuggingEnabled();
 method @Nullable public GeckoRuntime getRuntime();
 method @Nullable public Rect getScreenSizeOverride();
+method public boolean getSpoofEnglish();
 method @Nullable public RuntimeTelemetry.Delegate getTelemetryDelegate();
 method public int getTorSecurityLevel();
 method public boolean getUseMaxScreenDepth();
@@ -705,6 +706,7 @@ package org.mozilla.geckoview {
 method @NonNull public GeckoRuntimeSettings 
setLoginAutofillEnabled(boolean);
 method @NonNull public GeckoRuntimeSettings setPreferredColorScheme(int);
 method @NonNull public GeckoRuntimeSettings 
setRemoteDebuggingEnabled(boolean);
+method @NonNull public GeckoRuntimeSettings setSpoofEnglish(boolean);
 method @NonNull public GeckoRuntimeSettings setTorSecurityLevel(int);
 method @NonNull public GeckoRuntimeSettings setWebFontsEnabled(boolean);
 method @NonNull public GeckoRuntimeSettings setWebManifestEnabled(boolean);
@@ -745,6 +747,7 @@ package org.mozilla.geckoview {
 method @NonNull public GeckoRuntimeSettings.Builder 
preferredColorScheme(int);
 method @NonNull public GeckoRuntimeSettings.Builder 
remoteDebuggingEnabled(boolean);
 method @NonNull public GeckoRuntimeSettings.Builder 
screenSizeOverride(int, int);
+method @NonNull public GeckoRuntimeSettings.Builder spoofEnglish(boolean);
 method @NonNull public GeckoRuntimeSettings.Builder 
telemetryDelegate(@NonNull RuntimeTelemetry.Delegate);
 method @NonNull public GeckoRuntimeSettings.Builder torSecurityLevel(int);
 method @NonNull public GeckoRuntimeSettings.Builder 
useMaxScreenDepth(boolean);
diff --git 
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
 
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
index 2e3275f4da36..1f94c3b14fd0 100644
--- 
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
+++ 
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
@@ -483,6 +483,17 @@ public final class GeckoRuntimeSettings extends 
RuntimeSettings {
 getSettings().mTorSecurityLevel.set(level);
 return this;
 }
+
+/**
+ * Sets whether we should spoof locale to English for webpages.
+ *
+ * @param flag True if we should spoof locale to English for webpages, 
false otherwise.
+ * @return This Builder instance.
+ */
+public @NonNull Builder spoofEnglish(final boolean flag) {
+getSettings().mSpoofEnglish.set(flag ? 2 : 1);
+return this;
+}
 }
 
 private GeckoRuntime mRuntime;
@@ -541,6 +552,8 @@ public final class GeckoRuntimeSettings extends 
RuntimeSettings {
 "dom.ipc.processCount", BuildConfig.RELEASE_OR_BETA ? 1 : 2);
 /* package */ final Pref mTorSecurityLevel = new Pref<>(
 "extensions.torbutton.security_slider", 4);
+/* package */ final Pref mSpoofEnglish = new Pref<>(
+"privacy.spoof_english", 0);
 
 /* package */ int mPreferredColorScheme = COLOR_SCHEME_SYSTEM;
 
@@ -1294,6 +1307,26 @@ public final class GeckoRuntimeSettings extends 
RuntimeSettings {
 return this;
 }
 
+/**
+ * Get whether we should spoof locale to English for webpages.
+ *
+ * @return Whether we should spoof locale to English for webpages.
+ */
+public boolean getSpoofEnglish() {
+return mSpoofEnglish.get() == 2;
+}
+
+/**
+ * Set whether we should spoof locale to English for webpages.
+ *
+ * @param flag A flag determining whether we should locale to English for 
webpages.
+ * @return This GeckoRuntimeSettings instance.
+ */
+public @NonNull GeckoRuntimeSettings setSpoofEnglish(final boolean flag) {
+mSpoofEnglish.commit(flag ? 2 : 1);
+return this;
+}
+
 @Override // Parcelable
 public void writeToParcel(final Parcel out, final int flags) {
 super.writeToParcel(out, flags);



___
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-89.0-10.0-1] Bug 32418: Allow updates to be disabled via an enterprise policy.

2021-06-16 Thread boklm

commit 4d291b6d0882da21fa61c0e0d24937c500507055
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
---
 .../enterprisepolicies/EnterprisePoliciesParent.jsm| 14 --
 toolkit/components/enterprisepolicies/moz.build|  3 +++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm 
b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm
index 775144e8a649..9fe916236cbc 100644
--- a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm
+++ b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm
@@ -4,6 +4,10 @@
 
 var EXPORTED_SYMBOLS = ["EnterprisePoliciesManager"];
 
+// 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"
 );
@@ -13,9 +17,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",
@@ -140,11 +146,13 @@ EnterprisePoliciesManager.prototype = {
 
   _chooseProvider() {
 let platformProvider = null;
+#ifndef AVOID_SYSTEM_POLICIES
 if (AppConstants.platform == "win") {
   platformProvider = new WindowsGPOPoliciesProvider();
 } else if (AppConstants.platform == "macosx") {
   platformProvider = new macOSPoliciesProvider();
 }
+#endif
 let jsonProvider = new JSONPoliciesProvider();
 if (platformProvider && platformProvider.hasPolicies) {
   if (jsonProvider.hasPolicies) {
@@ -491,7 +499,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
@@ -504,7 +512,7 @@ class JSONPoliciesProvider {
 return systemConfigFile;
   }
 }
-
+#endif
 try {
   let perUserPath = Services.prefs.getBoolPref(PREF_PER_USER_DIR, false);
   if (perUserPath) {
@@ -585,6 +593,7 @@ class JSONPoliciesProvider {
   }
 }
 
+#ifndef AVOID_SYSTEM_POLICIES
 class WindowsGPOPoliciesProvider {
   constructor() {
 this._policies = null;
@@ -686,3 +695,4 @@ class CombinedProvider {
 return false;
   }
 }
+#endif
diff --git a/toolkit/components/enterprisepolicies/moz.build 
b/toolkit/components/enterprisepolicies/moz.build
index 09d2046e1bd7..3f685d3fbbd6 100644
--- a/toolkit/components/enterprisepolicies/moz.build
+++ b/toolkit/components/enterprisepolicies/moz.build
@@ -19,6 +19,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android":
 EXTRA_JS_MODULES += [
 "EnterprisePolicies.jsm",
 "EnterprisePoliciesContent.jsm",
+]
+
+EXTRA_PP_JS_MODULES += [
 "EnterprisePoliciesParent.jsm",
 ]
 



___
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-89.0-10.0-1] Bug 40002: Remove about:ion

2021-06-16 Thread boklm

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

Bug 40002: Remove about:ion

Firefox Ion (previously 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 6e79b6d6e94b..e0ab735612e5 100644
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -126,8 +126,6 @@ static const RedirEntry kRedirMap[] = {
  nsIAboutModule::URI_MUST_LOAD_IN_CHILD |
  nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
  nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},
-{"ion", "chrome://browser/content/ion.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 17fecfd9a1fb..dd27a8b2c443 100644
--- a/browser/components/about/components.conf
+++ b/browser/components/about/components.conf
@@ -14,7 +14,6 @@ pages = [
 'loginsimportreport',
 'newinstall',
 'newtab',
-'ion',
 'pocket-home',
 'pocket-saved',
 'pocket-signup',



___
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-89.0-10.0-1] Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots

2021-06-16 Thread boklm

commit f77b03be8359a50021667ca654133dcd48f092a0
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 0200e68b5ce1..ea1aaa704e8b 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -319,6 +319,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 cac1f2e0a8c4..86018ddfc67e 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -1371,6 +1371,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-89.0-10.0-1] Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop

2021-06-16 Thread boklm

commit 67f61c285733818b666cf0d5122d4affba43c7b2
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| 10 --
 .../mozapps/extensions/internal/XPIProvider.jsm| 13 
 3 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/browser/components/BrowserGlue.jsm 
b/browser/components/BrowserGlue.jsm
index bf14d06f9c1d..cac1f2e0a8c4 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -43,6 +43,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   DownloadsViewableInternally:
 "resource:///modules/DownloadsViewableInternally.jsm",
   E10SUtils: "resource://gre/modules/E10SUtils.jsm",
+  ExtensionData: "resource://gre/modules/Extension.jsm",
   ExtensionsUI: "resource:///modules/ExtensionsUI.jsm",
   FeatureGate: "resource://featuregates/FeatureGate.jsm",
   FirefoxMonitor: "resource:///modules/FirefoxMonitor.jsm",
@@ -118,6 +119,13 @@ XPCOMUtils.defineLazyServiceGetters(this, {
   PushService: ["@mozilla.org/push/Service;1", "nsIPushService"],
 });
 
+XPCOMUtils.defineLazyServiceGetters(this, {
+  resProto: [
+"@mozilla.org/network/protocol;1?name=resource",
+"nsISubstitutingProtocolHandler",
+  ],
+});
+
 const PREF_PDFJS_ISDEFAULT_CACHE_STATE = "pdfjs.enabledCache.state";
 
 /**
@@ -1388,6 +1396,35 @@ BrowserGlue.prototype = {
   "resource://builtin-themes/alpenglow/"
 );
 
+// 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 ae2bf4ce646f..fb390131c172 100644
--- a/toolkit/components/extensions/Extension.jsm
+++ b/toolkit/components/extensions/Extension.jsm
@@ -212,6 +212,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`
@@ -358,7 +359,8 @@ var ExtensionAddonObserver = {
   );
 }
 
-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)`,
@@ -406,7 +408,8 @@ 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);
 }
@@ -2594,7 +2597,8 @@ class Extension extends ExtensionData {
   );
 } else if

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware

2021-06-16 Thread boklm

commit c4dcf969e825f5682c1ad42c6838eee43af9093f
Author: Alex Catarineu 
Date:   Wed Nov 4 15:58:22 2020 +0100

Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware
---
 .../main/java/org/mozilla/geckoview/WebRequest.java| 18 ++
 widget/android/WebExecutorSupport.cpp  | 10 ++
 2 files changed, 28 insertions(+)

diff --git 
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java 
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java
index d1d6e06b7396..4e17bc034edb 100644
--- 
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java
+++ 
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java
@@ -51,6 +51,11 @@ public class WebRequest extends WebMessage {
  */
 public final @Nullable String referrer;
 
+/**
+ * The value of the origin of this request.
+ */
+public final @Nullable String origin;
+
 @Retention(RetentionPolicy.SOURCE)
 @IntDef({CACHE_MODE_DEFAULT, CACHE_MODE_NO_STORE,
 CACHE_MODE_RELOAD, CACHE_MODE_NO_CACHE,
@@ -112,6 +117,7 @@ public class WebRequest extends WebMessage {
 method = builder.mMethod;
 cacheMode = builder.mCacheMode;
 referrer = builder.mReferrer;
+origin = builder.mOrigin;
 
 if (builder.mBody != null) {
 body = builder.mBody.asReadOnlyBuffer();
@@ -128,6 +134,7 @@ public class WebRequest extends WebMessage {
 /* package */ String mMethod = "GET";
 /* package */ int mCacheMode = CACHE_MODE_DEFAULT;
 /* package */ String mReferrer;
+/* package */ String mOrigin;
 
 /**
  * Construct a Builder instance with the specified URI.
@@ -226,6 +233,17 @@ public class WebRequest extends WebMessage {
 return this;
 }
 
+/**
+ * Set the origin URI.
+ *
+ * @param origin A URI String
+ * @return This Builder instance.
+ */
+public @NonNull Builder origin(final @Nullable String origin) {
+mOrigin = origin;
+return this;
+}
+
 /**
  * @return A {@link WebRequest} constructed with the values from this 
Builder instance.
  */
diff --git a/widget/android/WebExecutorSupport.cpp 
b/widget/android/WebExecutorSupport.cpp
index 99e7de95a0fb..bbdcc8f36bd6 100644
--- a/widget/android/WebExecutorSupport.cpp
+++ b/widget/android/WebExecutorSupport.cpp
@@ -393,6 +393,16 @@ nsresult WebExecutorSupport::CreateStreamLoader(
   MOZ_ASSERT(cookieJarSettings);
 
   nsCOMPtr loadInfo = channel->LoadInfo();
+
+  RefPtr originUri;
+  const auto origin = req->Origin();
+  if (origin) {
+rv = NS_NewURI(getter_AddRefs(originUri), origin->ToString());
+NS_ENSURE_SUCCESS(rv, NS_ERROR_MALFORMED_URI);
+OriginAttributes attrs = loadInfo->GetOriginAttributes();
+attrs.SetFirstPartyDomain(true, originUri);
+loadInfo->SetOriginAttributes(attrs);
+  }
   loadInfo->SetCookieJarSettings(cookieJarSettings);
 
   // setup http/https specific things



___
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-89.0-10.0-1] Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView

2021-06-16 Thread boklm

commit 1e4856e1a24c459544320c71716ce99658a880e8
Author: Alex Catarineu 
Date:   Tue Oct 20 17:44:36 2020 +0200

Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView
---
 .../mozilla/geckoview/GeckoRuntimeSettings.java| 28 +-
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git 
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
 
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
index 5b9e823dc42c..2e3275f4da36 100644
--- 
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
+++ 
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
@@ -796,19 +796,25 @@ public final class GeckoRuntimeSettings extends 
RuntimeSettings {
 private String computeAcceptLanguages() {
 final ArrayList locales = new ArrayList();
 
-// Explicitly-set app prefs come first:
-if (mRequestedLocales != null) {
-for (final String locale : mRequestedLocales) {
-locales.add(locale.toLowerCase(Locale.ROOT));
-}
-}
-// OS prefs come second:
-for (final String locale : getDefaultLocales()) {
-final String localeLowerCase = locale.toLowerCase(Locale.ROOT);
-if (!locales.contains(localeLowerCase)) {
-locales.add(localeLowerCase);
+// In Desktop, these are defined in the `intl.accept_languages` 
localized property.
+// At some point we should probably use the same values here, but for 
now we use a simple
+// strategy which will hopefully result in reasonable acceptLanguage 
values.
+if (mRequestedLocales != null && mRequestedLocales.length > 0) {
+String locale = mRequestedLocales[0].toLowerCase(Locale.ROOT);
+// No need to include `en-us` twice.
+if (!locale.equals("en-us")) {
+locales.add(locale);
+if (locale.contains("-")) {
+String lang = locale.split("-")[0];
+// No need to include `en` twice.
+if (!lang.equals("en")) {
+locales.add(lang);
+}
+}
 }
 }
+locales.add("en-us");
+locales.add("en");
 
 return TextUtils.join(",", locales);
 }



___
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-89.0-10.0-1] Bug 40125: Expose Security Level pref in GeckoView

2021-06-16 Thread boklm

commit 420f3871cc6519960a1eb4b4d4d7fda3ac7f61a8
Author: Matthew Finkel 
Date:   Mon Sep 14 02:52:28 2020 +

Bug 40125: Expose Security Level pref in GeckoView
---
 mobile/android/geckoview/api.txt   |  3 ++
 .../mozilla/geckoview/GeckoRuntimeSettings.java| 33 ++
 2 files changed, 36 insertions(+)

diff --git a/mobile/android/geckoview/api.txt b/mobile/android/geckoview/api.txt
index 0d8eb309dcf4..36d6dd73a818 100644
--- a/mobile/android/geckoview/api.txt
+++ b/mobile/android/geckoview/api.txt
@@ -685,6 +685,7 @@ package org.mozilla.geckoview {
 method @Nullable public GeckoRuntime getRuntime();
 method @Nullable public Rect getScreenSizeOverride();
 method @Nullable public RuntimeTelemetry.Delegate getTelemetryDelegate();
+method public int getTorSecurityLevel();
 method public boolean getUseMaxScreenDepth();
 method public boolean getWebFontsEnabled();
 method public boolean getWebManifestEnabled();
@@ -704,6 +705,7 @@ package org.mozilla.geckoview {
 method @NonNull public GeckoRuntimeSettings 
setLoginAutofillEnabled(boolean);
 method @NonNull public GeckoRuntimeSettings setPreferredColorScheme(int);
 method @NonNull public GeckoRuntimeSettings 
setRemoteDebuggingEnabled(boolean);
+method @NonNull public GeckoRuntimeSettings setTorSecurityLevel(int);
 method @NonNull public GeckoRuntimeSettings setWebFontsEnabled(boolean);
 method @NonNull public GeckoRuntimeSettings setWebManifestEnabled(boolean);
 field public static final int ALLOW_ALL = 0;
@@ -744,6 +746,7 @@ package org.mozilla.geckoview {
 method @NonNull public GeckoRuntimeSettings.Builder 
remoteDebuggingEnabled(boolean);
 method @NonNull public GeckoRuntimeSettings.Builder 
screenSizeOverride(int, int);
 method @NonNull public GeckoRuntimeSettings.Builder 
telemetryDelegate(@NonNull RuntimeTelemetry.Delegate);
+method @NonNull public GeckoRuntimeSettings.Builder torSecurityLevel(int);
 method @NonNull public GeckoRuntimeSettings.Builder 
useMaxScreenDepth(boolean);
 method @NonNull public GeckoRuntimeSettings.Builder 
webFontsEnabled(boolean);
 method @NonNull public GeckoRuntimeSettings.Builder webManifest(boolean);
diff --git 
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
 
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
index 7da945684ed6..5b9e823dc42c 100644
--- 
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
+++ 
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
@@ -472,6 +472,17 @@ public final class GeckoRuntimeSettings extends 
RuntimeSettings {
 getSettings().setAllowInsecureConnections(level);
 return this;
 }
+
+/**
+ * Set security level.
+ *
+ * @param level A value determining the security level. Default is 0.
+ * @return This Builder instance.
+ */
+public @NonNull Builder torSecurityLevel(final int level) {
+getSettings().mTorSecurityLevel.set(level);
+return this;
+}
 }
 
 private GeckoRuntime mRuntime;
@@ -528,6 +539,8 @@ public final class GeckoRuntimeSettings extends 
RuntimeSettings {
 "dom.security.https_only_mode_pbm", false);
 /* package */ final Pref mProcessCount = new Pref<>(
 "dom.ipc.processCount", BuildConfig.RELEASE_OR_BETA ? 1 : 2);
+/* package */ final Pref mTorSecurityLevel = new Pref<>(
+"extensions.torbutton.security_slider", 4);
 
 /* package */ int mPreferredColorScheme = COLOR_SCHEME_SYSTEM;
 
@@ -1255,6 +1268,26 @@ public final class GeckoRuntimeSettings extends 
RuntimeSettings {
 return this;
 }
 
+/**
+ * Gets the current security level.
+ *
+ * @return current security protection level
+ */
+public int getTorSecurityLevel() {
+return mTorSecurityLevel.get();
+}
+
+/**
+ * Sets the Tor Security Level.
+ *
+ * @param level security protection level
+ * @return This GeckoRuntimeSettings instance.
+ */
+public @NonNull GeckoRuntimeSettings setTorSecurityLevel(final int level) {
+mTorSecurityLevel.commit(level);
+return this;
+}
+
 @Override // Parcelable
 public void writeToParcel(final Parcel out, final int flags) {
 super.writeToParcel(out, flags);



___
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-89.0-10.0-1] Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.

2021-06-16 Thread boklm

commit e0dd6fbffdc9a110eac258ff64b3f3cdaff266cb
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 db0b55d26abc..39fd2356ce99 100644
--- a/browser/components/aboutlogins/AboutLoginsParent.jsm
+++ b/browser/components/aboutlogins/AboutLoginsParent.jsm
@@ -61,6 +61,7 @@ XPCOMUtils.defineLazyGetter(this, "AboutLoginsL10n", () => {
 
 const ABOUT_LOGINS_ORIGIN = "about:logins";
 const MASTER_PASSWORD_NOTIFICATION_ID = "master-password-login-required";
+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.
@@ -273,6 +274,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 e3528ca49b84..eaa224178487 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 a7449f8343b3..f288fb6988fb 100644
--- a/browser/components/aboutlogins/content/aboutLogins.js
+++ b/browser/components/aboutlogins/content/aboutLogins.js
@@ -22,6 +22,9 @@ const gElements = {
   ".menuitem-remove-all-logins"
 );
   },
+  get createNewLoginButton() {
+return this.loginList.shadowRoot.querySelector(".create-login-button");
+  },
 };
 
 let numberOfLogins = 0;
@@ -111,6 +114,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 e63192a98e3a..c59eda2dec56 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 6bc14f7892fa..22a06e3727ed 100644
--- a/browser/components/aboutlogins/content/components/menu-button.css
+++ b/browser/components/aboutlogins/content/components/menu-button.css
@@ -91,3 +91,13 @@
 .menuitem-preferences {
   background-image: url("chrome://global/skin/icons/settings.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 mailing list
tor-commits@lists.torproject.org
https:/

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 21952: Implement Onion-Location

2021-06-16 Thread boklm

commit e36989cfd171ea21302df8c4d3709823b0fb0f76
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 |  13 ++
 .../onionservices/OnionLocationChild.jsm   |  39 +
 .../onionservices/OnionLocationParent.jsm  | 168 +
 .../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 |   8 +
 modules/libpref/init/StaticPrefList.yaml   |   5 +
 xpcom/ds/StaticAtoms.py|   1 +
 22 files changed, 398 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 77769a1fe111..6b74c3a8635d 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -50,6 +50,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",
@@ -5319,6 +5320,7 @@ var XULBrowserWindow = {
 CFRPageActions.updatePageActions(gBrowser.selectedBrowser);
 
 AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
+OnionLocationParent.updateOnionLocationBadge(gBrowser.selectedBrowser);
 
 if (!gMultiProcessBrowser) {
   // Bug 1108553 - Cannot rotate images with e10s
@@ -5809,6 +5811,16 @@ var CombinedStopReload = {
 
 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 29d1ad7ac0c2..31e6d23d3f01 100644
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -2031,6 +2031,9 @@
onclick="FullZoom.reset(); FullZoom.resetScalingZoom();"
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(
+  ONIONLOCATION_BUTTON_ID
+);
+
+b

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 28005: Implement .onion alias urlbar rewrites

2021-06-16 Thread boklm

commit d984087bed5b51e97c31efa804acb22580d09ec8
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   |  77 
 .../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  |   8 +
 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 +
 xpcom/reflect/xptinfo/xptinfo.h|   3 +-
 38 files changed, 726 insertions(+), 23 deletions(-)

diff --git a/browser/actors/ClickHandlerChild.jsm 
b/browser/actors/ClickHandlerChild.jsm
index 4f5c2b0b7ea1..3ba2f11bf362 100644
--- a/browser/actors/ClickHandlerChild.jsm
+++ b/browser/actors/ClickHandlerChild.jsm
@@ -114,6 +114,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 0f658fccf7b8..ad8f6c2a27e2 100644
--- a/browser/actors/ClickHandlerParent.jsm
+++ b/browser/actors/ClickHandlerParent.jsm
@@ -98,6 +98,7 @@ class ClickHandlerParent extends JSWindowActorParent {
 let params = {
   charset: browser.characterSet,
   referrerInfo: E10SUtils.deserializeReferrerInfo(data.referrerInfo),
+  onionUrlbarRewritesAllowed: data.onionUrlbarRewritesAllowed,
   isContentWindowPrivate: data.isContentWindowPrivate,
   originPrincipal: data.origin

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 25741 - TBA: Disable GeckoNetworkManager

2021-06-16 Thread boklm

commit cd92dbe435286a396ceae22a0e1b60d370ad714a
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 dd11307320a5..9b8dfcd014cd 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
@@ -123,7 +123,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)
@@ -131,7 +133,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-89.0-10.0-1] Bug 33342: Avoid disconnect search addon error after removal.

2021-06-16 Thread boklm

commit f0a88bba6f976b2fc53ede1f96bf95b9bec2adaa
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 939dd6a70b24..ddf6f0049054 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -959,6 +959,12 @@ var BuiltInLocation = new (class _BuiltInLocation extends 
XPIStateLocation {
   isLinkedAddon(/* aId */) {
 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-89.0-10.0-1] Bug 28125 - Prevent non-Necko network connections

2021-06-16 Thread boklm

commit b786c5e8298f3d7d52ed8a8ed61af0d50d447876
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, 4 insertions(+), 92 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 6e75e6fb4dd5..7faa9bc2821d 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
@@ -490,54 +490,7 @@ public class GeckoMediaDrmBridgeV21 implements 
GeckoMediaDrm {
 
 @Override
 protected Void doInBackground(final Void... params) {
-HttpURLConnection urlConnection = null;
-BufferedReader in = null;
-try {
-final URI finalURI = new URI(mURL + "&signedRequest=" + 
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();
-
-final int responseCode = urlConnection.getResponseCode();
-if (responseCode == HttpURLConnection.HTTP_OK) {
-in = new BufferedReader(new 
InputStreamReader(urlConnection.getInputStream(), UTF_8));
-String inputLine;
-final StringBuffer response = new StringBuffer();
-
-while ((inputLine = in.readLine()) != null) {
-response.append(inputLine);
-}
-in.close();
-mResponseBody = String.valueOf(response).getBytes(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 (final IOException e) {
-Log.e(LOGTAG, "Got exception during posting provisioning 
request ...", e);
-} catch (final URISyntaxException e) {
-Log.e(LOGTAG, "Got exception during creating uri ...", e);
-} finally {
-if (urlConnection != null) {
-urlConnection.disconnect();
-}
-try {
-if (in != null) {
-in.close();
-}
-} catch (final 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 6e5095b0a4c9..a585e283ed4e 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
@@ -46,6 +46,7 @@ import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 
 import org.mozilla.gecko.util.ProxySelector;
+
 /**
  * An {@link HttpDataSource} that uses Android's {@link HttpURLConnection}.
  *
@@ -516,50 +517,8 @@ public class DefaultHttpDataSource extends BaseDataSource 
implements HttpDataSou
   boolean followRedirects,
   Map requestParameters)
   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.setCon

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.

2021-06-16 Thread boklm

commit 97412800c4bbd8bdcd6e41b05d7a817c716e96a3
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
---
 .../java/org/mozilla/gecko/util/ProxySelector.java | 25 +-
 1 file changed, 24 insertions(+), 1 deletion(-)

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 dbd07a069de1..800c7cf96de8 100644
--- 
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
@@ -29,6 +29,10 @@ import java.net.URLConnection;
 import java.util.List;
 
 public class ProxySelector {
+private static final String TOR_PROXY_ADDRESS = "127.0.0.1";
+private static final int TOR_SOCKS_PROXY_PORT = 9150;
+private static final int TOR_HTTP_PROXY_PORT = 8218;
+
 public static URLConnection openConnectionWithProxy(final URI uri) throws 
IOException {
 final java.net.ProxySelector ps = java.net.ProxySelector.getDefault();
 Proxy proxy = Proxy.NO_PROXY;
@@ -39,7 +43,26 @@ public class ProxySelector {
 }
 }
 
-return uri.toURL().openConnection(proxy);
+/* Ignore the proxy we found from the VM, only use Tor. We can probably
+ * safely use the logic in this class in the future. */
+return uri.toURL().openConnection(getProxy());
+}
+
+public static Proxy getProxy() {
+// TODO make configurable
+return new Proxy(Proxy.Type.SOCKS, new 
InetSocketAddress(TOR_PROXY_ADDRESS, TOR_SOCKS_PROXY_PORT));
+}
+
+public static String getProxyHostAddress() {
+return TOR_PROXY_ADDRESS;
+}
+
+public static int getSocksProxyPort() {
+return TOR_SOCKS_PROXY_PORT;
+}
+
+public static int getHttpProxyPort() {
+return TOR_HTTP_PROXY_PORT;
 }
 
 public ProxySelector() {



___
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-89.0-10.0-1] Bug 24796 - Comment out excess permissions from GeckoView

2021-06-16 Thread boklm

commit 30da7d05f1cf7afdb47c9aff534003c9e98fd940
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 a76b6a4754b6..7a2f30708fc3 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-89.0-10.0-1] Bug 27604: Fix addon issues when moving TB directory

2021-06-16 Thread boklm

commit 73ab6aecdd31289199bc0f955665b8d0fe1aa6a9
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 a6e020ecd4c9..939dd6a70b24 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -475,7 +475,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;
 }
 
@@ -488,7 +488,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;
 }
   }
@@ -1449,6 +1452,7 @@ var XPIStates = {
 
   if (shouldRestoreLocationData && 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-89.0-10.0-1] Bug 32220: Improve the letterboxing experience

2021-06-16 Thread boklm

commit 8c3ce8c3bb12feec1e3c28e0a00f19667936f1da
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 21d0b519b89d..37bfd9fbb2f9 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -95,6 +95,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 09b088d59a90..d8d124439cc4 100644
--- a/browser/base/content/tabbrowser-tab.js
+++ b/browser/base/content/tabbrowser-tab.js
@@ -258,6 +258,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 644d8d5fc97c..1732787434a0 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -70,6 +70,12 @@
   background-color: var(--tabpanel-background-color);
 }
 
+/* extend down the toolbar's colors when letterboxing is enabled*/
+#tabbrowser-tabpanels.letterboxing {
+  background-color: var(--toolbar-bgcolor);
+  background-image: var(--toolbar-bgimage);
+}
+
 #tabbrowser-tabs,
 #tabbrowser-arrowscrollbox,
 #tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > 
.tabbrowser-tab[pinned] {
diff --git a/toolkit/components/resistfingerprinting/RFPHelper.jsm 
b/toolkit/components/resistfingerprinting/RFPHelper.jsm
index 166ad21e9013..9520d8720631 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 = calcMargins(containerWidt

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 32658: Create a new MAR signing key

2021-06-16 Thread boklm

commit 08ab29a717ba0c28d9bff68d0acdde53e02250d3
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.

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-89.0-10.0-1] Bug 32092: Fix Tor Browser Support link in preferences

2021-06-16 Thread boklm

commit 436c06187ff23ed3d50f6d3789fa57689052377d
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 a89fddd0306d..ce338584142e 100644
--- a/browser/components/preferences/preferences.js
+++ b/browser/components/preferences/preferences.js
@@ -166,10 +166,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-89.0-10.0-1] Bug 31740: Remove some unnecessary RemoteSettings instances

2021-06-16 Thread boklm

commit 17e6caa5c9239698a16a6657f36659030153bd55
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.
---
 browser/app/profile/000-tor-browser.js |  3 +++
 browser/components/search/SearchSERPTelemetry.jsm  |  6 --
 .../url-classifier/UrlClassifierFeatureBase.cpp|  2 +-
 netwerk/url-classifier/components.conf |  6 --
 security/manager/ssl/RemoteSecuritySettings.jsm| 23 ++
 services/settings/IDBHelpers.jsm   |  4 
 services/settings/dumps/blocklists/moz.build   |  1 -
 services/settings/dumps/main/moz.build |  7 ---
 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 --
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index d54f3aae2557..0200e68b5ce1 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -149,6 +149,9 @@ pref("extensions.fxmonitor.enabled", false);
 pref("signon.management.page.mobileAndroidURL", "");
 pref("signon.management.page.mobileAppleURL", "");
 
+// Disable remote "password recipes"
+pref("signon.recipes.remoteRecipesEnabled", false);
+
 // Disable ServiceWorkers and push notifications by default
 pref("dom.serviceWorkers.enabled", false);
 pref("dom.push.enabled", false);
diff --git a/browser/components/search/SearchSERPTelemetry.jsm 
b/browser/components/search/SearchSERPTelemetry.jsm
index 3e9d92548213..5c499e91713a 100644
--- a/browser/components/search/SearchSERPTelemetry.jsm
+++ b/browser/components/search/SearchSERPTelemetry.jsm
@@ -96,13 +96,7 @@ class TelemetryHandler {
   return;
 }
 
-this._telemetrySettings = RemoteSettings(TELEMETRY_SETTINGS_KEY);
 let rawProviderInfo = [];
-try {
-  rawProviderInfo = await this._telemetrySettings.get();
-} catch (ex) {
-  logConsole.error("Could not get settings:", ex);
-}
 
 // Send the provider info to the child handler.
 this._contentHandler.init(rawProviderInfo);
diff --git a/netwerk/url-classifier/UrlClassifierFeatureBase.cpp 
b/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
index 07da1fd07374..48bcc7d10af9 100644
--- a/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
+++ b/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
@@ -78,7 +78,7 @@ void UrlClassifierFeatureBase::InitializePreferences() {
 
   nsCOMPtr exceptionListService =
   do_GetService("@mozilla.org/url-classifier/exception-list-service;1");
-  if (NS_WARN_IF(!exceptionListService)) {
+  if (!exceptionListService) {
 return;
   }
 
diff --git a/netwerk/url-classifier/components.conf 
b/netwerk/url-classifier/components.conf
index 03a02f0ebeab..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/exception-list-service;1'],
-'jsm': 'resource://gre/modules/UrlClassifierExceptionListService.jsm',
-'constructor': 'UrlClassifierExceptionListService',
-},
 ]
diff --git a/security/manager/ssl/RemoteSecuritySettings.jsm 
b/security/manager/ssl/RemoteSecuritySettings.jsm
index 0beca1424741..1cffbd907bae 100644
--- a/security/manager/ssl/RemoteSecuritySettings.jsm
+++ b/security/manager/ssl/RemoteSecuritySettings.jsm
@@ -336,6 +336,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),
   {
@@ -365,6 +

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 30237: Add v3 onion services client authentication prompt

2021-06-16 Thread boklm

commit c3e113a1a9422187f7f870423b4f9832651a2348
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/browser.js|  10 +
 browser/base/content/browser.xhtml |   3 +
 browser/base/content/certerror/aboutNetError.js|  10 +-
 browser/base/content/certerror/aboutNetError.xhtml |   1 +
 browser/base/content/tab-content.js|   6 +
 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, 1450 insertions(+), 2 deletions(-)

diff --git a/browser/actors/NetErrorChild.jsm b/browser/actors/NetErrorChild.jsm
index 82978412fe24..164fb7c95cd1 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",
@@ -33,6 +35,7 @@ class NetErrorChild extends RemotePageChild {
   "RPMAddToHistogram",
   "RPMRecordTelemetryEvent",
   "RPMGetHttpResponseHeader",
+  "RPMGetTorStrings",
 ];
 this.exportFunctions(exportableFunctions);
   }
@@ -

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 31607: App menu items stop working on macOS

2021-06-16 Thread boklm

commit a9b3dd589a367289d7af82f31ba237add09f2395
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 c7c3da49d86e..1cb1c6f5a7f9 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-89.0-10.0-1] Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor

2021-06-16 Thread boklm

commit 139b3997348fef65e1c7e29f746d634036868ca7
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 | 204 +
 .../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, 2485 insertions(+), 69 deletions(-)

diff --git a/browser/components/moz.build b/browser/components/moz.build
index ef09055b990a..e99fa19d896a 100644
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -55,6 +55,7 @@ DIRS += [
 "syncedtabs",
 "uitour",
 "urlbar",
+"torpreferences",
 "translation",
 ]
 
diff --git a/browser/components/preferences/main.inc.xhtml 
b/browser/components/preferences/main.inc.xhtml
index ea34528e7e65..284f3b4fd384 100644
--- a/browser/components/preferences/main.inc.xhtml
+++ b/browser/components/preferences/main.inc.xhtml
@@ -671,59 +671,4 @@
 
   
 
-
-
-  
-
-
-
-
-  
-
-  
-
-  
-  
-  
-  
-  
-
-
-
-
-  
-
-  
-
 
diff --git a/browser/components/preferences/main.js 
b/browser/components/preferences/main.js
index 2a6ba4a3d8e4..501ba9144a31 100644
--- a/browser/components/preferences/main.js
+++ b/browser/components/preferences/main.js
@@ -368,15 +368,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();
@@ -510,11 +501,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 91e9e469cea2..a89fddd0306d 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";
 
@@ -136,6 +137,14 @@ function init_all() {
 register_module("paneSync", gSyncPane);
   }
   register_module("paneSearchResults", gSearchResultsPane);
+  if (gTorPane.enabled) {
+document.getElementById("category-tor").hidden = false;
+regist

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 27511: Add new identity button to toolbar

2021-06-16 Thread boklm

commit 4de0c9043f2e3ba7b4fb29bedd300fa5fd0d8921
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 6a0e5c0f5831..a90a1bbe8f64 100644
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -2242,6 +2242,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 0aa68e0bceef..f64fd75d3162 100644
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -265,3 +265,6 @@
   skin/classic/browser/places/tree-icons.css   
(../shared/places/tree-icons.css)
   skin/classic/browser/privatebrowsing/aboutPrivateBrowsing.css 
(../shared/privatebrowsing/aboutPrivateBrowsing.css)
   skin/classic/browser/privatebrowsing/favicon.svg 
(../shared/privatebrowsing/favicon.svg)
+
+  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 26c0a1a0a068..06de3149d23b 100644
--- a/browser/themes/shared/menupanel.inc.css
+++ b/browser/themes/shared/menupanel.inc.css
@@ -192,3 +192,11 @@ toolbarpaletteitem[place="palette"] > 
#bookmarks-menu-button,
   list-style-image: url(chrome://browser/skin/fullscreen-exit.svg);
 }
 } /** END Proton **/
+
+#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 09540d3bdf9d..f186e9d48693 100644
--- a/browser/themes/shared/toolbarbutton-icons.inc.css
+++ b/browser/themes/shared/toolbarbutton-icons.inc.css
@@ -219,6 +219,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-89.0-10.0-1] Bug 30541: Disable WebGL readPixel() for web content

2021-06-16 Thread boklm

commit 66a5fcc19195f3e00a9f6d4bb3384650f5dacd3a
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 04867cbcec39..f378315f410e 100644
--- a/dom/canvas/ClientWebGLContext.cpp
+++ b/dom/canvas/ClientWebGLContext.cpp
@@ -4626,6 +4626,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-89.0-10.0-1] Bug 31575: Replace Firefox Home (newtab) with about:tor

2021-06-16 Thread boklm

commit 8d7f76107f13353d739e9afdfd5ee18b7ccac852
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   | 33 ++--
 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(+), 49 deletions(-)

diff --git a/browser/components/BrowserGlue.jsm 
b/browser/components/BrowserGlue.jsm
index b4153484fd76..e476a201a051 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -18,7 +18,6 @@ const { AppConstants } = ChromeUtils.import(
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  AboutNewTab: "resource:///modules/AboutNewTab.jsm",
   ActorManagerParent: "resource://gre/modules/ActorManagerParent.jsm",
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",
@@ -225,28 +224,6 @@ let JSWINDOWACTORS = {
 matches: ["about:newinstall"],
   },
 
-  AboutNewTab: {
-parent: {
-  moduleURI: "resource:///actors/AboutNewTabParent.jsm",
-},
-child: {
-  moduleURI: "resource:///actors/AboutNewTabChild.jsm",
-  events: {
-DOMContentLoaded: {},
-pageshow: {},
-visibilitychange: {},
-  },
-},
-// The wildcard on about:newtab is for the ?endpoint query parameter
-// that is used for snippets debugging. The wildcard for about:home
-// is similar, and also allows for falling back to loading the
-// about:home document dynamically if an attempt is made to load
-// about:home?jscache from the AboutHomeStartupCache as a top-level
-// load.
-matches: ["about:home*", "about:welcome", "about:newtab*"],
-remoteTypes: ["privilegedabout"],
-  },
-
   AboutPlugins: {
 parent: {
   moduleURI: "resource:///actors/AboutPluginsParent.jsm",
@@ -1625,8 +1602,6 @@ BrowserGlue.prototype = {
 
   // the first browser window has finished initializing
   _onFirstWindowLoaded: function BG__onFirstWindowLoaded(aWindow) {
-AboutNewTab.init();
-
 TabCrashHandler.init();
 
 ProcessHangMonitor.init();
@@ -5262,12 +5237,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 is requesting 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 929356c262ee..c600551a0066 100644
--- a/browser/components/newtab/AboutNewTabService.jsm
+++ b/browser/components/newtab/AboutNewTabService.jsm
@@ -422,20 +422,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";
   }
 
   get welcomeURL() {
diff --git a/browser/components/preferences/home.inc.xhtml 
b/browser/components/preferences/home.inc.xhtml
index c348e1cf754b..c37dc5e731f6 100644
--- a/browser/components/preferences/home.inc.xhtml
+++ b/browser/components/preferences/home.inc.xhtml
@@ -33,7 +33,7 @@
 class="check-home-page-controlled"
 data-preference-related="browser.startup.homepage">
 
-  
+  
   
   
 
@@ -85,7 +85,7 @@
 Preferences so we need to handle setting the pref manually.-->
   
 
-  
+  
   
 
   
diff --git a/bro

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 26345: Hide tracking protection UI

2021-06-16 Thread boklm

commit 4039e95cf83535f5edd2427635098ea4a3ec9dd7
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/base/content/browser.xhtml| 4 ++--
 browser/components/about/AboutRedirector.cpp  | 4 
 browser/components/about/components.conf  | 1 -
 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 6a816a75cae9..f6fdd8674e98 100644
--- a/browser/base/content/browser-siteIdentity.js
+++ b/browser/base/content/browser-siteIdentity.js
@@ -960,10 +960,10 @@ var gIdentityHandler = {
   gPermissionPanel.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/base/content/browser.xhtml 
b/browser/base/content/browser.xhtml
index da4188b336e6..6a0e5c0f5831 100644
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -771,7 +771,7 @@
 oncommand="gSync.toggleAccountPanel(this, event)"/>
 
 
-
+
   
@@ -782,7 +782,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-89.0-10.0-1] Bug 25658: Replace security slider with security level UI

2021-06-16 Thread boklm

commit 3e0517020ebdd7d8916763a98c005cead5bb6cff
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 b51283ec1fda..f8ef15471c34 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -225,6 +225,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",
@@ -1801,6 +1806,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
@@ -2525,6 +2533,8 @@ var gBrowserInit = {
 
 DownloadsButton.uninit();
 
+SecurityLevelButton.uninit();
+
 gAccessibilityServiceIndicator.uninit();
 
 if (gToolbarKeyNavEnabled) {
diff --git a/browser/base/content/browser.xhtml 
b/browser/base/content/browser.xhtml
index 668bbb15fdfe..da4188b336e6 100644
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -20,6 +20,8 @@
 
 
 
+
+
 
 
 
@@ -651,6 +653,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
 
 
 
 
+#include ../../components/securitylevel/content/securityLevelButton.inc.xhtml
+
 
 
 
+
 
 
 
diff --git a/browser/components/preferences/privacy.inc.xhtml 
b/browser/components/preferences/privacy.inc.xhtml
index 5c8d2ae6dee5..038d1292b25a 100644
--- a/browser/components/preferences/privacy.inc.xhtml
+++ b/browser/components/preferences/privacy.inc.xhtml
@@ -904,6 +904,8 @@
   
 
 
+#include ../securitylevel/content/securityLevelPreferences.inc.xhtml
+
 
 
   
diff --git a/browser/components/preferences/privacy.js 
b/browser/components/preferences/privacy.js
index 9d6ca0a9dd01..47a03f01a5b3 100644
--- a/browser/components/preferences/privacy.js
+++ b/browser/components/preferences/privacy.js
@@ -80,6 +80,12 @@ XPCOMUtils.defineLazyGetter(this, "AlertsServiceDND", 
function() {
   }
 });
 
+XPCOMUtils.defineLazyScriptGetter(
+  this,
+  ["SecurityLevelPreferences

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 26353: Prevent speculative connect that violated FPI.

2021-06-16 Thread boklm

commit b3e1bf45e2e1ba6fca891e1d696c1cc9213381c6
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 568e70688dc4..e1adbc72bdad 100644
--- a/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm
+++ b/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm
@@ -93,6 +93,9 @@ class RemoteWebNavigation {
   }
 
   uri = Services.uriFixup.getFixupURIInfo(aURI, fixupFlags).preferredURI;
+/***
+   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.
@@ -116,6 +119,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-89.0-10.0-1] Bug 28369: Stop shipping pingsender executable

2021-06-16 Thread boklm

commit a1a988112cf02202188eadaa3bd9e9bd7656755b
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 6f0b4481473b..6e8a1689ea19 100644
--- a/browser/app/macbuild/Contents/MacOS-files.in
+++ b/browser/app/macbuild/Contents/MacOS-files.in
@@ -17,7 +17,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 39f19b7dab48..d1cf02ef870f 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -452,10 +452,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 de9aac18d2ff..365799896e70 100755
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/browser/installer/windows/nsis/shared.nsh
@@ -1478,7 +1478,6 @@ ${RemoveDefaultBrowserAgentShortcut}
   Push "crashreporter.exe"
   Push "default-browser-agent.exe"
   Push "minidump-analyzer.exe"
-  Push "pingsender.exe"
   Push "updater.exe"
   Push "mozwer.dll"
   Push "${FileMainEXE}"
diff --git a/python/mozbuild/mozbuild/artifacts.py 
b/python/mozbuild/mozbuild/artifacts.py
index 50ca81a4aaf5..3f3454b4b7b5 100644
--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -495,7 +495,6 @@ class LinuxArtifactJob(ArtifactJob):
 "{product}/{product}",
 "{product}/{product}-bin",
 "{product}/minidump-analyzer",
-"{product}/pingsender",
 "{product}/plugin-container",
 "{product}/updater",
 "{product}/**/*.so",
@@ -550,7 +549,6 @@ class MacArtifactJob(ArtifactJob):
 "{product}-bin",
 "*.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 d64da6858124..ba125ea6a459 100644
--- a/toolkit/components/telemetry/app/TelemetrySend.jsm
+++ b/toolkit/components/telemetry/app/TelemetrySend.jsm
@@ -1588,23 +1588,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 3eee4e938c4e..cedf9b313d9c 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-89.0-10.0-1] Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing

2021-06-16 Thread boklm

commit 1cbefcba4c2d554c347a3a08f1d1f5472d00b9bd
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.
---
 .../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 |  38 ++---
 .../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 +
 .../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 |

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 23247: Communicating security expectations for .onion

2021-06-16 Thread boklm

commit a13bb24001e99721e5822cb2bea965e9dd9c044f
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/security/nsMixedContentBlocker.cpp | 16 +-
 .../modules/geckoview/GeckoViewProgress.jsm|  4 ++
 security/manager/ssl/nsSecureBrowserUI.cpp | 12 
 15 files changed, 177 insertions(+), 31 deletions(-)

diff --git a/browser/base/content/browser-siteIdentity.js 
b/browser/base/content/browser-siteIdentity.js
index e395925b94b1..6a816a75cae9 100644
--- a/browser/base/content/browser-siteIdentity.js
+++ b/browser/base/content/browser-siteIdentity.js
@@ -140,6 +140,10 @@ var gIdentityHandler = {
 );
   },
 
+  get _uriIsOnionHost() {
+return this._uriHasHost ? this._uri.host.toLowerCase().endsWith(".onion") 
: false;
+  },
+
   get _isAboutNetErrorPage() {
 return (
   gBrowser.selectedBrowser.documentURI &&
@@ -784,9 +788,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";
   },
 
   /**
@@ -794,6 +798,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
@@ -836,11 +844,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.
@@ -851,17 +861,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 = uriIs

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 16285: Exclude ClearKey system for now

2021-06-16 Thread boklm

commit 555e6dd012e755b732dcdb78cbea21c0e4a4e172
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 3a8593ac399e..184f8fd475ab 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -473,8 +473,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-89.0-10.0-1] Bug 13379: Sign our MAR files.

2021-06-16 Thread boklm

commit c8b8889d0018f35fedb1b02f906421cdf9a126b7
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| 26 +--
 toolkit/mozapps/update/updater/updater.cpp | 25 +++
 toolkit/xre/moz.build  |  3 ++
 toolkit/xre/nsUpdateDriver.cpp | 50 ++
 11 files changed, 115 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 bad7ea022c9f..e42ff6c86bc5 100644
--- a/.mozconfig-asan
+++ b/.mozconfig-asan
@@ -29,6 +29,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 a6d26c66a668..d6fa1677ddf1 100644
--- a/modules/libmar/tool/moz.build
+++ b/modules/libmar/too

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 23104: Add a default line height compensation

2021-06-16 Thread boklm

commit 385c67fde9b6c9306916b9d88d24498616cd0ed1
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 a9d3ff48505a..2bdc1ce37de9 100644
--- a/layout/generic/ReflowInput.cpp
+++ b/layout/generic/ReflowInput.cpp
@@ -31,6 +31,7 @@
 #include "mozilla/SVGUtils.h"
 #include "mozilla/dom/HTMLInputElement.h"
 #include "nsGridContainerFrame.h"
+#include "nsContentUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::css;
@@ -2647,7 +2648,8 @@ void ReflowInput::CalculateBlockSideMargins() {
 
 // 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;
@@ -2655,6 +2657,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;
@@ -2672,7 +2680,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) {
@@ -2701,7 +2710,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 {
@@ -2723,7 +2732,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");
@@ -2736,7 +2745,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 64348d308568..64437b3a0d23 100644
--- a/layout/generic/test/mochitest.ini
+++ b/layout/generic/test/mochitest.ini
@@ -144,3 +144,4 @@ skip-if = debug == true || tsan # the test is slow. tsan: 
bug 1612707
 support-files =
 file_reframe_for_lazy_load_image.html
 [test_bug1655135.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 @@
+
+
+
+
+  Test for Tor Bug #23104: C

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 21431: Clean-up system extensions shipped in Firefox

2021-06-16 Thread boklm

commit 2b0288861db896a2113fbfcee87de1019d42c952
Author: Kathy Brade 
Date:   Tue May 23 17:05:29 2017 -0400

Bug 21431: Clean-up system extensions shipped in Firefox

Only ship the pdfjs extension.
---
 browser/components/BrowserGlue.jsm| 6 ++
 browser/extensions/moz.build  | 9 +
 browser/installer/package-manifest.in | 1 -
 browser/locales/Makefile.in   | 8 
 browser/locales/jar.mn| 7 ---
 5 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/browser/components/BrowserGlue.jsm 
b/browser/components/BrowserGlue.jsm
index 106ab4cc8da1..b4153484fd76 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -1972,6 +1972,9 @@ BrowserGlue.prototype = {
 const ID = "screensh...@mozilla.org";
 const _checkScreenshotsPref = async () => {
   let addon = await AddonManager.getAddonByID(ID);
+  if (!addon) {
+return;
+  }
   let disabled = Services.prefs.getBoolPref(PREF, false);
   if (disabled) {
 await addon.disable({ allowSystemAddons: true });
@@ -1988,6 +1991,9 @@ BrowserGlue.prototype = {
 const ID = "webcompat-repor...@mozilla.org";
 Services.prefs.addObserver(PREF, async () => {
   let addon = await AddonManager.getAddonByID(ID);
+  if (!addon) {
+return;
+  }
   let enabled = Services.prefs.getBoolPref(PREF, false);
   if (enabled && !addon.isActive) {
 await addon.enable({ allowSystemAddons: true });
diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
index 9daae31eca43..8b16ddc4a84a 100644
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
@@ -4,14 +4,7 @@
 # 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/.
 
-DIRS += [
-"doh-rollout",
-"formautofill",
-"screenshots",
-"webcompat",
-"report-site-issue",
-"pictureinpicture",
-]
+DIRS += []
 
 if not CONFIG["TOR_BROWSER_DISABLE_TOR_LAUNCHER"]:
 DIRS += ["tor-launcher"]
diff --git a/browser/installer/package-manifest.in 
b/browser/installer/package-manifest.in
index 184f8fd475ab..39f19b7dab48 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -273,7 +273,6 @@
 @RESPATH@/browser/chrome/icons/default/default64.png
 @RESPATH@/browser/chrome/icons/default/default128.png
 #endif
-@RESPATH@/browser/features/*
 
 ; [DevTools Startup Files]
 @RESPATH@/browser/chrome/devtools-startup@JAREXT@
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index 496379c4306f..0946188813da 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -58,10 +58,6 @@ l10n-%:
@$(MAKE) -C ../../toolkit/locales l10n-$* 
XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* 
XPI_NAME=locale-$*
-ifneq (,$(wildcard ../extensions/formautofill/locales))
-   @$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* 
XPI_NAME=locale-$*
-endif
-   @$(MAKE) -C ../extensions/report-site-issue/locales AB_CD=$* 
XPI_NAME=locale-$*
@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* 
XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
@$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* 
XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
@$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
@@ -75,14 +71,10 @@ chrome-%:
@$(MAKE) -C ../../toolkit/locales chrome-$*
@$(MAKE) -C ../../services/sync/locales chrome AB_CD=$*
@$(MAKE) -C ../../extensions/spellcheck/locales chrome AB_CD=$*
-ifneq (,$(wildcard ../extensions/formautofill/locales))
-   @$(MAKE) -C ../extensions/formautofill/locales chrome AB_CD=$*
-endif
@$(MAKE) -C ../../devtools/client/locales chrome AB_CD=$*
@$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$*
@$(MAKE) chrome AB_CD=$*
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
-   @$(MAKE) -C ../extensions/report-site-issue/locales chrome AB_CD=$*
 
 package-win32-installer: $(SUBMAKEFILES)
$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' 
installer
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index b539e72b4fa5..b1d87659e76f 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -52,10 +52,3 @@
 locale/browser/appstrings.properties   
(%chrome/overrides/appstrings.properties)
 locale/browser/newInstall.dtd  
(%chrome/browser/newInstall.dtd)
 locale/browser/fxmonitor.properties
(%chrome/browser/fxmonitor.properties)
-
-#ifdef XPI_NAME
-# Bug 1240628, restructure how l10n repacks work with feature addons
-# This is hacky, but ensures the chrome.manifest chain is complete
-[.] chrome.jar:
-% manifest

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

2021-06-16 Thread boklm

commit 428ca61fc299fa65de103661bb46cc1e0bc1763d
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 c82549a4d1d1..f8ecfbff0983 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-89.0-10.0-1] Bug 16940: After update, load local change notes.

2021-06-16 Thread boklm

commit 97b6191a2d83dc55f7d0525fb301e01fb9bcc56e
Author: Kathy Brade 
Date:   Wed Nov 25 11:36:20 2015 -0500

Bug 16940: After update, load local change notes.

Add an about:tbupdate page that displays the first section from
TorBrowser/Docs/ChangeLog.txt and includes a link to the remote
post-update page (typically our blog entry for the release).

Always load about:tbupdate in a content process, but implement the
code that reads the file system (changelog) in the chrome process
for compatibility with future sandboxing efforts.

Also fix bug 29440. Now about:tbupdate is styled as a fairly simple
changelog page that is designed to be displayed via a link that is on
about:tor.
---
 browser/actors/AboutTBUpdateChild.jsm  |  12 +++
 browser/actors/AboutTBUpdateParent.jsm | 120 +
 browser/actors/moz.build   |   6 ++
 .../base/content/abouttbupdate/aboutTBUpdate.css   |  74 +
 .../base/content/abouttbupdate/aboutTBUpdate.js|  27 +
 .../base/content/abouttbupdate/aboutTBUpdate.xhtml |  39 +++
 browser/base/content/browser-siteIdentity.js   |   2 +-
 browser/base/content/browser.js|   4 +
 browser/base/jar.mn|   5 +
 browser/components/BrowserContentHandler.jsm   |  55 +++---
 browser/components/BrowserGlue.jsm |  15 +++
 browser/components/about/AboutRedirector.cpp   |   6 ++
 browser/components/about/components.conf   |   3 +
 browser/components/moz.build   |   5 +-
 .../locales/en-US/chrome/browser/aboutTBUpdate.dtd |   8 ++
 browser/locales/jar.mn |   3 +
 toolkit/modules/RemotePageAccessManager.jsm|   5 +
 17 files changed, 373 insertions(+), 16 deletions(-)

diff --git a/browser/actors/AboutTBUpdateChild.jsm 
b/browser/actors/AboutTBUpdateChild.jsm
new file mode 100644
index ..4670da19b3db
--- /dev/null
+++ b/browser/actors/AboutTBUpdateChild.jsm
@@ -0,0 +1,12 @@
+// Copyright (c) 2020, The Tor Project, Inc.
+// See LICENSE for licensing information.
+//
+// vim: set sw=2 sts=2 ts=8 et syntax=javascript:
+
+var EXPORTED_SYMBOLS = ["AboutTBUpdateChild"];
+
+const { RemotePageChild } = ChromeUtils.import(
+  "resource://gre/actors/RemotePageChild.jsm"
+);
+
+class AboutTBUpdateChild extends RemotePageChild {}
diff --git a/browser/actors/AboutTBUpdateParent.jsm 
b/browser/actors/AboutTBUpdateParent.jsm
new file mode 100644
index ..56a10394565a
--- /dev/null
+++ b/browser/actors/AboutTBUpdateParent.jsm
@@ -0,0 +1,120 @@
+// Copyright (c) 2020, The Tor Project, Inc.
+// See LICENSE for licensing information.
+//
+// vim: set sw=2 sts=2 ts=8 et syntax=javascript:
+
+"use strict";
+
+this.EXPORTED_SYMBOLS = ["AboutTBUpdateParent"];
+
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const { AppConstants } = ChromeUtils.import(
+  "resource://gre/modules/AppConstants.jsm"
+);
+
+const kRequestUpdateMessageName = "FetchUpdateData";
+
+/**
+ * This code provides services to the about:tbupdate page. Whenever
+ * about:tbupdate needs to do something chrome-privileged, it sends a
+ * message that's handled here. It is modeled after Mozilla's about:home
+ * implementation.
+ */
+class AboutTBUpdateParent extends JSWindowActorParent {
+  receiveMessage(aMessage) {
+if (aMessage.name == kRequestUpdateMessageName) {
+  return this.releaseNoteInfo;
+}
+return undefined;
+  }
+
+  get moreInfoURL() {
+try {
+  return Services.prefs.getCharPref("torbrowser.post_update.url");
+} catch (e) {}
+
+// Use the default URL as a fallback.
+return 
Services.urlFormatter.formatURLPref("startup.homepage_override_url");
+  }
+
+  // Read the text from the beginning of the changelog file that is located
+  // at TorBrowser/Docs/ChangeLog.txt and return an object that contains
+  // the following properties:
+  //   versione.g., Tor Browser 8.5
+  //   releaseDatee.g., March 31 2019
+  //   releaseNotes   details of changes (lines 2 - end of ChangeLog.txt)
+  // We attempt to parse the first line of ChangeLog.txt to extract the
+  // version and releaseDate. If parsing fails, we return the entire first
+  // line in version and omit releaseDate.
+  //
+  // On Mac OS, when building with --enable-tor-browser-data-outside-app-dir
+  // to support Gatekeeper signing, the ChangeLog.txt file is located in
+  // TorBrowser.app/Contents/Resources/TorBrowser/Docs/.
+  get releaseNoteInfo() {
+let info = { moreInfoURL: this.moreInfoURL };
+
+try {
+  let f;
+  if (AppConstants.TOR_BROWSER_DATA_OUTSIDE_APP_DIR) {
+// "XREExeF".parent is the directory that contains firefox, i.e.,
+// Browser/ or, on Mac OS, TorBrowser.app/Contents/MacOS/.
+f = Serv

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 19121: reinstate the update.xml hash check

2021-06-16 Thread boklm

commit 36b4654866db63ad5b7396d47ff1bf223faff3f8
Author: Kathy Brade 
Date:   Mon Apr 23 15:22:57 2018 -0400

Bug 19121: reinstate the update.xml hash check

Revert most changes from Mozilla Bug 1373267 "Remove hashFunction and
hashValue attributes from nsIUpdatePatch and code related to these
attributes." Changes to the tests were not reverted; the tests have
been changed significantly and we do not run automated updater tests
for Tor Browser at this time.

Also partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122.

Revert the nsUpdateService.js changes from Mozilla Bug 862173 "don't
verify mar file hash when using mar signing to verify the mar file
(lessens main thread I/O)."

Changes to the tests were not reverted; the tests have been changed
significantly and we do not run automated updater tests for
Tor Browser at this time.

We kept the addition to the AppConstants API in case other JS code
references it in the future.
---
 toolkit/modules/AppConstants.jsm|  7 
 toolkit/mozapps/update/UpdateService.jsm| 63 -
 toolkit/mozapps/update/UpdateTelemetry.jsm  |  1 +
 toolkit/mozapps/update/nsIUpdateService.idl | 11 +
 4 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm
index 022251d12332..6fb5f8bc6e2c 100644
--- a/toolkit/modules/AppConstants.jsm
+++ b/toolkit/modules/AppConstants.jsm
@@ -205,6 +205,13 @@ this.AppConstants = Object.freeze({
   false,
 #endif
 
+  MOZ_VERIFY_MAR_SIGNATURE:
+#ifdef MOZ_VERIFY_MAR_SIGNATURE
+  true,
+#else
+  false,
+#endif
+
   MOZ_MAINTENANCE_SERVICE:
 #ifdef MOZ_MAINTENANCE_SERVICE
   true,
diff --git a/toolkit/mozapps/update/UpdateService.jsm 
b/toolkit/mozapps/update/UpdateService.jsm
index c1d5d11bfbc2..8e435e270741 100644
--- a/toolkit/mozapps/update/UpdateService.jsm
+++ b/toolkit/mozapps/update/UpdateService.jsm
@@ -943,6 +943,20 @@ function LOG(string) {
   }
 }
 
+/**
+ * Convert a string containing binary values to hex.
+ */
+function binaryToHex(input) {
+  var result = "";
+  for (var i = 0; i < input.length; ++i) {
+var hex = input.charCodeAt(i).toString(16);
+if (hex.length == 1)
+  hex = "0" + hex;
+result += hex;
+  }
+  return result;
+}
+
 /**
  * Gets the specified directory at the specified hierarchy under the
  * update root directory and creates it if it doesn't exist.
@@ -1962,6 +1976,8 @@ function UpdatePatch(patch) {
 }
 break;
   case "finalURL":
+  case "hashFunction":
+  case "hashValue":
   case "state":
   case "type":
   case "URL":
@@ -1981,6 +1997,8 @@ UpdatePatch.prototype = {
   // over writing nsIUpdatePatch attributes.
   _attrNames: [
 "errorCode",
+"hashFunction",
+"hashValue",
 "finalURL",
 "selected",
 "size",
@@ -1994,6 +2012,8 @@ UpdatePatch.prototype = {
*/
   serialize: function UpdatePatch_serialize(updates) {
 var patch = updates.createElementNS(URI_UPDATE_NS, "patch");
+patch.setAttribute("hashFunction", this.hashFunction);
+patch.setAttribute("hashValue", this.hashValue);
 patch.setAttribute("size", this.size);
 patch.setAttribute("type", this.type);
 patch.setAttribute("URL", this.URL);
@@ -5109,7 +5129,42 @@ Downloader.prototype = {
 }
 
 LOG("Downloader:_verifyDownload downloaded size == expected size.");
-return true;
+let fileStream = Cc["@mozilla.org/network/file-input-stream;1"].
+ createInstance(Ci.nsIFileInputStream);
+fileStream.init(destination, FileUtils.MODE_RDONLY, FileUtils.PERMS_FILE, 
0);
+
+let digest;
+try {
+  let hash = Cc["@mozilla.org/security/hash;1"].
+ createInstance(Ci.nsICryptoHash);
+  var hashFunction = 
Ci.nsICryptoHash[this._patch.hashFunction.toUpperCase()];
+  if (hashFunction == undefined) {
+throw Cr.NS_ERROR_UNEXPECTED;
+  }
+  hash.init(hashFunction);
+  hash.updateFromStream(fileStream, -1);
+  // NOTE: For now, we assume that the format of _patch.hashValue is hex
+  // encoded binary (such as what is typically output by programs like
+  // sha1sum).  In the future, this may change to base64 depending on how
+  // we choose to compute these hashes.
+  digest = binaryToHex(hash.finish(false));
+} catch (e) {
+  LOG("Downloader:_verifyDownload - failed to compute hash of the " +
+  "downloaded update archive");
+  digest = "";
+}
+
+fileStream.close();
+
+if (digest == this._patch.hashValue.toLowerCase()) {
+  LOG("Downloader:_verifyDownload hashes match.");
+  return true;
+}
+
+LOG("Downloader:_verifyDownload hashes do not match. ");
+AUSTLMY.pingDownloadCode(this.isCompleteUpdate,
+ AUSTLMY.DWNLD_ERR_VERIFY_NO_HASH_MATCH);
+return false;
   },
 
   /**
@@ -5695,6 +57

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 21724: Make Firefox and Tor Browser distinct macOS apps

2021-06-16 Thread boklm

commit bb28b26697660f3bdad28d9cb9535cbfba5d00a7
Author: teor 
Date:   Mon Mar 13 23:06:23 2017 +1100

Bug 21724: Make Firefox and Tor Browser distinct macOS apps

When macOS opens a document or selects a default browser, it sometimes
uses the CFBundleSignature. Changing from the Firefox MOZB signature to
a different signature TORB allows macOS to distinguish between Firefox
and Tor Browser.
---
 browser/app/Makefile.in | 2 +-
 browser/app/macbuild/Contents/Info.plist.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index 54d6b43fe126..8dd3a9a65661 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -102,5 +102,5 @@ ifdef MOZ_UPDATER
mv -f 
'$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater' 
'$(dist_dest)/Contents/Library/LaunchServices'
ln -s ../../../../Library/LaunchServices/org.mozilla.updater 
'$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater'
 endif
-   printf APPLMOZB > '$(dist_dest)/Contents/PkgInfo'
+   printf APPLTORB > '$(dist_dest)/Contents/PkgInfo'
 endif
diff --git a/browser/app/macbuild/Contents/Info.plist.in 
b/browser/app/macbuild/Contents/Info.plist.in
index 0de109988e5e..07d914158563 100644
--- a/browser/app/macbuild/Contents/Info.plist.in
+++ b/browser/app/macbuild/Contents/Info.plist.in
@@ -179,7 +179,7 @@
CFBundleShortVersionString
@APP_VERSION@
CFBundleSignature
-   MOZB
+   TORB
CFBundleURLTypes





___
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-89.0-10.0-1] Bug 11641: change TBB directory structure to be more like Firefox's

2021-06-16 Thread boklm

commit 2bdec90507ca142218f716cb8e691893baf71f63
Author: Kathy Brade 
Date:   Tue Apr 29 13:08:24 2014 -0400

Bug 11641: change TBB directory structure to be more like Firefox's

Unless the -osint command line flag is used, the browser now defaults
to the equivalent of -no-remote.  There is a new -allow-remote flag that
may be used to restore the original (Firefox-like) default behavior.
---
 toolkit/xre/nsAppRunner.cpp | 21 -
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 3e691ce85f1f..1da27c99d493 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -1824,8 +1824,10 @@ static void DumpHelp() {
   "  --migrationStart with migration wizard.\n"
   "  --ProfileManager   Start with ProfileManager.\n"
 #ifdef MOZ_HAS_REMOTE
-  "  --no-remoteDo not accept or send remote commands; implies\n"
+  "  --no-remote(default) Do not accept or send remote commands; "
+  "implies\n"
   " --new-instance.\n"
+  "  --allow-remote Accept and send remote commands.\n"
   "  --new-instance Open new instance, not a new window in running "
   "instance.\n"
 #endif
@@ -4076,16 +4078,25 @@ int XREMain::XRE_mainInit(bool* aExitFlag) {
  gSafeMode);
 
 #if defined(MOZ_HAS_REMOTE)
+  // In Tor Browser, remoting is disabled by default unless -osint is used.
+  bool allowRemote = (CheckArg("allow-remote") == ARG_FOUND);
+  bool isOsint = (CheckArg("osint", nullptr, CheckArgFlag::None) == ARG_FOUND);
+  if (!allowRemote && !isOsint) {
+SaveToEnv("MOZ_NO_REMOTE=1");
+  }
   // Handle --no-remote and --new-instance command line arguments. Setup
   // the environment to better accommodate other components and various
   // restart scenarios.
   ar = CheckArg("no-remote");
-  if (ar == ARG_FOUND || EnvHasValue("MOZ_NO_REMOTE")) {
+  if ((ar == ARG_FOUND) && allowRemote) {
+PR_fprintf(PR_STDERR,
+   "Error: argument --no-remote is invalid when argument "
+   "--allow-remote is specified\n");
+return 1;
+  }
+  if (EnvHasValue("MOZ_NO_REMOTE")) {
 mDisableRemoteClient = true;
 mDisableRemoteServer = true;
-if (!EnvHasValue("MOZ_NO_REMOTE")) {
-  SaveToEnv("MOZ_NO_REMOTE=1");
-}
   }
 
   ar = CheckArg("new-instance");



___
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-89.0-10.0-1] Bug 19273: Avoid JavaScript patching of the external app helper dialog.

2021-06-16 Thread boklm

commit 858f43dfacd582860c8a9da8b421fa550a7c7a4b
Author: Kathy Brade 
Date:   Tue Jun 28 15:13:05 2016 -0400

Bug 19273: Avoid JavaScript patching of the external app helper dialog.

When handling an external URI or downloading a file, invoke Torbutton's
external app blocker component (which will present a download warning
dialog unless the user has checked the "Automatically download files
from now on" box).

For e10s compatibility, avoid using a modal dialog and instead use
a callback interface (nsIHelperAppWarningLauncher) to allow Torbutton
to indicate the user's desire to cancel or continue each request.

Other bugs fixed:
 Bug 21766: Crash with e10s enabled while trying to download a file
 Bug 21886: Download is stalled in non-e10s mode
 Bug 22471: Downloading files via the PDF viewer download button is broken
 Bug 22472: Fix FTP downloads when external helper app dialog is shown
 Bug 22610: Avoid crashes when canceling external helper app downloads
 Bug 22618: Downloading pdf file via file:/// is stalling
---
 .../exthandler/nsExternalHelperAppService.cpp  | 177 ++---
 uriloader/exthandler/nsExternalHelperAppService.h  |   3 +
 .../exthandler/nsIExternalHelperAppService.idl |  47 ++
 3 files changed, 209 insertions(+), 18 deletions(-)

diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp 
b/uriloader/exthandler/nsExternalHelperAppService.cpp
index 47f626074dca..e46df70429c2 100644
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -133,6 +133,9 @@ static const char NEVER_ASK_FOR_SAVE_TO_DISK_PREF[] =
 static const char NEVER_ASK_FOR_OPEN_FILE_PREF[] =
 "browser.helperApps.neverAsk.openFile";
 
+static const char WARNING_DIALOG_CONTRACT_ID[] =
+"@torproject.org/torbutton-extAppBlocker;1";
+
 // Helper functions for Content-Disposition headers
 
 /**
@@ -405,6 +408,22 @@ static nsresult GetDownloadDirectory(nsIFile** _directory,
   return NS_OK;
 }
 
+static already_AddRefed GetDialogParentAux(
+BrowsingContext* aBrowsingContext, nsIInterfaceRequestor* aWindowContext) {
+  nsCOMPtr dialogParent = aWindowContext;
+
+  if (!dialogParent && aBrowsingContext) {
+dialogParent = do_QueryInterface(aBrowsingContext->GetDOMWindow());
+  }
+  if (!dialogParent && aBrowsingContext && XRE_IsParentProcess()) {
+RefPtr element = aBrowsingContext->Top()->GetEmbedderElement();
+if (element) {
+  dialogParent = do_QueryInterface(element->OwnerDoc()->GetWindow());
+}
+  }
+  return dialogParent.forget();
+}
+
 /**
  * Structure for storing extension->type mappings.
  * @see defaultMimeEntries
@@ -608,6 +627,96 @@ static const char* descriptionOverwriteExtensions[] = {
 "avif", "pdf", "svg", "webp", "xml",
 };
 
+//
+// begin nsExternalLoadURIHandler class definition and implementation
+//
+class nsExternalLoadURIHandler final : public nsIHelperAppWarningLauncher {
+ public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSIHELPERAPPWARNINGLAUNCHER
+
+  nsExternalLoadURIHandler(nsIHandlerInfo* aHandlerInfo, nsIURI* aURI,
+   nsIPrincipal* aTriggeringPrincipal,
+   BrowsingContext* aBrowsingContext,
+   bool aTriggeredExternally);
+
+ protected:
+  ~nsExternalLoadURIHandler();
+
+  nsCOMPtr mHandlerInfo;
+  nsCOMPtr mURI;
+  nsCOMPtr mTriggeringPrincipal;
+  RefPtr mBrowsingContext;
+  bool mTriggeredExternally;
+  nsCOMPtr mWarningDialog;
+};
+
+NS_IMPL_ADDREF(nsExternalLoadURIHandler)
+NS_IMPL_RELEASE(nsExternalLoadURIHandler)
+
+NS_INTERFACE_MAP_BEGIN(nsExternalLoadURIHandler)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIHelperAppWarningLauncher)
+  NS_INTERFACE_MAP_ENTRY(nsIHelperAppWarningLauncher)
+NS_INTERFACE_MAP_END
+
+nsExternalLoadURIHandler::nsExternalLoadURIHandler(
+nsIHandlerInfo* aHandlerInfo, nsIURI* aURI,
+nsIPrincipal* aTriggeringPrincipal, BrowsingContext* aBrowsingContext,
+bool aTriggeredExternally)
+: mHandlerInfo(aHandlerInfo),
+  mURI(aURI),
+  mTriggeringPrincipal(aTriggeringPrincipal),
+  mBrowsingContext(aBrowsingContext),
+  mTriggeredExternally(aTriggeredExternally)
+
+{
+  nsresult rv = NS_OK;
+  mWarningDialog = do_CreateInstance(WARNING_DIALOG_CONTRACT_ID, &rv);
+  if (NS_SUCCEEDED(rv) && mWarningDialog) {
+// This will create a reference cycle (the dialog holds a reference to us
+// as nsIHelperAppWarningLauncher), which will be broken in ContinueRequest
+// or CancelRequest.
+nsCOMPtr dialogParent =
+GetDialogParentAux(aBrowsingContext, nullptr);
+rv = mWarningDialog->MaybeShow(this, dialogParent);
+  }
+
+  if (NS_FAILED(rv)) {
+// If for som

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 18800: Remove localhost DNS lookup in nsProfileLock.cpp

2021-06-16 Thread boklm

commit 3b9c44a51e43a648ebc5fb26946f4cbb07873682
Author: Kathy Brade 
Date:   Thu Apr 21 10:40:26 2016 -0400

Bug 18800: Remove localhost DNS lookup in nsProfileLock.cpp

Instead of using the local computer's IP address within
symlink-based profile lock signatures, always use 127.0.0.1.
---
 toolkit/profile/nsProfileLock.cpp | 17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/toolkit/profile/nsProfileLock.cpp 
b/toolkit/profile/nsProfileLock.cpp
index 8cbb67deb5d8..dee8b4c75b46 100644
--- a/toolkit/profile/nsProfileLock.cpp
+++ b/toolkit/profile/nsProfileLock.cpp
@@ -304,18 +304,17 @@ nsresult nsProfileLock::LockWithSymlink(nsIFile* 
aLockFile,
   if (!mReplacedLockTime)
 aLockFile->GetLastModifiedTimeOfLink(&mReplacedLockTime);
 
+  // For Tor Browser, avoid a DNS lookup here so the Tor network is not
+  // bypassed. Instead, always use 127.0.0.1 for the IP address portion
+  // of the lock signature, which may cause the browser to refuse to
+  // start in the rare event that all of the following conditions are met:
+  //   1. The browser profile is on a network file system.
+  //   2. The file system does not support fcntl() locking.
+  //   3. Tor Browser is run from two different computers at the same time.
+
   struct in_addr inaddr;
   inaddr.s_addr = htonl(INADDR_LOOPBACK);
 
-  char hostname[256];
-  PRStatus status = PR_GetSystemInfo(PR_SI_HOSTNAME, hostname, sizeof 
hostname);
-  if (status == PR_SUCCESS) {
-char netdbbuf[PR_NETDB_BUF_SIZE];
-PRHostEnt hostent;
-status = PR_GetHostByName(hostname, netdbbuf, sizeof netdbbuf, &hostent);
-if (status == PR_SUCCESS) memcpy(&inaddr, hostent.h_addr, sizeof inaddr);
-  }
-
   mozilla::SmprintfPointer signature =
   mozilla::Smprintf("%s:%s%lu", inet_ntoa(inaddr),
 aHaveFcntlLock ? "+" : "", (unsigned long)getpid());



___
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-89.0-10.0-1] Bug 18821: Disable libmdns for Android and Desktop

2021-06-16 Thread boklm

commit 60bdfb006e17b390bf16db139cd9481c4ce4f093
Author: Georg Koppen 
Date:   Wed Apr 20 14:34:50 2016 +

Bug 18821: Disable libmdns for Android and Desktop

There should be no need to remove the OS X support introduced in
https://bugzilla.mozilla.org/show_bug.cgi?id=1225726 as enabling this
is governed by a preference (which is actually set to `false`). However,
we remove it at build time as well (defense in depth).

This is basically a backout of the relevant passages of
https://hg.mozilla.org/mozilla-central/rev/6bfb430de85d,
https://hg.mozilla.org/mozilla-central/rev/609b337bf7ab and
https://hg.mozilla.org/mozilla-central/rev/8e092ec5fbbd.

Fixed bug 21861 (Disable additional mDNS code to avoid proxy bypasses)
as well.

Mozilla removed the Presentation API piece of this patch in Bug 1697680.
---
 netwerk/dns/mdns/libmdns/components.conf | 15 ---
 netwerk/dns/mdns/libmdns/moz.build   | 28 
 2 files changed, 43 deletions(-)

diff --git a/netwerk/dns/mdns/libmdns/components.conf 
b/netwerk/dns/mdns/libmdns/components.conf
index 6e64140c820e..1b50dbf673a4 100644
--- a/netwerk/dns/mdns/libmdns/components.conf
+++ b/netwerk/dns/mdns/libmdns/components.conf
@@ -5,20 +5,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 Classes = [
-{
-'cid': '{14a50f2b-7ff6-48a5-88e3-615fd111f5d3}',
-'contract_ids': 
['@mozilla.org/toolkit/components/mdnsresponder/dns-info;1'],
-'type': 'mozilla::net::nsDNSServiceInfo',
-'headers': ['/netwerk/dns/mdns/libmdns/nsDNSServiceInfo.h'],
-},
 ]
 
-if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'cocoa':
-Classes += [
-{
-'cid': '{f9346d98-f27a-4e89-b744-493843416480}',
-'contract_ids': 
['@mozilla.org/toolkit/components/mdnsresponder/dns-sd;1'],
-'jsm': 'resource://gre/modules/DNSServiceDiscovery.jsm',
-'constructor': 'nsDNSServiceDiscovery',
-},
-]
diff --git a/netwerk/dns/mdns/libmdns/moz.build 
b/netwerk/dns/mdns/libmdns/moz.build
index f9c025fa823e..e6e70a6d803c 100644
--- a/netwerk/dns/mdns/libmdns/moz.build
+++ b/netwerk/dns/mdns/libmdns/moz.build
@@ -4,34 +4,6 @@
 # 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/.
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
-UNIFIED_SOURCES += [
-"MDNSResponderOperator.cpp",
-"MDNSResponderReply.cpp",
-"nsDNSServiceDiscovery.cpp",
-]
-
-LOCAL_INCLUDES += [
-"/netwerk/base",
-]
-
-else:
-EXTRA_JS_MODULES += [
-"DNSServiceDiscovery.jsm",
-"fallback/DataReader.jsm",
-"fallback/DataWriter.jsm",
-"fallback/DNSPacket.jsm",
-"fallback/DNSRecord.jsm",
-"fallback/DNSResourceRecord.jsm",
-"fallback/DNSTypes.jsm",
-"fallback/MulticastDNS.jsm",
-]
-
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
-EXTRA_JS_MODULES += [
-"MulticastDNSAndroid.jsm",
-]
-
 UNIFIED_SOURCES += [
 "nsDNSServiceInfo.cpp",
 ]



___
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-89.0-10.0-1] Bug 13252: Do not store data in the app bundle

2021-06-16 Thread boklm

commit 7db3826b4f3e1a24bcf4ad925fdeec40da902d81
Author: Kathy Brade 
Date:   Fri Mar 18 14:20:02 2016 -0400

Bug 13252: Do not store data in the app bundle

When --enable-tor-browser-data-outside-app-dir is enabled,
all user data is stored in a directory named
TorBrowser-Data which is located next to the application directory.

Display an informative error message if the TorBrowser-Data
directory cannot be created due to an "access denied" or a
"read only volume" error.

On Mac OS, add support for the --invisible command line option which
is used by the meek-http-helper to avoid showing an icon for the
helper browser on the dock.
---
 toolkit/xre/nsAppRunner.cpp|  73 +++---
 toolkit/xre/nsXREDirProvider.cpp   |  43 +--
 toolkit/xre/nsXREDirProvider.h |   6 ++
 xpcom/io/TorFileUtils.cpp  | 133 +
 xpcom/io/TorFileUtils.h|  32 
 xpcom/io/moz.build |   5 ++
 xpcom/io/nsAppFileLocationProvider.cpp |  53 ++---
 7 files changed, 278 insertions(+), 67 deletions(-)

diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 1e2e01592f1a..3e691ce85f1f 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -2440,6 +2440,8 @@ static nsresult ProfileMissingDialog(nsINativeAppSupport* 
aNative) {
   }
 }
 
+// If aUnlocker is NULL, it is also OK for the following arguments to be NULL:
+//   aProfileDir, aProfileLocalDir, aResult.
 static ReturnAbortOnError ProfileErrorDialog(nsIFile* aProfileDir,
  nsIFile* aProfileLocalDir,
  ProfileStatus aStatus,
@@ -2448,17 +2450,19 @@ static ReturnAbortOnError ProfileErrorDialog(nsIFile* 
aProfileDir,
  nsIProfileLock** aResult) {
   nsresult rv;
 
-  bool exists;
-  aProfileDir->Exists(&exists);
-  if (!exists) {
-return ProfileMissingDialog(aNative);
+  if (aProfileDir) {
+bool exists;
+aProfileDir->Exists(&exists);
+if (!exists) {
+  return ProfileMissingDialog(aNative);
+}
   }
 
   ScopedXPCOMStartup xpcom;
   rv = xpcom.Initialize();
   NS_ENSURE_SUCCESS(rv, rv);
 
-  mozilla::Telemetry::WriteFailedProfileLock(aProfileDir);
+  if (aProfileDir) mozilla::Telemetry::WriteFailedProfileLock(aProfileDir);
 
   rv = xpcom.SetWindowCreator(aNative);
   NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
@@ -2658,6 +2662,23 @@ static ReturnAbortOnError ShowProfileManager(
   return LaunchChild(false, true);
 }
 
+#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR
+static ProfileStatus CheckTorBrowserDataWriteAccess(nsIFile* aAppDir) {
+  // Check whether we can write to the directory that will contain
+  // TorBrowser-Data.
+  nsCOMPtr tbDataDir;
+  RefPtr dirProvider = nsXREDirProvider::GetSingleton();
+  if (!dirProvider) return PROFILE_STATUS_OTHER_ERROR;
+  nsresult rv =
+  dirProvider->GetTorBrowserUserDataDir(getter_AddRefs(tbDataDir));
+  NS_ENSURE_SUCCESS(rv, PROFILE_STATUS_OTHER_ERROR);
+  nsCOMPtr tbDataDirParent;
+  rv = tbDataDir->GetParent(getter_AddRefs(tbDataDirParent));
+  NS_ENSURE_SUCCESS(rv, PROFILE_STATUS_OTHER_ERROR);
+  return nsToolkitProfileService::CheckProfileWriteAccess(tbDataDirParent);
+}
+#endif
+
 static bool gDoMigration = false;
 static bool gDoProfileReset = false;
 static nsCOMPtr gResetOldProfile;
@@ -3701,6 +3722,14 @@ int XREMain::XRE_mainInit(bool* aExitFlag) {
   if (PR_GetEnv("XRE_MAIN_BREAK")) NS_BREAK();
 #endif
 
+#if defined(XP_MACOSX) && defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR)
+  bool hideDockIcon = (CheckArg("invisible") == ARG_FOUND);
+  if (hideDockIcon) {
+ProcessSerialNumber psn = {0, kCurrentProcess};
+TransformProcessType(&psn, kProcessTransformToBackgroundApplication);
+  }
+#endif
+
   IncreaseDescriptorLimits();
 
 #ifdef USE_GLX_TEST
@@ -4657,7 +4686,34 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
   }
 #endif
 
+#if (defined(MOZ_UPDATER) && !defined(MOZ_WIDGET_ANDROID)) || \
+defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR)
+  nsCOMPtr exeFile, exeDir;
+  bool persistent;
+  rv = mDirProvider.GetFile(XRE_EXECUTABLE_FILE, &persistent,
+getter_AddRefs(exeFile));
+  NS_ENSURE_SUCCESS(rv, 1);
+  rv = exeFile->GetParent(getter_AddRefs(exeDir));
+  NS_ENSURE_SUCCESS(rv, 1);
+#endif
+
   rv = NS_NewToolkitProfileService(getter_AddRefs(mProfileSvc));
+#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR
+  if (NS_FAILED(rv)) {
+// NS_NewToolkitProfileService() returns a generic NS_ERROR_FAILURE error
+// if creation of the TorBrowser-Data directory fails due to access denied
+// or because of a read-only disk volume. Do an extra check here to detect
+// these errors so we can display an informative error message.
+ProfileStatus status = CheckTorBrowserDataWriteAccess(exeDir);
+if ((PROFILE_STATUS_ACCESS_DENIED == status)

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 14631: Improve profile access error messages.

2021-06-16 Thread boklm

commit 6e5ddb9f9d30e6361c721010a485917873dc0687
Author: Kathy Brade 
Date:   Tue Feb 24 13:50:23 2015 -0500

Bug 14631: Improve profile access error messages.

Instead of always reporting that the profile is locked, display specific
messages for "access denied" and "read-only file system".

To allow for localization, get profile-related error strings from Torbutton.
Use app display name ("Tor Browser") in profile-related error alerts.
---
 .../mozapps/profile/profileSelection.properties|   5 +
 toolkit/profile/nsToolkitProfileService.cpp|  57 +++-
 toolkit/profile/nsToolkitProfileService.h  |  13 +-
 toolkit/xre/nsAppRunner.cpp| 157 ++---
 4 files changed, 208 insertions(+), 24 deletions(-)

diff --git 
a/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties 
b/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties
index d326083202b2..aa38bda24347 100644
--- a/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties
@@ -12,6 +12,11 @@ restartMessageUnlocker=%S is already running, but is not 
responding. The old %S
 restartMessageNoUnlockerMac=A copy of %S is already open. Only one copy of %S 
can be open at a time.
 restartMessageUnlockerMac=A copy of %S is already open. The running copy of %S 
will quit in order to open this one.
 
+# LOCALIZATION NOTE (profileProblemTitle, profileReadOnly, profileReadOnlyMac, 
profileAccessDenied):  Messages displayed when the browser profile cannot be 
accessed or written to. %S is the application name.
+profileProblemTitle=%S Profile Problem
+profileReadOnly=You cannot run %S from a read-only file system.  Please copy 
%S to another location before trying to use it.
+profileReadOnlyMac=You cannot run %S from a read-only file system.  Please 
copy %S to your Desktop or Applications folder before trying to use it.
+profileAccessDenied=%S does not have permission to access the profile. Please 
adjust your file system permissions and try again.
 # Profile manager
 # LOCALIZATION NOTE (profileTooltip): First %S is the profile name, second %S 
is the path to the profile folder.
 profileTooltip=Profile: â%Sâ â Path: â%Sâ
diff --git a/toolkit/profile/nsToolkitProfileService.cpp 
b/toolkit/profile/nsToolkitProfileService.cpp
index b80291179219..90eb336cb3d2 100644
--- a/toolkit/profile/nsToolkitProfileService.cpp
+++ b/toolkit/profile/nsToolkitProfileService.cpp
@@ -1159,9 +1159,10 @@ nsToolkitProfileService::SelectStartupProfile(
   }
 
   bool wasDefault;
+  ProfileStatus profileStatus;
   nsresult rv =
   SelectStartupProfile(&argc, argv.get(), aIsResetting, aRootDir, 
aLocalDir,
-   aProfile, aDidCreate, &wasDefault);
+   aProfile, aDidCreate, &wasDefault, profileStatus);
 
   // Since we were called outside of the normal startup path complete any
   // startup tasks.
@@ -1194,7 +1195,8 @@ nsToolkitProfileService::SelectStartupProfile(
 nsresult nsToolkitProfileService::SelectStartupProfile(
 int* aArgc, char* aArgv[], bool aIsResetting, nsIFile** aRootDir,
 nsIFile** aLocalDir, nsIToolkitProfile** aProfile, bool* aDidCreate,
-bool* aWasDefaultSelection) {
+bool* aWasDefaultSelection, ProfileStatus& aProfileStatus) {
+  aProfileStatus = PROFILE_STATUS_OK;
   if (mStartupProfileSelected) {
 return NS_ERROR_ALREADY_INITIALIZED;
   }
@@ -1288,6 +1290,13 @@ nsresult nsToolkitProfileService::SelectStartupProfile(
 rv = XRE_GetFileFromPath(arg, getter_AddRefs(lf));
 NS_ENSURE_SUCCESS(rv, rv);
 
+aProfileStatus = CheckProfileWriteAccess(lf);
+if (PROFILE_STATUS_OK != aProfileStatus) {
+  NS_ADDREF(*aRootDir = lf);
+  NS_ADDREF(*aLocalDir = lf);
+  return NS_ERROR_FAILURE;
+}
+
 // Make sure that the profile path exists and it's a directory.
 bool exists;
 rv = lf->Exists(&exists);
@@ -2081,3 +2090,47 @@ nsresult XRE_GetFileFromPath(const char* aPath, 
nsIFile** aResult) {
 #  error Platform-specific logic needed here.
 #endif
 }
+
+// Check for write permission to the profile directory by trying to create a
+// new file (after ensuring that no file with the same name exists).
+ProfileStatus nsToolkitProfileService::CheckProfileWriteAccess(
+nsIFile* aProfileDir) {
+#if defined(XP_UNIX)
+  constexpr auto writeTestFileName = u".parentwritetest"_ns;
+#else
+  constexpr auto writeTestFileName = u"parent.writetest"_ns;
+#endif
+
+  nsCOMPtr writeTestFile;
+  nsresult rv = aProfileDir->Clone(getter_AddRefs(writeTestFile));
+  if (NS_SUCCEEDED(rv)) rv = writeTestFile->Append(writeTestFileName);
+
+  if (NS_SUCCEEDED(rv)) {
+bool doesExist = false;
+rv = writeTestFile->Exists(&doesExist);
+if (NS_SUCCEEDED(rv) && doesExist) rv = writeTestFile->Remove(true);
+  }
+
+  if (NS_SUCCEEDED(rv)) {
+rv = writeTestFile->Create(nsIFile

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 16620: Clear window.name when no referrer sent

2021-06-16 Thread boklm

commit 6e7f90abc90d28eedf7a09ed0bbec3f8f9995648
Author: Kathy Brade 
Date:   Fri Oct 30 14:28:13 2015 -0400

Bug 16620: Clear window.name when no referrer sent

Convert JS implementation (within Torbutton) to a C++ browser patch.
---
 docshell/base/nsDocShell.cpp   |  60 +++
 docshell/test/mochitest/mochitest.ini  |   5 +
 docshell/test/mochitest/test_tor_bug16620.html | 211 +
 docshell/test/mochitest/tor_bug16620.html  |  51 ++
 docshell/test/mochitest/tor_bug16620_form.html |  51 ++
 modules/libpref/init/StaticPrefList.yaml   |   2 +-
 6 files changed, 379 insertions(+), 1 deletion(-)

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index d99ddc3181cf..e17aaf44c378 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -7916,11 +7916,71 @@ nsresult nsDocShell::CreateContentViewer(const 
nsACString& aContentType,
 aOpenedChannel->GetURI(getter_AddRefs(mLoadingURI));
   }
   FirePageHideNotification(!mSavingOldViewer);
+
   if (mIsBeingDestroyed) {
 // Force to stop the newly created orphaned viewer.
 viewer->Stop();
 return NS_ERROR_DOCSHELL_DYING;
   }
+
+  // Tor bug 16620: Clear window.name of top-level documents if
+  // there is no referrer. We make an exception for new windows,
+  // e.g., window.open(url, "MyName").
+  bool isNewWindowTarget = false;
+  nsCOMPtr props(do_QueryInterface(aRequest, &rv));
+  if (props) {
+props->GetPropertyAsBool(u"docshell.newWindowTarget"_ns,
+ &isNewWindowTarget);
+  }
+
+  if (!isNewWindowTarget) {
+nsCOMPtr httpChannel(do_QueryInterface(aOpenedChannel));
+nsCOMPtr httpReferrer;
+if (httpChannel) {
+  nsCOMPtr referrerInfo;
+  rv = httpChannel->GetReferrerInfo(getter_AddRefs(referrerInfo));
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (referrerInfo) {
+// We want GetComputedReferrer() instead of GetOriginalReferrer(), 
since
+// the former takes into consideration referrer policy, protocol
+// whitelisting...
+httpReferrer = referrerInfo->GetComputedReferrer();
+  }
+}
+
+bool isTopFrame = mBrowsingContext->IsTop();
+
+#ifdef DEBUG_WINDOW_NAME
+printf("DOCSHELL %p CreateContentViewer - possibly clearing 
window.name:\n",
+   this);
+printf("  current window.name: \"%s\"\n",
+   NS_ConvertUTF16toUTF8(mName).get());
+
+nsAutoCString curSpec, loadingSpec;
+if (this->mCurrentURI) mCurrentURI->GetSpec(curSpec);
+if (mLoadingURI) mLoadingURI->GetSpec(loadingSpec);
+printf("  current URI: %s\n", curSpec.get());
+printf("  loading URI: %s\n", loadingSpec.get());
+printf("  is top document: %s\n", isTopFrame ? "Yes" : "No");
+
+if (!httpReferrer) {
+  printf("  referrer: None\n");
+} else {
+  nsAutoCString refSpec;
+  httpReferrer->GetSpec(refSpec);
+  printf("  referrer: %s\n", refSpec.get());
+}
+#endif
+
+bool clearName = isTopFrame && !httpReferrer;
+if (clearName) SetName(u""_ns);
+
+#ifdef DEBUG_WINDOW_NAME
+printf("  action taken: %s window.name\n",
+   clearName ? "Cleared" : "Preserved");
+#endif
+  }
+
   mLoadingURI = nullptr;
 
   // Set mFiredUnloadEvent = false so that the unload handler for the
diff --git a/docshell/test/mochitest/mochitest.ini 
b/docshell/test/mochitest/mochitest.ini
index cea63f080117..efc991ef1eee 100644
--- a/docshell/test/mochitest/mochitest.ini
+++ b/docshell/test/mochitest/mochitest.ini
@@ -53,6 +53,10 @@ support-files =
   start_historyframe.html
   url1_historyframe.html
   url2_historyframe.html
+  tor_bug16620.html
+  tor_bug16620_form.html
+prefs =
+  gfx.font_rendering.fallback.async=false
 
 [test_anchor_scroll_after_document_open.html]
 [test_bfcache_plus_hash.html]
@@ -120,6 +124,7 @@ support-files =
 [test_framedhistoryframes.html]
 support-files = file_framedhistoryframes.html
 [test_pushState_after_document_open.html]
+[test_tor_bug16620.html]
 [test_navigate_after_pagehide.html]
 [test_redirect_history.html]
 support-files =
diff --git a/docshell/test/mochitest/test_tor_bug16620.html 
b/docshell/test/mochitest/test_tor_bug16620.html
new file mode 100644
index ..46fff5a04711
--- /dev/null
+++ b/docshell/test/mochitest/test_tor_bug16620.html
@@ -0,0 +1,211 @@
+
+
+
+
+
+  Test for Tor Bug 16620 - Clear window.name when no referrer 
sent
+  
+  
+
+
+https://trac.torproject.org/projects/tor/ticket/16620";>Tor Bug 16620
+
+// ## Test constants
+const kTestPath = "/tests/docshell/test/mochitest/";
+const kLinkFile = "tor_bug16620.html";
+const kFormFile = "tor_bug16620_form.html";
+const kBaseURL1 = "http://example.com";;
+const kBaseURL1_https = "https://example.com";;
+const kBaseURL2 = "http://example.net";;
+const kSendReferrerPref

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 9173: Change the default Firefox profile directory to be TBB-relative.

2021-06-16 Thread boklm

commit 1a6320ee7ee6a51777badaaab2ab625f5c9e385c
Author: Kathy Brade 
Date:   Fri Oct 18 15:20:06 2013 -0400

Bug 9173: Change the default Firefox profile directory to be TBB-relative.

This should eliminate our need to rely on a wrapper script that
sets /Users/arthur and launches Firefox with -profile.
---
 toolkit/profile/nsToolkitProfileService.cpp |   5 +-
 toolkit/xre/nsAppRunner.cpp |   2 +-
 toolkit/xre/nsConsoleWriter.cpp |   2 +-
 toolkit/xre/nsXREDirProvider.cpp| 149 ++--
 toolkit/xre/nsXREDirProvider.h  |  16 +--
 xpcom/io/nsAppFileLocationProvider.cpp  |  97 +++---
 6 files changed, 84 insertions(+), 187 deletions(-)

diff --git a/toolkit/profile/nsToolkitProfileService.cpp 
b/toolkit/profile/nsToolkitProfileService.cpp
index 7391b79d4102..b80291179219 100644
--- a/toolkit/profile/nsToolkitProfileService.cpp
+++ b/toolkit/profile/nsToolkitProfileService.cpp
@@ -724,10 +724,11 @@ nsresult nsToolkitProfileService::Init() {
   NS_ASSERTION(gDirServiceProvider, "No dirserviceprovider!");
   nsresult rv;
 
-  rv = nsXREDirProvider::GetUserAppDataDirectory(getter_AddRefs(mAppData));
+  rv = gDirServiceProvider->GetUserAppDataDirectory(getter_AddRefs(mAppData));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = nsXREDirProvider::GetUserLocalDataDirectory(getter_AddRefs(mTempData));
+  rv =
+  
gDirServiceProvider->GetUserLocalDataDirectory(getter_AddRefs(mTempData));
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = mAppData->Clone(getter_AddRefs(mProfileDBFile));
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 3a9928cee452..affe01689afd 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -3705,7 +3705,7 @@ int XREMain::XRE_mainInit(bool* aExitFlag) {
   if ((mAppData->flags & NS_XRE_ENABLE_CRASH_REPORTER) &&
   NS_SUCCEEDED(CrashReporter::SetExceptionHandler(xreBinDirectory))) {
 nsCOMPtr file;
-rv = nsXREDirProvider::GetUserAppDataDirectory(getter_AddRefs(file));
+rv = mDirProvider.GetUserAppDataDirectory(getter_AddRefs(file));
 if (NS_SUCCEEDED(rv)) {
   CrashReporter::SetUserAppDataDirectory(file);
 }
diff --git a/toolkit/xre/nsConsoleWriter.cpp b/toolkit/xre/nsConsoleWriter.cpp
index d89ea3bde31d..4a9a6d28034a 100644
--- a/toolkit/xre/nsConsoleWriter.cpp
+++ b/toolkit/xre/nsConsoleWriter.cpp
@@ -29,7 +29,7 @@ void WriteConsoleLog() {
   } else {
 if (!gLogConsoleErrors) return;
 
-rv = nsXREDirProvider::GetUserAppDataDirectory(getter_AddRefs(lfile));
+rv = gDirServiceProvider->GetUserAppDataDirectory(getter_AddRefs(lfile));
 if (NS_FAILED(rv)) return;
 
 lfile->AppendNative("console.log"_ns);
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index 1fae1b0c8feb..5cc6f0c86f27 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -32,6 +32,7 @@
 #include "nsArrayEnumerator.h"
 #include "nsEnumeratorUtils.h"
 #include "nsReadableUtils.h"
+#include "nsXPCOMPrivate.h"  // for XPCOM_FILE_PATH_SEPARATOR
 
 #include "SpecialSystemDirectory.h"
 
@@ -255,9 +256,6 @@ nsresult nsXREDirProvider::GetUserProfilesRootDir(nsIFile** 
aResult) {
   nsresult rv = GetUserDataDirectory(getter_AddRefs(file), false);
 
   if (NS_SUCCEEDED(rv)) {
-#if !defined(XP_UNIX) || defined(XP_MACOSX)
-rv = file->AppendNative("Profiles"_ns);
-#endif
 // We must create the profile directory here if it does not exist.
 nsresult tmp = EnsureDirectoryExists(file);
 if (NS_FAILED(tmp)) {
@@ -273,9 +271,6 @@ nsresult 
nsXREDirProvider::GetUserProfilesLocalDir(nsIFile** aResult) {
   nsresult rv = GetUserDataDirectory(getter_AddRefs(file), true);
 
   if (NS_SUCCEEDED(rv)) {
-#if !defined(XP_UNIX) || defined(XP_MACOSX)
-rv = file->AppendNative("Profiles"_ns);
-#endif
 // We must create the profile directory here if it does not exist.
 nsresult tmp = EnsureDirectoryExists(file);
 if (NS_FAILED(tmp)) {
@@ -1379,7 +1374,7 @@ nsresult 
nsXREDirProvider::SetUserDataProfileDirectory(nsCOMPtr& aFile,
 nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
 bool aLocal) {
   // Copied from nsAppFileLocationProvider (more or less)
-  nsresult rv;
+  NS_ENSURE_ARG_POINTER(aFile);
   nsCOMPtr localDir;
 
   if (aLocal && gDataDirHomeLocal) {
@@ -1389,80 +1384,39 @@ nsresult 
nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
 return gDataDirHome->Clone(aFile);
   }
 
-#if defined(XP_MACOSX)
-  FSRef fsRef;
-  OSType folderType;
-  if (aLocal) {
-folderType = kCachedDataFolderType;
-  } else {
-#  ifdef MOZ_THUNDERBIRD
-folderType = kDomainLibraryFolderType;
-#  else
-folderType = kApplicationSupportFolderType;
-#  endif
-  }
-  OSErr err = ::FSFindFolder(kUserDomain, folderType, kCreateFolder, &fsRef);
-  NS_ENSURE_FALSE(err, NS_ERROR_FAILURE);
-
-  rv = NS_NewNativeLocalFile

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 13028: Prevent potential proxy bypass cases.

2021-06-16 Thread boklm

commit 83c98ee50840698434bc5c14dba098313fc4c348
Author: Mike Perry 
Date:   Mon Sep 29 14:30:19 2014 -0700

Bug 13028: Prevent potential proxy bypass cases.

It looks like these cases should only be invoked in the NSS command line
tools, and not the browser, but I decided to patch them anyway because there
literally is a maze of network function pointers being passed around, and 
it's
very hard to tell if some random code might not pass in the proper proxied
versions of the networking code here by accident.
---
 security/nss/lib/certhigh/ocsp.c|  8 
 .../lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c | 21 +
 2 files changed, 29 insertions(+)

diff --git a/security/nss/lib/certhigh/ocsp.c b/security/nss/lib/certhigh/ocsp.c
index cea8456606bf..86fa971cfbef 100644
--- a/security/nss/lib/certhigh/ocsp.c
+++ b/security/nss/lib/certhigh/ocsp.c
@@ -2932,6 +2932,14 @@ ocsp_ConnectToHost(const char *host, PRUint16 port)
 PRNetAddr addr;
 char *netdbbuf = NULL;
 
+// XXX: Do we need a unittest ifdef here? We don't want to break the 
tests, but
+// we want to ensure nothing can ever hit this code in production.
+#if 1
+printf("Tor Browser BUG: Attempted OSCP direct connect to %s, port %u\n", 
host,
+port);
+goto loser;
+#endif
+
 sock = PR_NewTCPSocket();
 if (sock == NULL)
 goto loser;
diff --git a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c 
b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
index e8698376b5be..85791d84a932 100644
--- a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
+++ b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
@@ -1334,6 +1334,13 @@ pkix_pl_Socket_Create(
 plContext),
 PKIX_COULDNOTCREATESOCKETOBJECT);
 
+// XXX: Do we need a unittest ifdef here? We don't want to break the 
tests, but
+// we want to ensure nothing can ever hit this code in production.
+#if 1
+printf("Tor Browser BUG: Attempted pkix direct socket connect\n");
+PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED);
+#endif
+
 socket->isServer = isServer;
 socket->timeout = timeout;
 socket->clientSock = NULL;
@@ -1433,6 +1440,13 @@ pkix_pl_Socket_CreateByName(
 
 localCopyName = PL_strdup(serverName);
 
+// XXX: Do we need a unittest ifdef here? We don't want to break the 
tests, but
+// we want to ensure nothing can ever hit this code in production.
+#if 1
+printf("Tor Browser BUG: Attempted pkix direct connect to %s\n", 
serverName);
+PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED);
+#endif
+
 sepPtr = strchr(localCopyName, ':');
 /* First strip off the portnum, if present, from the end of the name */
 if (sepPtr) {
@@ -1582,6 +1596,13 @@ pkix_pl_Socket_CreateByHostAndPort(
 PKIX_ENTER(SOCKET, "pkix_pl_Socket_CreateByHostAndPort");
 PKIX_NULLCHECK_THREE(hostname, pStatus, pSocket);
 
+// XXX: Do we need a unittest ifdef here? We don't want to break the 
tests, but
+// we want to ensure nothing can ever hit this code in production.
+#if 1
+printf("Tor Browser BUG: Attempted pkix direct connect to %s, port 
%u\n", hostname,
+portnum);
+PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED);
+#endif
 
 prstatus = PR_GetHostByName(hostname, buf, sizeof(buf), &hostent);
 



___
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-89.0-10.0-1] Bug 16439: Remove screencasting code

2021-06-16 Thread boklm

commit f95603d592ba73c8036cd0c0f5835523ea7c71ac
Author: Kathy Brade 
Date:   Wed Jun 24 11:01:11 2015 -0400

Bug 16439: Remove screencasting code

We avoid including the screencasting code on mobile (it got ripped out
for desktop in bug 1393582) by simply excluding the related JS modules
from Tor Browser.
---
 toolkit/modules/moz.build | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index 435e36552e94..92dffe2ffe01 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -263,10 +263,11 @@ if "Android" != CONFIG["OS_TARGET"]:
 ]
 else:
 DEFINES["ANDROID"] = True
-EXTRA_JS_MODULES += [
-"secondscreen/RokuApp.jsm",
-"secondscreen/SimpleServiceDiscovery.jsm",
-]
+if not CONFIG["TOR_BROWSER_VERSION"]:
+EXTRA_JS_MODULES += [
+"secondscreen/RokuApp.jsm",
+"secondscreen/SimpleServiceDiscovery.jsm",
+]
 
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":



___
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-89.0-10.0-1] Bug 10760: Integrate TorButton to TorBrowser core

2021-06-16 Thread boklm

commit 42229aa8b1f875cb54599920b6e774b1fcc832bb
Author: Alex Catarineu 
Date:   Wed Feb 19 23:05:08 2020 +0100

Bug 10760: Integrate TorButton to TorBrowser core

Because of the non-restartless nature of Torbutton, it required
a two-stage installation process. On mobile, it was a problem,
because it was not loading when the user opened the browser for
the first time.

Moving it to tor-browser and making it a system extension allows it
to load when the user opens the browser for first time.

Additionally, this patch also fixes Bug 27611.

Bug 26321: New Circuit and New Identity menu items

Bug 14392: Make about:tor behave like other initial pages.

Bug 25013: Add torbutton as a tor-browser submodule
---
 .gitmodules|  3 ++
 browser/base/content/aboutDialog.xhtml | 38 +++--
 browser/base/content/browser-doctype.inc   |  6 +++
 browser/base/content/browser-menubar.inc   | 47 ++
 browser/base/content/browser-sets.inc  |  2 +
 browser/base/content/browser.js|  1 +
 browser/base/content/browser.xhtml | 26 +++-
 .../controlcenter/content/identityPanel.inc.xhtml  | 44 
 browser/installer/package-manifest.in  |  2 +
 docshell/base/nsAboutRedirector.cpp|  6 ++-
 docshell/build/components.conf |  1 +
 mobile/android/installer/package-manifest.in   |  4 ++
 toolkit/moz.build  |  1 +
 .../mozapps/extensions/internal/XPIProvider.jsm|  9 +
 toolkit/torproject/torbutton   |  1 +
 .../lib/environments/browser-window.js |  6 ++-
 16 files changed, 172 insertions(+), 25 deletions(-)

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index ..2f03bd8e22df
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "toolkit/torproject/torbutton"]
+   path = toolkit/torproject/torbutton
+   url = https://git.torproject.org/torbutton.git
diff --git a/browser/base/content/aboutDialog.xhtml 
b/browser/base/content/aboutDialog.xhtml
index 55c8b1c2c5f7..4eb122b0b2d8 100644
--- a/browser/base/content/aboutDialog.xhtml
+++ b/browser/base/content/aboutDialog.xhtml
@@ -7,11 +7,11 @@
 
 
 
+
 
+
 
 
 http://www.w3.org/1999/xhtml";
@@ -28,7 +28,7 @@
 data-l10n-id="aboutDialog-title"
 #endif
 role="dialog"
-aria-describedby="version distribution distributionId communityDesc 
contributeDesc trademark"
+aria-describedby="version distribution distributionId projectDesc 
helpDesc trademark trademarkTor"
 >
 #ifdef XP_MACOSX
 #include macWindow.inc.xhtml
@@ -146,24 +146,36 @@
   
 
   
-  
-https://www.mozilla.org/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog";
 data-l10n-name="community-mozillaLink"/>
-
+  
+  
+  
+  
+&project.start;
+https://www.torproject.org/";>
+  &project.tpoLink;
+&project.end;
   
-  
-https://donate.mozilla.org/?utm_source=firefox&utm_medium=referral&utm_campaign=firefox_about&utm_content=firefox_about";
 data-l10n-name="helpus-donateLink"/>
-https://www.mozilla.org/contribute/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog";
 data-l10n-name="helpus-getInvolvedLink"/>
+  
+&help.start;
+https://donate.torproject.org/";>
+  &help.donateLink;
+
+&help.or;
+https://community.torproject.org/";>
+  &help.getInvolvedLink;
+&help.end;
   
 
   
 
 
-  
-
-
-https://www.mozilla.org/privacy/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog";
 data-l10n-id="bottomLinks-privacy"/>
+  
+https://support.torproject.org/";>&bottomLinks.questions;
+https://community.torproject.org/relay/";>&bottomLinks.grow;
+&bottomLinks.license;
   
   
+  &tor.TrademarkStatement;
 
   
 
diff --git a/browser/base/content/browser-doctype.inc 
b/browser/base/content/browser-doctype.inc
index c3b70f6b259b..882de4cbd053 100644
--- a/browser/base/content/browser-doctype.inc
+++ b/browser/base/content/browser-doctype.inc
@@ -10,3 +10,9 @@
 %placesDTD;
 
 %syncBrandDTD;
+
+%torbuttonDTD;
+
+%aboutTorDTD;
+
+%aboutDialogDTD;
diff --git a/browser/base/content/browser-menubar.inc 
b/browser/base/content/browser-menubar.inc
index a7189c2feab9..edc0314926bd 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -38,6 +38,18 @@
   command="Tools:NonFissionWindow"

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Add TorStrings module for localization

2021-06-16 Thread boklm

commit f6ee6e25810ca708b2a43ad6e48378d766bf59ab
Author: Alex Catarineu 
Date:   Fri Jul 24 21:15:20 2020 +0200

Add TorStrings module for localization
---
 browser/modules/TorStrings.jsm | 490 +
 browser/modules/moz.build  |   1 +
 2 files changed, 491 insertions(+)

diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm
new file mode 100644
index ..e8a8d37ae373
--- /dev/null
+++ b/browser/modules/TorStrings.jsm
@@ -0,0 +1,490 @@
+"use strict";
+
+var EXPORTED_SYMBOLS = ["TorStrings"];
+
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
+);
+const { Services } = ChromeUtils.import(
+  "resource://gre/modules/Services.jsm"
+);
+const { getLocale } = ChromeUtils.import(
+  "resource://torbutton/modules/utils.js"
+);
+
+XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser"]);
+XPCOMUtils.defineLazyGetter(this, "domParser", () => {
+  const parser = new DOMParser();
+  parser.forceEnableDTD();
+  return parser;
+});
+
+/*
+  Tor DTD String Bundle
+
+  DTD strings loaded from torbutton/tor-launcher, but provide a fallback in 
case they aren't available
+*/
+class TorDTDStringBundle {
+  constructor(aBundleURLs, aPrefix) {
+let locations = [];
+for (const [index, url] of aBundleURLs.entries()) {
+  locations.push(`%dtd_${index};`);
+}
+this._locations = locations;
+this._prefix = aPrefix;
+  }
+
+  // copied from testing/marionette/l10n.js
+  localizeEntity(urls, id) {
+// Use the DOM parser to resolve the entity and extract its real value
+let header = ``;
+let elem = `&${id};`;
+let doc = domParser.parseFromString(header + elem, "text/xml");
+let element = doc.querySelector("elem[id='elementID']");
+
+if (element === null) {
+  throw new Error(`Entity with id='${id}' hasn't been found`);
+}
+
+return element.textContent;
+  }
+
+  getString(key, fallback) {
+if (key) {
+  try {
+return this.localizeEntity(this._bundleURLs, `${this._prefix}${key}`);
+  } catch (e) {}
+}
+
+// on failure, assign the fallback if it exists
+if (fallback) {
+  return fallback;
+}
+// otherwise return string key
+return `$(${key})`;
+  }
+}
+
+/*
+  Tor Property String Bundle
+
+  Property strings loaded from torbutton/tor-launcher, but provide a fallback 
in case they aren't available
+*/
+class TorPropertyStringBundle {
+  constructor(aBundleURL, aPrefix) {
+try {
+  this._bundle = Services.strings.createBundle(aBundleURL);
+} catch (e) {}
+
+this._prefix = aPrefix;
+  }
+
+  getString(key, fallback) {
+if (key) {
+  try {
+return this._bundle.GetStringFromName(`${this._prefix}${key}`);
+  } catch (e) {}
+}
+
+// on failure, assign the fallback if it exists
+if (fallback) {
+  return fallback;
+}
+// otherwise return string key
+return `$(${key})`;
+  }
+}
+
+/*
+  Security Level Strings
+*/
+var TorStrings = {
+  /*
+Tor Browser Security Level Strings
+  */
+  securityLevel: (function() {
+let tsb = new TorDTDStringBundle(
+  ["chrome://torbutton/locale/torbutton.dtd"],
+  "torbutton.prefs.sec_"
+);
+let getString = function(key, fallback) {
+  return tsb.getString(key, fallback);
+};
+
+// read localized strings from torbutton; but use hard-coded en-US strings 
as fallbacks in case of error
+let retval = {
+  securityLevel: getString("caption", "Security Level"),
+  customWarning: getString("custom_warning", "Custom"),
+  overview: getString(
+"overview",
+"Disable certain web features that can be used to attack your security 
and anonymity."
+  ),
+  standard: {
+level: getString("standard_label", "Standard"),
+tooltip: getString("standard_tooltip", "Security Level : Standard"),
+summary: getString(
+  "standard_description",
+  "All Tor Browser and website features are enabled."
+),
+  },
+  safer: {
+level: getString("safer_label", "Safer"),
+tooltip: getString("safer_tooltip", "Security Level : Safer"),
+summary: getString(
+  "safer_description",
+  "Disables website features that are often dangerous, causing some 
sites to lose functionality."
+),
+description1: getString(
+  "js_on_https_sites_only",
+  "JavaScript is disabled on non-HTTPS sites."
+),
+description2: getString(
+  "limit_typography",
+  "Some fonts and math symbols are disabled."
+),
+description3: getString(
+  "click_to_play_media",
+  "Audio and video (HTML5 media), and WebGL are click-to-play."
+),
+  },
+  safest: {
+level: getString("safest_label", "Safest"),
+tooltip: getString("safest_tooltip", "Security Level : Safest"),
+summary: getString(
+  "safest

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 12974: Disable NTLM and Negotiate HTTP Auth

2021-06-16 Thread boklm

commit 3156063b1a63300f36ecc86ab3cc0ed17d76cfcc
Author: Mike Perry 
Date:   Wed Aug 27 15:19:10 2014 -0700

Bug 12974: Disable NTLM and Negotiate HTTP Auth

This is technically an embargoed Mozilla bug, so I probably shouldn't 
provide
too many details.

Suffice to say that NTLM and Negotiate auth are bad for Tor users, and I 
doubt
very many (or any of them) actually need it.

The Mozilla bug is https://bugzilla.mozilla.org/show_bug.cgi?id=1046421
---
 extensions/auth/nsHttpNegotiateAuth.cpp  | 4 
 netwerk/protocol/http/nsHttpNTLMAuth.cpp | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/extensions/auth/nsHttpNegotiateAuth.cpp 
b/extensions/auth/nsHttpNegotiateAuth.cpp
index 00d089163156..e83347188ff2 100644
--- a/extensions/auth/nsHttpNegotiateAuth.cpp
+++ b/extensions/auth/nsHttpNegotiateAuth.cpp
@@ -154,6 +154,10 @@ 
nsHttpNegotiateAuth::ChallengeReceived(nsIHttpAuthenticableChannel* authChannel,
   nsIAuthModule* rawModule = (nsIAuthModule*)*continuationState;
 
   *identityInvalid = false;
+
+  /* Always fail Negotiate auth for Tor Browser. We don't need it. */
+  return NS_ERROR_ABORT;
+
   if (rawModule) {
 return NS_OK;
   }
diff --git a/netwerk/protocol/http/nsHttpNTLMAuth.cpp 
b/netwerk/protocol/http/nsHttpNTLMAuth.cpp
index 0a30de051014..891aaadfd758 100644
--- a/netwerk/protocol/http/nsHttpNTLMAuth.cpp
+++ b/netwerk/protocol/http/nsHttpNTLMAuth.cpp
@@ -168,6 +168,9 @@ 
nsHttpNTLMAuth::ChallengeReceived(nsIHttpAuthenticableChannel* channel,
 
   *identityInvalid = false;
 
+  /* Always fail Negotiate auth for Tor Browser. We don't need it. */
+  return NS_ERROR_ABORT;
+
   // Start a new auth sequence if the challenge is exactly "NTLM".
   // If native NTLM auth apis are available and enabled through prefs,
   // try to use them.



___
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-89.0-10.0-1] TB3: Tor Browser's official .mozconfigs.

2021-06-16 Thread boklm

commit 5e8d974f7f3716a4691986d3b02bbd8c669917da
Author: Mike Perry 
Date:   Mon May 6 15:51:06 2013 -0700

TB3: Tor Browser's official .mozconfigs.

Also:
Bug #9829.1: new .mozconfig file for the new cross-compiler and ESR24
Changes needed to build Mac in 64bit
Bug 10715: Enable Webgl for mingw-w64 again.
Disable ICU when cross-compiling; clean-up.
Bug 15773: Enable ICU on OS X
Bug 15990: Don't build the sandbox with mingw-w64
Bug 12761: Switch to ESR 38 for OS X
Updating .mozconfig-asan
Bug 12516: Compile hardenend Tor Browser with -fwrapv
Bug 18331: Switch to Mozilla's toolchain for building Tor Browser for OS X
Bug 17858: Cannot create incremental MARs for hardened builds.
Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff
(which is part of mar-tools and is not distributed to end-users) with
ASan.
Bug 13419: Add back ICU for Windows
Bug 21239: Use GTK2 for ESR52 Linux builds
Bug 23025: Add hardening flags for macOS
Bug 24478: Enable debug assertions and tests in our ASan builds
--enable-proxy-bypass-protection
Bug 27597: ASan build option in tor-browser-build is broken

Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds

This fixes a problem where some preferences had the wrong default value.
Also see bug 27472 where we made a similar fix for Android.

Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING

Bug 31450: Set proper BINDGEN_CFLAGS for ASan builds

Add an --enable-tor-browser-data-outside-app-dir configure option

Add --with-tor-browser-version configure option

Bug 21849: Don't allow SSL key logging.

Bug 31457: disable per-installation profiles

The dedicated profiles (per-installation) feature does not interact
well with our bundled profiles on Linux and Windows, and it also causes
multiple profiles to be created on macOS under TorBrowser-Data.

Bug 31935: Disable profile downgrade protection.

Since Tor Browser does not support more than one profile, disable
the prompt and associated code that offers to create one when a
version downgrade situation is detected.

Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT

Bug 25741 - TBA: Disable features at compile-time

MOZ_NATIVE_DEVICES for casting and the media player
MOZ_TELEMETRY_REPORTING for telemetry
MOZ_DATA_REPORTING for all data reporting preferences (crashreport, 
telemetry, geo)

Bug 25741 - TBA: Add default configure options in dedicated file

Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION

Bug 29859: Disable HLS support for now

Add --disable-tor-launcher build option

Add --enable-tor-browser-update build option

Bug 33734: Set MOZ_NORMANDY to False

Bug 33851: Omit Parental Controls.

Bug 40061: Omit the Windows default browser agent from the build

Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files
---
 .mozconfig| 39 
 .mozconfig-android| 36 ++
 .mozconfig-asan   | 44 +++
 .mozconfig-mac| 56 +++
 .mozconfig-mingw  | 31 +++
 browser/base/moz.build|  3 ++
 browser/installer/Makefile.in |  8 +
 browser/moz.configure |  8 ++---
 build/moz.configure/old.configure |  5 
 mobile/android/confvars.sh|  9 ++
 mobile/android/geckoview/build.gradle |  1 +
 mobile/android/moz.configure  | 22 --
 mobile/android/torbrowser.configure   | 30 +++
 old-configure.in  | 49 ++
 security/moz.build|  2 +-
 security/nss/lib/ssl/Makefile |  2 +-
 toolkit/modules/AppConstants.jsm  | 15 ++
 toolkit/modules/moz.build |  3 ++
 18 files changed, 355 insertions(+), 8 deletions(-)

diff --git a/.mozconfig b/.mozconfig
new file mode 100755
index ..18cd1f9b6487
--- /dev/null
+++ b/.mozconfig
@@ -0,0 +1,39 @@
+. $topsrcdir/browser/config/mozconfig
+
+# This mozconfig file is not used in official Tor Browser builds.
+# It is only intended to be used when doing incremental Linux builds
+# during development. The platform-specific mozconfig configuration
+# files used in official Tor Browser releases can be found in the
+# tor-browser-build repo:
+#   https://gitweb.torproject.org/builders/tor-browser-build.git/
+# under:
+#   tor-browser-build/projects/firefox/mozconfig-$OS-$ARCH
+
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@
+mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
+export MOZILLA_OFFICIAL=1
+
+ac_add_options --enable-optimize
+ac_add_options --enable-rust-simd

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 40069: Add helpers for message passing with extensions

2021-06-16 Thread boklm

commit 0cbee1ded22ed619524d1a6099d8725a48c765cb
Author: Alex Catarineu 
Date:   Sun Aug 2 19:12:25 2020 +0200

Bug 40069: Add helpers for message passing with extensions
---
 toolkit/components/extensions/ExtensionParent.jsm | 47 +++
 1 file changed, 47 insertions(+)

diff --git a/toolkit/components/extensions/ExtensionParent.jsm 
b/toolkit/components/extensions/ExtensionParent.jsm
index 97d1609aa3d8..17b95898d995 100644
--- a/toolkit/components/extensions/ExtensionParent.jsm
+++ b/toolkit/components/extensions/ExtensionParent.jsm
@@ -263,6 +263,8 @@ const ProxyMessenger = {
   /** @type Map */
   ports: new Map(),
 
+  _torRuntimeMessageListeners: [],
+
   init() {
 this.conduit = new BroadcastConduit(ProxyMessenger, {
   id: "ProxyMessenger",
@@ -328,6 +330,10 @@ const ProxyMessenger = {
   },
 
   async recvRuntimeMessage(arg, { sender }) {
+// We need to listen to some extension messages in Tor Browser
+for (const listener of this._torRuntimeMessageListeners) {
+  listener(arg);
+}
 arg.firstResponse = true;
 let kind = await this.normalizeArgs(arg, sender);
 let result = await this.conduit.castRuntimeMessage(kind, arg);
@@ -1873,6 +1879,45 @@ for (let name of StartupCache.STORE_NAMES) {
   StartupCache[name] = new CacheStore(name);
 }
 
+async function torSendExtensionMessage(extensionId, message) {
+  // This should broadcast the message to all children "conduits"
+  // listening for a "RuntimeMessage". Those children conduits
+  // will either be extension background pages or other extension
+  // pages listening to browser.runtime.onMessage.
+  const result = await ProxyMessenger.conduit.castRuntimeMessage("messenger", {
+extensionId,
+holder: new StructuredCloneHolder(message),
+firstResponse: true,
+sender: {
+  id: extensionId,
+  envType: "addon_child",
+},
+  });
+  return result
+? result.value
+: Promise.reject({ message: ERROR_NO_RECEIVERS });
+}
+
+async function torWaitForExtensionMessage(extensionId, checker) {
+  return new Promise(resolve => {
+const msgListener = msg => {
+  try {
+if (msg && msg.extensionId === extensionId) {
+  const deserialized = msg.holder.deserialize({});
+  if (checker(deserialized)) {
+const idx = ProxyMessenger._torRuntimeMessageListeners.indexOf(
+  msgListener
+);
+ProxyMessenger._torRuntimeMessageListeners.splice(idx, 1);
+resolve(deserialized);
+  }
+}
+  } catch (e) {}
+};
+ProxyMessenger._torRuntimeMessageListeners.push(msgListener);
+  });
+}
+
 var ExtensionParent = {
   GlobalManager,
   HiddenExtensionPage,
@@ -1884,6 +1929,8 @@ var ExtensionParent = {
   promiseExtensionViewLoaded,
   watchExtensionProxyContextLoad,
   DebugUtils,
+  torSendExtensionMessage,
+  torWaitForExtensionMessage,
 };
 
 // browserPaintedPromise and browserStartupPromise are promises that



___
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-89.0-10.0-1] Bug 12620: TorBrowser regression tests

2021-06-16 Thread boklm

commit fb63af223b1bc9233657fdf474e77d6eae2c7f5f
Author: Arthur Edelstein 
Date:   Wed Aug 27 16:25:00 2014 -0700

Bug 12620: TorBrowser regression tests

Regression tests for Bug #2950: Make Permissions Manager memory-only

Regression tests for TB4: Tor Browser's Firefox preference overrides.

Note: many more functional tests could be made here

Regression tests for #2874: Block Components.interfaces from content

Bug 18923: Add a script to run all Tor Browser specific tests

Regression tests for Bug #16441: Suppress "Reset Tor Browser" prompt.
---
 run-tbb-tests| 66 +++
 tbb-tests-ignore.txt | 13 +++
 tbb-tests/browser.ini|  5 +++
 tbb-tests/browser_tor_TB4.js | 35 +++
 tbb-tests/browser_tor_bug2950.js | 74 
 tbb-tests/mochitest.ini  |  3 ++
 tbb-tests/moz.build  |  9 +
 tbb-tests/test_tor_bug2874.html  | 25 ++
 toolkit/toolkit.mozbuild |  3 +-
 9 files changed, 232 insertions(+), 1 deletion(-)

diff --git a/run-tbb-tests b/run-tbb-tests
new file mode 100755
index ..bc09839f9f05
--- /dev/null
+++ b/run-tbb-tests
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+# This script runs all the Mochitest tests that have been added or
+# modified since the last ffxbld commit.
+#
+# It does not currently run XPCShell tests. We should change this if we
+# start using this type or other types of tests.
+#
+# The logs of the tests are stored in the tbb-tests.log file.
+# Ignored tests are listed in the tbb-tests-ignore.txt file.
+#
+# https://trac.torproject.org/projects/tor/ticket/18923
+
+IFS=$'\n'
+
+if [ -n "$USE_TESTS_LIST" ] && [ -f tbb-tests-list.txt ]
+then
+echo "Using tests list from file tbb-tests-list.txt"
+tests=($(cat tbb-tests-list.txt))
+else
+ffxbld_commit=$(git log -500 --format='oneline' | grep "TB3: Tor Browser's 
official .mozconfigs." \
+| head -1 | cut -d ' ' -f 1)
+
+tests=($(git diff --name-status "$ffxbld_commit" HEAD | \
+grep -e '^[AM].*/test_[^/]\+\.\(html\|xul\)$' \
+ -e '^[AM].*/browser_[^/]\+\.js$' \
+ | sed 's/^[AM]\s\+//'))
+fi
+
+echo 'The following tests will be run:'
+for i in "${!tests[@]}"
+do
+if [ -z "$USE_TESTS_LIST" ] \
+&& grep -q "^${tests[$i]}$" tbb-tests-ignore.txt
+then
+unset "tests[$i]"
+continue
+fi
+echo "- ${tests[$i]}"
+done
+
+if [ -n "$WRITE_TESTS_LIST" ]
+then
+rm -f tbb-tests-list.txt
+for i in "${!tests[@]}"
+do
+echo "${tests[$i]}" >> tbb-tests-list.txt
+done
+exit 0
+fi
+
+rm -f tbb-tests.log
+echo $'\n''Starting tests'
+# We need `security.nocertdb = false` because of #18087. That pref is
+# forced to have the same value as `browser.privatebrowsing.autostart` in
+# torbutton, so we just set `browser.privatebrowsing.autostart=false` here.
+./mach mochitest --log-tbpl tbb-tests.log \
+--setpref network.file.path_blacklist='' \
+--setpref extensions.torbutton.use_nontor_proxy=true \
+--setpref browser.privatebrowsing.autostart=false \
+ "${tests[@]}"
+
+echo "*"
+echo "*"
+echo "Summary of failed tests:"
+grep --color=never TEST-UNEXPECTED-FAIL tbb-tests.log
diff --git a/tbb-tests-ignore.txt b/tbb-tests-ignore.txt
new file mode 100644
index ..ee3927a9e7c4
--- /dev/null
+++ b/tbb-tests-ignore.txt
@@ -0,0 +1,13 @@
+browser/extensions/onboarding/test/browser/browser_onboarding_accessibility.js
+browser/extensions/onboarding/test/browser/browser_onboarding_keyboard.js
+browser/extensions/onboarding/test/browser/browser_onboarding_notification.js
+browser/extensions/onboarding/test/browser/browser_onboarding_notification_2.js
+browser/extensions/onboarding/test/browser/browser_onboarding_notification_3.js
+browser/extensions/onboarding/test/browser/browser_onboarding_notification_4.js
+browser/extensions/onboarding/test/browser/browser_onboarding_notification_5.js
+browser/extensions/onboarding/test/browser/browser_onboarding_notification_click_auto_complete_tour.js
+browser/extensions/onboarding/test/browser/browser_onboarding_select_default_tour.js
+browser/extensions/onboarding/test/browser/browser_onboarding_skip_tour.js
+browser/extensions/onboarding/test/browser/browser_onboarding_tours.js
+browser/extensions/onboarding/test/browser/browser_onboarding_tourset.js
+browser/extensions/onboarding/test/browser/browser_onboarding_uitour.js
diff --git a/tbb-tests/browser.ini b/tbb-tests/browser.ini
new file mode 100644
index ..f481660f1417
--- /dev/null
+++ b/tbb-tests/browser.ini
@@ -0,0 +1,5 @@
+[DEFAULT]
+
+[browser_tor_bug2950.js]
+[browser_tor_omnibox.js]
+[browser_tor_TB4.js]
diff --git a/tbb-tests/browser_tor_TB4.js b/tbb-tests/browser_tor_TB4.js
new file mode 100644
index 000

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] TB4: Tor Browser's Firefox preference overrides.

2021-06-16 Thread boklm

commit c2b585ab9c2fae3d63707c9bbb0340a593913fbf
Author: Mike Perry 
Date:   Tue Sep 10 18:20:43 2013 -0700

TB4: Tor Browser's Firefox preference overrides.

This hack directly includes our preference changes in omni.ja.

Bug 18292: Staged updates fail on Windows

Temporarily disable staged updates on Windows.

Bug 18297: Use separate Noto JP,KR,SC,TC fonts

Bug 23404: Add Noto Sans Buginese to the macOS whitelist

Bug 23745: Set dom.indexedDB.enabled = true

Bug 13575: Disable randomised Firefox HTTP cache decay user tests.
(Fernando Fernandez Mancera )

Bug 17252: Enable session identifiers with FPI

Session tickets and session identifiers were isolated
by OriginAttributes, so we can re-enable them by
allowing the default value (true) of
"security.ssl.disable_session_identifiers".

The pref "security.enable_tls_session_tickets" is obsolete
(removed in https://bugzilla.mozilla.org/917049)

Bug 14952: Enable http/2 and AltSvc

In Firefox, SPDY/HTTP2 now uses Origin Attributes for
isolation of connections, push streams, origin frames, etc.
That means we get first-party isolation provided
"privacy.firstparty.isolate" is true. So in this patch, we
stop overriding "network.http.spdy.enabled" and
"network.http.spdy.enabled.http2".

Alternate Services also use Origin Attributes for isolation.
So we stop overriding
"network.http.altsvc.enabled" and "network.http.altsvc.oe"
as well.

(All 4 of the abovementioned "network.http.*" prefs adopt
Firefox 60ESR's default value of true.)

However, we want to disable HTTP/2 push for now, so we
set "network.http.spdy.allow-push" to false.

"network.http.spdy.enabled.http2draft" was removed in Bug 1132357.
"network.http.sped.enabled.v2" was removed in Bug 912550.
"network.http.sped.enabled.v3" was removed in Bug 1097944.
"network.http.sped.enabled.v3-1" was removed in Bug 1248197.

Bug 26114: addons.mozilla.org is not special
* Don't expose navigator.mozAddonManager on any site
* Don't block NoScript from modifying addons.mozilla.org or other sites

Enable ReaderView mode again (#27281).

Bug 29916: Make sure enterprise policies are disabled

Bug 2874: Block Components.interfaces from content

Bug 26146: Spoof HTTP User-Agent header for desktop platforms

In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent
header and to JavaScript code via navigator.userAgent. To avoid
leaking the OS inside each HTTP request (which many web servers
log), always use the Windows 7 OS value in the desktop User-Agent
header. We continue to allow access to the actual OS via JavaScript,
since doing so improves compatibility with web applications such
as GitHub and Google Docs.

Bug 12885: Windows Jump Lists fail for Tor Browser

Jumplist entries are stored in a binary file in:
  %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\
and has a name in the form
  [a-f0-9]+.customDestinations-ms

The hex at the front is unique per app, and is ultimately derived from
something called the 'App User Model ID' (AUMID) via some unknown
hashing method. The AUMID is provided as a key when programmatically
creating, updating, and deleting a jumplist. The default behaviour in
firefox is for the installer to define an AUMID for an app, and save it
in the registry so that the jumplist data can be removed by the
uninstaller.

However, the Tor Browser does not set this (or any other) regkey during
installation, so this codepath fails and the app's AUMID is left
undefined. As a result the app's AUMID ends up being defined by
windows, but unknowable by Tor Browser. This unknown AUMID is used to
create and modify the jumplist, but the delete API requires that we
provide the app's AUMID explicitly. Since we don't know what the AUMID
is (since the expected regkey where it is normally stored does not
exist) jumplist deletion will fail and we will leave behind a mostly
empty customDestinations-ms file. The name of the file is derived from
the binary path, so an enterprising person could reverse engineer how
that hex name is calculated, and generate the name for Tor Browser's
default Desktop installation path to determine whether a person had
used Tor Browser in the past.

The 'taskbar.grouping.useprofile' option that is enabled by this patch
works around this AUMID problem by having firefox.exe create it's own
AUMID based on the profile path (rather than looking for a regkey). This
way, if a user goes in and enables and disables jumplist entries, the
backing store is properly deleted.

Unfortunately, all windows users currently have this file lurking in
the above mentioned di

[tor-commits] [tor-browser/tor-browser-89.0-10.0-1] Bug 28044: Integrate Tor Launcher into tor-browser

2021-06-16 Thread boklm

commit b1261175a07f2b9af238dfa62612fdef0fb7127b
Author: Kathy Brade 
Date:   Tue Feb 26 10:07:17 2019 -0500

Bug 28044: Integrate Tor Launcher into tor-browser

Build and package Tor Launcher as part of the browser (similar to
how pdfjs is handled).

If a Tor Launcher extension is present in the user's profile, it is
removed.
---
 browser/extensions/moz.build|  3 +++
 browser/installer/package-manifest.in   |  5 +
 toolkit/mozapps/extensions/internal/XPIProvider.jsm | 10 ++
 3 files changed, 18 insertions(+)

diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
index 269dcb2a32d6..9daae31eca43 100644
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
@@ -12,3 +12,6 @@ DIRS += [
 "report-site-issue",
 "pictureinpicture",
 ]
+
+if not CONFIG["TOR_BROWSER_DISABLE_TOR_LAUNCHER"]:
+DIRS += ["tor-launcher"]
diff --git a/browser/installer/package-manifest.in 
b/browser/installer/package-manifest.in
index 5d1810c4ecd3..20b3ca4971e3 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -253,6 +253,11 @@
 @RESPATH@/browser/chrome/browser.manifest
 @RESPATH@/chrome/pdfjs.manifest
 @RESPATH@/chrome/pdfjs/*
+#ifndef TOR_BROWSER_DISABLE_TOR_LAUNCHER
+@RESPATH@/browser/chrome/torlauncher.manifest
+@RESPATH@/browser/chrome/torlauncher/*
+@RESPATH@/browser/@PREF_DIR@/torlauncher-prefs.js
+#endif
 @RESPATH@/chrome/toolkit@JAREXT@
 @RESPATH@/chrome/toolkit.manifest
 @RESPATH@/chrome/recording.manifest
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm 
b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 0599e221ed1e..bec6e27388ac 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -1472,6 +1472,16 @@ var XPIStates = {
   for (let [id, file] of loc.readAddons()) {
 knownIds.delete(id);
 
+// Since it is now part of the browser, uninstall the Tor Launcher
+// extension. This will remove the Tor Launcher .xpi from user
+// profiles on macOS.
+if (id === "tor-launc...@torproject.org") {
+  logger.debug("Uninstalling the Tor Launcher extension.");
+  loc.installer.uninstallAddon(id);
+  changed = true;
+  continue;
+}
+
 let xpiState = loc.get(id);
 if (!xpiState) {
   // If the location is not supported for sideloading, skip new



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

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

2021-06-16 Thread translation

commit 84ae1a97b9b3cc9dfae1e0ec3fadc165a14d06d2
Author: Translation commit bot 
Date:   Wed Jun 16 20:17:31 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
---
 ru/network-settings.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ru/network-settings.dtd b/ru/network-settings.dtd
index 609f75fe54..d744a2b66d 100644
--- a/ru/network-settings.dtd
+++ b/ru/network-settings.dtd
@@ -86,10 +86,10 @@
 
 
 
-
+
 
-
-
+
+
 
 
-
+

___
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-06-16 Thread translation

commit 2b13123b20b832cd253de0d29db7d4804d965f7b
Author: Translation commit bot 
Date:   Wed Jun 16 20:16:26 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 ru.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ru.po b/ru.po
index 9a408eead2..7b585859b3 100644
--- a/ru.po
+++ b/ru.po
@@ -29,6 +29,7 @@
 # solokot , 2017
 # Valid Olov, 2013
 # Viktor Kutcevich , 2019
+# Vladimir Korsakov , 2021
 # Wagan , 2015
 # Ziggi, 2020
 # Andrey Kostrikov , 2016
@@ -40,8 +41,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-28 18:17-0500\n"
-"PO-Revision-Date: 2021-06-01 12:30+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-06-16 20:12+\n"
+"Last-Translator: Vladimir Korsakov \n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2021-06-16 Thread translation

commit ffaf175ee84f36317b8e2a1611f826e394d097fb
Author: Translation commit bot 
Date:   Wed Jun 16 20:15:44 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 ru.po | 41 +
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/ru.po b/ru.po
index 6ae841efab..e93b53fef7 100644
--- a/ru.po
+++ b/ru.po
@@ -29,6 +29,7 @@
 # solokot , 2017
 # Valid Olov, 2013
 # Viktor Kutcevich , 2019
+# Vladimir Korsakov , 2021
 # Wagan , 2015
 # Ziggi, 2020
 # Andrey Kostrikov , 2016
@@ -40,8 +41,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-28 18:17-0500\n"
-"PO-Revision-Date: 2021-06-01 12:30+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-06-16 20:12+\n"
+"Last-Translator: Vladimir Korsakov \n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2710,76 +2711,76 @@ msgstr ""
 msgid ""
 "Learn more about how Tails connects "
 "to Tor"
-msgstr ""
+msgstr "Ð£Ð·Ð½Ð°Ð¹ÑÐµ Ð±Ð¾Ð»ÑÑÐµ Ð¾ 
ÑÐ¾Ð¼, ÐºÐ°Ðº Tails Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ°ÐµÑÑÑ Ðº Tor"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1091
 msgid "Connect to a local network"
-msgstr ""
+msgstr "ÐÐ¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ Ðº Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð¹ ÑÐµÑÐ¸"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1108
 msgid ""
 "You are not connected to a local network yet. To be able to connect to the "
 "Tor network, you first need to connect to a Wi-Fi, wire, or mobile network."
-msgstr ""
+msgstr "ÐÑ ÐµÑÐµ Ð½Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ñ Ðº Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð¹ ÑÐµÑÐ¸. 
Ð§ÑÐ¾Ð±Ñ Ð¸Ð¼ÐµÑÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ Ðº 
ÑÐµÑÐ¸ Tor, Ð²Ð°Ð¼ ÑÐ½Ð°ÑÐ°Ð»Ð° Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ 
Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ Ðº Wi-Fi, Ð¿ÑÐ¾Ð²Ð¾Ð´Ð½Ð¾Ð¹ Ð¸Ð»Ð¸ Ð¼Ð¾Ð±Ð¸Ð»ÑÐ½Ð¾Ð¹ 
ÑÐµÑÐ¸."
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1124
 msgid ""
 "To connect to a Wi-Fi network, open the system menu in the top-right corner "
 "of the screen, choose Wi-Fi Not Connected and then Select "
 "Network."
-msgstr ""
+msgstr "Ð§ÑÐ¾Ð±Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ Ðº ÑÐµÑÐ¸ Wi-Fi, 
Ð¾ÑÐºÑÐ¾Ð¹ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ Ð² Ð¿ÑÐ°Ð²Ð¾Ð¼ Ð²ÐµÑÑÐ½ÐµÐ¼ 
ÑÐ³Ð»Ñ ÑÐºÑÐ°Ð½Ð°, Ð²ÑÐ±ÐµÑÐ¸ÑÐµ Wi-Fi Ð½Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½, 
Ð° Ð·Ð°ÑÐµÐ¼ ÐÑÐ±ÑÐ°ÑÑ ÑÐµÑÑ."
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1167
 msgid "Testing Internet accessâ¦"
-msgstr ""
+msgstr "ÐÑÐ¾Ð²ÐµÑÐºÐ° Ð´Ð¾ÑÑÑÐ¿Ð° Ðº ÑÐµÑÐ¸ Ð¸Ð½ÑÐµÑÐ½ÐµÑ..."
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1207
 msgid "You have access to the Internet"
-msgstr ""
+msgstr "Ð£ Ð²Ð°Ñ ÐµÑÑÑ Ð´Ð¾ÑÑÑÐ¿ Ð² Ð¸Ð½ÑÐµÑÐ½ÐµÑ"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1241
 msgid "Testing access to Torâ¦"
-msgstr ""
+msgstr "ÐÑÐ¾Ð²ÐµÑÐºÐ° Ð´Ð¾ÑÑÑÐ¿Ð° Ðº ÑÐµÑÐ¸ Tor..."
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1284
 msgid "You can connect to Tor"
-msgstr ""
+msgstr "ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ Ðº ÑÐµÑÐ¸ Tor"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1314
 msgid "Failed to connect to Tor without bridges."
-msgstr ""
+msgstr "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ¸ÑÑÑÑ Ðº ÑÐµÑÐ¸ Tor Ð¸Ð·-Ð·Ð° 
Ð¾ÑÑÑÑÑÑÐ²Ð¸Ñ Ð¼Ð¾ÑÑÐ¾Ð²."
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1330
 msgid "Your local network is blocking access to Tor."
-msgstr ""
+msgstr "ÐÐ°ÑÐ° Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð°Ñ ÑÐµÑÑ Ð±Ð»Ð¾ÐºÐ¸ÑÑÐµÑ Ð´Ð¾ÑÑÑÐ¿ 
Ðº ÑÐµÑÐ¸ Tor."
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1362
 msgid "Connecting to Torâ¦"
-msgstr ""
+msgstr "ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ðº ÑÐµÑÐ¸ Tor..."
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1418
 msgid "Connected to Tor successfully"
-msgstr ""
+msgstr "Ð£ÑÐ¿ÐµÑÐ½Ð¾Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ðº ÑÐµÑÐ¸ Tor"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1442
 msgid "You can now browse the Internet anonymously and uncensored."
-msgstr ""
+msgstr "Ð¢ÐµÐ¿ÐµÑÑ Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿ÑÐ¾ÑÐ¼Ð°ÑÑÐ¸Ð²Ð°ÑÑ 
ÐÐ½ÑÐµÑÐ½ÐµÑ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ Ð¸ Ð±ÐµÐ· ÑÐµÐ½Ð·ÑÑÑ."
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1483
 msgid "Open Network Monitor"
-msgstr ""
+msgstr "ÐÑÐºÑÑÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð¼Ð¾Ð½Ð¸ÑÐ¾Ñ"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1497
 msgid "View Tor Circuits"
-msgstr ""
+msgstr "ÐÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ ÑÑÐµÐ¼Ñ Tor"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1511
 msgid "Reset Tor Connection"
-msgstr ""
+msgstr "Ð¡Ð±ÑÐ¾ÑÐ¸ÑÑ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ Tor"
 
 #: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:1551
 msgid "Configure a Local Proxy"
-msgstr ""
+msgstr "ÐÐ°ÑÑÑÐ¾Ð¸ÑÑ Ð»Ð¾ÐºÐ°Ð»Ñ

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

2021-06-16 Thread translation

commit 9ae217c128f50eb49f9a45af86fc962e2863d7c0
Author: Translation commit bot 
Date:   Wed Jun 16 18:46:59 2021 +

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

diff --git a/contents+cs.po b/contents+cs.po
index 0bae211c33..f0085f6adf 100644
--- a/contents+cs.po
+++ b/contents+cs.po
@@ -499,6 +499,8 @@ msgid ""
 "5. You'll need to tell your GNU/Linux that you want the ability to execute "
 "shell scripts from the graphical interface or the command line."
 msgstr ""
+"5. MusÃte GNU/Linuxu sdÄlit, Å¾e chcete mÃt moÅ¾nost spouÅ¡tÄt shellovÃ© 
skripty"
+" z grafickÃ©ho rozhranÃ nebo pÅÃkazovÃ©ho ÅÃ¡dku."
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -526,6 +528,8 @@ msgid ""
 "**Note:** On Ubuntu and some other distros if you try to launch the start-"
 "tor-browser.desktop file a text file might open up."
 msgstr ""
+"**PoznÃ¡mka:** V Ubuntu a nÄkterÃ½ch dalÅ¡Ãch distribucÃch se pÅi pokusu 
o "
+"spuÅ¡tÄnÃ souboru start-tor-browser.desktop mÅ¯Å¾e otevÅÃt textovÃ½ 
soubor."
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -535,6 +539,10 @@ msgid ""
 "Tab â Select \"Run them\" or \"Ask what to do\" under \"Executable Text "
 "Files\"."
 msgstr ""
+"Chcete-li toto chovÃ¡nÃ zmÄnit a mÃsto toho spustit ProhlÃÅ¾eÄ Tor, 
postupujte"
+" takto: OtevÅete \"Soubory\" (GNOME Files/Nautilus) â otevÅete PÅedvolby 
â "
+"pÅejdÄte na kartu \"ChovÃ¡nÃ\" â v ÄÃ¡sti \"SpustitelnÃ© textovÃ© 
soubory\" "
+"vyberte \"Spustit je\" nebo \"Zeptat se, co mÃ¡ udÄlat\"."
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -542,6 +550,8 @@ msgid ""
 "If you choose the latter click on \"Run\" after launching the start-tor-"
 "browser.desktop file."
 msgstr ""
+"Pokud zvolÃte druhou moÅ¾nost, kliknÄte po spuÅ¡tÄnÃ souboru start-tor-"
+"browser.desktop na \"Spustit\"."
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -555,7 +565,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
 msgid "`./start-tor-browser.desktop`"
-msgstr ""
+msgstr "`./start-tor-browser.desktop`"
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -563,6 +573,8 @@ msgid ""
 "See here on how to [update Tor Browser](https://tb-";
 "manual.torproject.org/updating/)."
 msgstr ""
+"Zde se dozvÃte jak [aktualizovat ProhlÃÅ¾eÄ Tor](https://tb-";
+"manual.torproject.org/updating/)."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.title)
@@ -594,7 +606,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
 msgid "### CONNECT"
-msgstr ""
+msgstr "### PÅIPOJIT"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -602,6 +614,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -635,7 +649,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
 msgid "### CONFIGURE"
-msgstr ""
+msgstr "### NASTAVIT"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -643,6 +657,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -659,6 +675,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -673,6 +691,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)

___
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-06-16 Thread translation

commit 7ba2c5d6e3f1cf7c4cfab2ebd3cc4c4a7b043f99
Author: Translation commit bot 
Date:   Wed Jun 16 15:15:11 2021 +


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

diff --git a/contents+es.po b/contents+es.po
index 8c63765e60..9a69ed6e50 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -14,8 +14,8 @@
 # Ines Branco Lopez , 2021
 # strel, 2021
 # erinm, 2021
-# Emma Peel, 2021
 # Zuhualime Akoochimoya, 2021
+# Emma Peel, 2021
 # 
 msgid ""
 msgstr ""
@@ -23,7 +23,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-06-16 15:58+CET\n"
 "PO-Revision-Date: 2019-12-11 10:50+\n"
-"Last-Translator: Zuhualime Akoochimoya, 2021\n"
+"Last-Translator: Emma Peel, 2021\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,9 +73,8 @@ msgid ""
 "Below, you'll find some different ways to volunteer with the Tor community "
 "as well as resources to better help you help Tor."
 msgstr ""
-"Debajo encontrarÃ¡s algunas maneras diferentes de obrar voluntariamente con "
-"la comunidad Tor, como asÃ tambiÃ©n recursos para ayudarte mejor a ayudar a "
-"Tor."
+"Debajo encontrarÃ¡s algunas maneras diferentes de colaborar con la comunidad "
+"Tor, como asÃ tambiÃ©n recursos que te ayudarÃ¡n a ayudar a Tor."
 
 #: https//community.torproject.org/user-research/
 #: (content/user-research/contents+en.lrpage.title)
@@ -1212,8 +1211,8 @@ msgid ""
 "However all feedback must be discussed internally across the different teams"
 " at the Tor Project first."
 msgstr ""
-"Sin embargo, todo aporte debe ser discutido internamente primero a travÃ©s de"
-" los diferentes equipos del Tor Project."
+"Sin embargo, todo aporte se debe discutir internamente primero a travÃ©s de "
+"los diferentes equipos del Tor Project."
 
 #: https//community.torproject.org/user-research/how-to-volunteer/
 #: (content/user-research/how-to-volunteer/contents+en.lrpage.body)
@@ -1234,7 +1233,7 @@ msgid ""
 "research/guidelines/) to get to know this process more."
 msgstr ""
 "Por favor lee nuestra [GuÃa](https://community.torproject.org/user-";
-"research/guidelines/) para conocer mÃ¡s acerca de este proceso."
+"research/guidelines/) para saber mÃ¡s de este proceso."
 
 #: https//community.torproject.org/user-research/how-to-volunteer/
 #: (content/user-research/how-to-volunteer/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] [tor/main] git: Don't pull github anymore in git-pull-all.sh

2021-06-16 Thread dgoulet

commit 3f73ab3f0dbd717c464c8fa899413d6a20df3587
Author: David Goulet 
Date:   Wed Jun 16 10:53:32 2021 -0400

git: Don't pull github anymore in git-pull-all.sh

Signed-off-by: David Goulet 
---
 scripts/git/git-pull-all.sh | 22 --
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh
index 94313c3473..bbe2576d8e 100755
--- a/scripts/git/git-pull-all.sh
+++ b/scripts/git/git-pull-all.sh
@@ -159,20 +159,7 @@ function goto_repo
 function fetch_origin
 {
   local cmd="git fetch origin"
-  printf "  %s Fetching origin..." "$MARKER"
-  if [ $DRY_RUN -eq 0 ]; then
-msg=$( eval "$cmd" 2>&1 )
-validate_ret $? "$msg"
-  else
-printf "\\n  %s\\n" "${IWTH}$cmd${CNRM}"
-  fi
-}
-
-# Fetch tor-github pull requests. No arguments.
-function fetch_tor_github
-{
-  local cmd="git fetch tor-github"
-  printf "  %s Fetching tor-github..." "$MARKER"
+  printf "%s Fetching origin..." "$MARKER"
   if [ $DRY_RUN -eq 0 ]; then
 msg=$( eval "$cmd" 2>&1 )
 validate_ret $? "$msg"
@@ -185,7 +172,7 @@ function fetch_tor_github
 function fetch_tor_gitlab
 {
   local cmd="git fetch tor-gitlab"
-  printf "  %s Fetching tor-gitlab..." "$MARKER"
+  printf "%s Fetching tor-gitlab..." "$MARKER"
   if [ $DRY_RUN -eq 0 ]; then
 msg=$( eval "$cmd" 2>&1 )
 validate_ret $? "$msg"
@@ -198,11 +185,10 @@ function fetch_tor_gitlab
 # Entry point #
 ###
 
-# First, fetch tor-github.
+# Get into our origin repository.
 goto_repo "$ORIGIN_PATH"
-fetch_tor_github
 
-# Then tor-gitlab
+# First, fetch tor-gitlab
 fetch_tor_gitlab
 
 # Then, fetch the origin.

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

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

2021-06-16 Thread translation

commit 139e56a45f71494115f2a48ef914321dcad70ae9
Author: Translation commit bot 
Date:   Wed Jun 16 14:46:58 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot_completed
---
 contents.pot | 557 +++
 1 file changed, 220 insertions(+), 337 deletions(-)

diff --git a/contents.pot b/contents.pot
index e6c0408b32..0829098121 100644
--- a/contents.pot
+++ b/contents.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 18:03+CET\n"
+"POT-Creation-Date: 2021-06-16 15:58+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -555,20 +555,20 @@ msgstr "We collect only necessary data to improve our 
services."
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
 msgid ""
-"Congrats! You're going to run your first User Research for Tor - and we are "
-"delighted to have you on board!"
+"Congrats! You're going to run your first User Research session for Tor â 
and"
+" we're delighted to have you on board!"
 msgstr ""
-"Congrats! You're going to run your first User Research for Tor - and we are "
-"delighted to have you on board!"
+"Congrats! You're going to run your first User Research session for Tor â 
and"
+" we're delighted to have you on board!"
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
 msgid ""
-"In this place, you will find helpful guidelines that are designed to make "
-"your research easier for you and your audience."
+"Here you will find helpful guidelines that are designed to make your "
+"research easier for both you and your audience."
 msgstr ""
-"In this place, you will find helpful guidelines that are designed to make "
-"your research easier for you and your audience."
+"Here you will find helpful guidelines that are designed to make your "
+"research easier for both you and your audience."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -587,13 +587,11 @@ msgstr "## Respect privacy"
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
 msgid ""
-"At Tor, we collect only necessary data to improve our services; we don't "
-"collect invasive data about user behaviors - we test our software, not "
-"people."
+"At Tor, we don't collect invasive data about user behavior, only the data "
+"necessary to improve our services. We test our software, not people."
 msgstr ""
-"At Tor, we collect only necessary data to improve our services; we don't "
-"collect invasive data about user behaviors - we test our software, not "
-"people."
+"At Tor, we don't collect invasive data about user behavior, only the data "
+"necessary to improve our services. We test our software, not people."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -603,15 +601,11 @@ msgstr "## Be a good listener and open-minded"
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
 msgid ""
-"Listening is a skill to build bridges. In Tor, we want people to build "
-"bridges, not walls - and we believe this is not just for our services, but "
-"also for our communities. Get in here to read some suggestions about being a"
-" better listener and make a great research experience. "
+"Listening is a skill that helps build bridges. We believe this doesn't just "
+"apply to our services, but our communities too."
 msgstr ""
-"Listening is a skill to build bridges. In Tor, we want people to build "
-"bridges, not walls - and we believe this is not just for our services, but "
-"also for our communities. Get in here to read some suggestions about being a"
-" better listener and make a great research experience. "
+"Listening is a skill that helps build bridges. We believe this doesn't just "
+"apply to our services, but our communities too."
 
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
@@ -621,276 +615,284 @@ msgstr "## Learn"
 #: https//community.torproject.org/user-research/guidelines/
 #: (content/user-research/guidelines/contents+en.lrpage.body)
 msgid ""
-"When we are in Tor training, we listen to the stories people tell us about "
-"their context, about the laws of the Internet, and the difficulties they are"
-" going through. This is how we learn how we can help and create new "
-"mechanisms to facilitate access to information through Tor products. When we"
-" listen, we do research, we learn."
+"During the training session we listen to the stories people tell us abo

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

2021-06-16 Thread translation

commit d738c3037bee13c905c0811ec2d44d72c6f2bef3
Author: Translation commit bot 
Date:   Wed Jun 16 14:17:21 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+cs.po | 20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/contents+cs.po b/contents+cs.po
index 1db366a280..0bae211c33 100644
--- a/contents+cs.po
+++ b/contents+cs.po
@@ -231,6 +231,9 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a [New Identity"
 "](/managing-identities/#new-identity) is requested)."
 msgstr ""
+"Ve vÃ½chozÃm nastavenÃ prohlÃÅ¾eÄ Tor nedrÅ¾Ã historii prohlÃÅ¾enÃ. 
Cookies jsou"
+" platnÃ© pouze pro jednu relaci (dokud nenÃ prohlÃÅ¾eÄ Tor zavÅen nebo 
dokud "
+"si nevyÅ¾Ã¡dÃ¡te Novou identitu (/managing-identities/#new-identity))."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -322,7 +325,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "### MIRRORS"
-msgstr ""
+msgstr "### MIRRORS"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -332,6 +335,10 @@ msgid ""
 "mirrors, either through [EFF](https://tor.eff.org), [Calyx "
 "Institute](https://tor.calyxinstitute.org) or [CCC](https://tor.ccc.de)."
 msgstr ""
+"Pokud si nemÅ¯Å¾ete ProhlÃÅ¾eÄ Tor stÃ¡hnout z oficiÃ¡lnÃho webu Tor 
Project, "
+"mÅ¯Å¾ete se ho pokusit stÃ¡hnout od jednoho z naÅ¡ich oficiÃ¡lnÃch 
partnerÅ¯, buÄ "
+"z [EFF](https://tor.eff.org), [Calyx "
+"Institute](https://tor.calyxinstitute.org) nebo [CCC](https://tor.ccc.de)."
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -345,6 +352,9 @@ msgid ""
 "responds to messages with links to the latest version of Tor Browser, hosted"
 " at a variety of locations, such as Dropbox, Google Drive and GitHub."
 msgstr ""
+"[GetTor](https://gettor.torproject.org/) je sluÅ¾ba, kterÃ¡ automaticky "
+"odpovÃdÃ¡ na emailovÃ© zprÃ¡vy odkazy na poslednÃ verzi ProhlÃÅ¾eÄe Tor, "
+"umÃstÄnÃ© na mnoha mÃstech, jako napÅ. Dropbox, Google Drive a GitHub."
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -358,6 +368,9 @@ msgid ""
 "in the body of the message simply write âwindowsâ, âosxâ, or 
âlinuxâ, "
 "(without quotation marks) depending on your operating system."
 msgstr ""
+"PoÅ¡lete email na [get...@torproject.org](mailto:get...@torproject.org) a v "
+"tÄle zprÃ¡vy jednoduÅ¡e napiÅ¡te âwindowsâ, âosxâ, nebo âlinuxâ 
(bez uvozovek) "
+"podle toho, kterÃ½ operaÄnÃ systÃ©m pouÅ¾ÃvÃ¡te."
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -387,6 +400,9 @@ msgid ""
 "message to [get...@torproject.org](mailto:get...@torproject.org) with the "
 "words \"linux zh\" in it."
 msgstr ""
+"Chcete-li zÃskat odkaz na staÅ¾enÃ ProhlÃÅ¾eÄe Tor pro Linux v 
ÄÃnÅ¡tinÄ, "
+"poÅ¡lete zprÃ¡vu na [get...@torproject.org](mailto:get...@torproject.org) ve "
+"tvaru \"linux zh\" (bez uvozovek)."
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.title)
@@ -410,7 +426,7 @@ msgstr "Pro Windows:"
 msgid ""
 "1. Navigate to the Tor Browser [download "
 "page](https://www.torproject.org/download)."
-msgstr ""
+msgstr "1. PÅejdÄte na [strÃ¡nku pro staÅ¾enÃ] ProhlÃÅ¾eÄe Tor"
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)

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

[tor-commits] [community/translations] content changes

2021-06-16 Thread emmapeel

commit 9e961ec5058db1862bc59ccd46345fcb1327e6c5
Author: emma peel 
Date:   Wed Jun 16 15:39:35 2021 +0200

content changes
---
 content/localization/pick-a-project/contents.lr| 38 --
 .../community-resources/good-bad-isps/contents.lr  |  3 ++
 content/user-research/reports/contents.lr  |  1 +
 3 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/content/localization/pick-a-project/contents.lr 
b/content/localization/pick-a-project/contents.lr
deleted file mode 100644
index 72c3f4c..000
--- a/content/localization/pick-a-project/contents.lr
+++ /dev/null
@@ -1,38 +0,0 @@
-section: localization

-section_id: localization

-color: primary

-_template: layout.html

-title: Pick a project

-subtitle: How to find a project to contribute to

-key: 3

-html: two-columns-page.html

-body:
-We want our tools to be available and localized for anyone who wants to use 
them, and we appreciate your help doing so. To find out where your knowledge 
may be most helpful, take a look at the translation progress for the Tor 
ecosystem of tools so far:
-
-
-
-Please consider [helping with 
translations](/localization/becoming-tor-translator/) in your native language, 
however don't start a new regional variant of your language if there is a more 
general language available (for example: contribute to the French translation, 
instead of starting Canadian French).
-
-This is due to the fact that each additional language requires more resources, 
including a set of committed translators and space on our servers.
-
-There are many files to translate and keep up to date to maintain a language 
for the Tor Project. Moreover, once translated, there are always future updates 
and new pages needing translated too.
-The more users that will benefit from a translation, the more scalable that 
translation becomes â as it will also benefit from the help of a larger 
number of volunteers keeping it up to date.
-
-We also recommend forming a team for your language: this way, the content can 
be reviewed by at least one other person, producing translations that are of 
higher quality and are easier to maintain.
-
-Although we would value your contribution to any of the projects above, our 
most critical needs are Tor Browser, the Tor Browser User Manual, and our 
Support portal:
-
-* Tor Browser is translated in many different Transifex resources, but you can 
see the [Tor Browser total strings translated per 
language](https://torpat.ch/locales) to see where help is needed.
-* The Tor Browser User Manual is a very useful resource for new users that do 
not speak English, see [Tor Browser User Manual translation 
statistics](https://torpat.ch/manual-locales) or 
[translate](https://www.transifex.com/otf/tor-project-support-community-portal/tbmanual-contentspot/)
 to help.
-* The [Support portal](https://support.torproject.org/) is also a valuable 
resource for all Tor users, see [Tor Support portal translation 
statistics](https://torpat.ch/support-locales) or 
[translate](https://www.transifex.com/otf/tor-project-support-community-portal/support-portal/)
 to help.
-
-We are also translating this page, the Community portal:
-* The [Community portal](https://community.torproject.org/) is this website, 
where you can find ways to contribute to Tor. Help us 
[translate](https://www.transifex.com/otf/tor-project-support-community-portal/communitytpo-contentspot/)
 it.
diff --git a/content/relay/community-resources/good-bad-isps/contents.lr 
b/content/relay/community-resources/good-bad-isps/contents.lr
index f5c4280..5357dca 100644
--- a/content/relay/community-resources/good-bad-isps/contents.lr
+++ b/content/relay/community-resources/good-bad-isps/contents.lr
@@ -80,6 +80,7 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 
|-|-|-|--|-|-||
 | [Creanova](http://creanova.org) | AS51765 | Yes | Yes | No | - | 12/19/2018 |
 | [TeliaSonera Finland](https://www.sonera.fi/) | AS1759 | Yes | Yes | No | - 
| 03/26/2016 |
+| [Privex](https://www.privex.io/tor-exit-policy/) | AS210083 | Yes | Yes | No 
| All node types permitted in Sweden, relays/bridges permitted in other 
regions. Tor friendly hosting provider whom run 3 relays and an exit 
themselves. Accepts cryptocurrency. | 2021/06/09 |
 
 
 ### Germany
@@ -90,6 +91,7 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 | [EUServ](http://euserv.de) | AS35366 | Yes | Yes | Yes | "Relays only 
allowed on dedicated Servers Prime64 and Pro64, Exit nodes only allowed on 
Prime64 and Pro64 with Pro-Option, own subnet, RIPE entry along with publicly 
visible abuse and police contact." | 03/2021 |
 | [IPX-Server](https://www.ipx-server.de) | - | Yes | Yes |  - | - | - |
 | [Keyweb](https://www.keyweb.de) | AS31103 | Yes | Yes | Yes | "Every

[tor-commits] [community/translations] content updates

2021-06-16 Thread emmapeel

commit 051b4a655d14415e7fe6100d33f932356b760033
Author: emma peel 
Date:   Wed Jun 16 16:00:18 2021 +0200

content updates
---
 .../community-resources/good-bad-isps/contents.lr  |   6 +-
 content/user-research/guidelines/contents.lr   |  79 ++---
 i18n/contents.pot  | 329 -
 3 files changed, 168 insertions(+), 246 deletions(-)

diff --git a/content/relay/community-resources/good-bad-isps/contents.lr 
b/content/relay/community-resources/good-bad-isps/contents.lr
index 5357dca..2af496c 100644
--- a/content/relay/community-resources/good-bad-isps/contents.lr
+++ b/content/relay/community-resources/good-bad-isps/contents.lr
@@ -80,7 +80,7 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 
|-|-|-|--|-|-||
 | [Creanova](http://creanova.org) | AS51765 | Yes | Yes | No | - | 12/19/2018 |
 | [TeliaSonera Finland](https://www.sonera.fi/) | AS1759 | Yes | Yes | No | - 
| 03/26/2016 |
-| [Privex](https://www.privex.io/tor-exit-policy/) | AS210083 | Yes | Yes | No 
| All node types permitted in Sweden, relays/bridges permitted in other 
regions. Tor friendly hosting provider whom run 3 relays and an exit 
themselves. Accepts cryptocurrency. | 2021/06/09 |
+| [Privex](https://www.privex.io/tor-exit-policy/) | AS210083 | Yes | Yes | No 
| All node types permitted in Sweden, relays/bridges permitted in other 
regions. Tor friendly hosting provider who runs 3 relays and an exit 
themselves. Accepts cryptocurrency. | 2021/06/09 |
 
 
 ### Germany
@@ -91,7 +91,7 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 | [EUServ](http://euserv.de) | AS35366 | Yes | Yes | Yes | "Relays only 
allowed on dedicated Servers Prime64 and Pro64, Exit nodes only allowed on 
Prime64 and Pro64 with Pro-Option, own subnet, RIPE entry along with publicly 
visible abuse and police contact." | 03/2021 |
 | [IPX-Server](https://www.ipx-server.de) | - | Yes | Yes |  - | - | - |
 | [Keyweb](https://www.keyweb.de) | AS31103 | Yes | Yes | Yes | "Everything 
that is in accordance with current jurisprudence is permitted on our servers." 
| 03/2021 |
-| [Privex](https://www.privex.io/tor-exit-policy/) | AS210083 | Yes | Yes | No 
| All node types permitted in Sweden, relays/bridges permitted in other 
regions. Tor friendly hosting provider whom run 3 relays and an exit 
themselves. Accepts cryptocurrency. | 2021/06/09 |
+| [Privex](https://www.privex.io/tor-exit-policy/) | AS210083 | Yes | Yes | No 
| All node types permitted in Sweden, relays/bridges permitted in other 
regions. Tor friendly hosting provider who runs 3 relays and an exit 
themselves. Accepts cryptocurrency. | 2021/06/09 |
 | [Afterburst](http://afterburst.com) |  AS29761, AS8100  | - | Yes | No | - | 
- |
 | [myLoc Managed IT](https://myloc.de) | AS31010, AS24961 | Yes | Yes | No | - 
| 2018-10-25 |
 | [linevast](https://www.linevast.de) | AS201206 | No | No | No |  | 03/2021 |
@@ -243,7 +243,7 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 | [HostHatch](https://hosthatch.com) | AS42708 | Yes | Yes | No | - | 2016/05 |
 | TeliaSonera | - | Yes | Yes | ? | TeliaSonera is also big in Sweden and 
deliver where other ISPs can't. | - |
 | [PRQ](http://prq.se/?p=dedicated&intl=1) |  - | Yes | Yes | Yes | - | - |
-| [Privex](https://www.privex.io/tor-exit-policy/) | AS210083 | Yes | Yes | 
Yes | Tor friendly hosting provider whom run 3 relays and an exit themselves. 
Accepts cryptocurrency. | 2021/06/09 |
+| [Privex](https://www.privex.io/tor-exit-policy/) | AS210083 | Yes | Yes | 
Yes | Tor friendly hosting provider who runs 3 relays and an exit themselves. 
Accepts cryptocurrency. | 2021/06/09 |
 | [Portlane](http://www.portlane.com/) | - | Yes | Yes | Yes | Previously 
provided connectivity for ThePirateBay, OpenBitTorrent tracker et al.  Handles 
abuse according to "Swedish praxis". |  - |
 | [Yourserver](https://www.yourserver.se/) | - | Yes | Yes | ? | Support team 
will allow relay/exit but TOR Traffic is throttled to 5Mbps speed. If your Exit 
relay receive too much complaints, they will ask to you to stop or otherwise 
they will suspend. | 2015/03/06 |
 | [Svea Hosting](https://svea.net/) | AS41634 | Yes | Yes | Yes | They run an 
exit node themselves and write on their dedicated server page "It is perfect 
for [...] TOR Exit Nodes"  | 04/2021 |
diff --git a/content/user-research/guidelines/contents.lr 
b/content/user-research/guidelines/contents.lr
index 6d13142..159b0e7 100644
--- a/content/user-research/guidelines/contents.lr
+++ b/content/user-research/guidelines/contents.lr
@@ -14,78 +14,85 @@ html: two-columns-page.html
 ---
 body:
 
-Congrats! You're going to run your first User Research for Tor - and we are 
delighted to have you on board!
-In this place, you will find helpful guidelines tha

[tor-commits] [community/master] Copyediting UR guidelines page

2021-06-16 Thread emmapeel

commit c20e11ffb6cbcaf7fe84264da0f78f15e04599fe
Author: Duncan 
Date:   Wed May 26 22:00:57 2021 +

Copyediting UR guidelines page
---
 content/user-research/guidelines/contents.lr | 68 +---
 1 file changed, 31 insertions(+), 37 deletions(-)

diff --git a/content/user-research/guidelines/contents.lr 
b/content/user-research/guidelines/contents.lr
index 6d13142..46a9a49 100644
--- a/content/user-research/guidelines/contents.lr
+++ b/content/user-research/guidelines/contents.lr
@@ -14,78 +14,72 @@ html: two-columns-page.html
 ---
 body:
 
-Congrats! You're going to run your first User Research for Tor - and we are 
delighted to have you on board!
-In this place, you will find helpful guidelines that are designed to make your 
research easier for you and your audience.
+Congrats! You're going to run your first User Research session for Tor â and 
we're delighted to have you on board!
+Here you will find helpful guidelines that are designed to make your research 
easier for both you and your audience.
 
 First of all, make sure you read the [Tor Code of 
Conduct](https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.txt).
 
 ## Respect privacy
-At Tor, we collect only necessary data to improve our services; we don't 
collect invasive data about user behaviors - we test our software, not people.
+At Tor, we don't collect invasive data about user behavior, only the data 
necessary to improve our services. We test our software, not people.
 
 ## Be a good listener and open-minded
-Listening is a skill to build bridges. In Tor, we want people to build 
bridges, not walls - and we believe this is not just for our services, but also 
for our communities. Get in here to read some suggestions about being a better 
listener and make a great research experience. 
+Listening is a skill that helps build bridges. We believe this doesn't just 
apply to our services, but our communities too.
 
 ## Learn
-When we are in Tor training, we listen to the stories people tell us about 
their context, about the laws of the Internet, and the difficulties they are 
going through. This is how we learn how we can help and create new mechanisms 
to facilitate access to information through Tor products. When we listen, we do 
research, we learn.
+During the training session we listen to the stories people tell us about 
their lives, the laws of the jurisdictions they live in, and the difficulties 
they are going through. This way, we can learn how to facilitate better access 
to information through Tor. By listening, we learn.
 
 ## Describe and Ask for consent
-We don't collect names or contact details of interview participants, and any 
time you're going to receive impressions, surveys, or records, you should ask 
for their consent to participate - this should be recorded or registered in the 
form.
-
-We'd love to read about your experiences during the training, product testing, 
and interviews. There are a few ways to do this:
-
-* Scenario: describe the process of the test you ran.
-* Demographics: While we are not interested in specific characteristics of our 
audience, or binary attributes, we must know the total reach of your Tor 
training. You should take [this material]() with you on the day of your 
research, distribute it among participants, and answer their questions about 
how to fill it in if they have any.
-* Interview Process: Thank the participant for their willingness to 
participate in this process and explain that we are testing the product, not 
them.
-The interview should not last longer than 20 minutes, you can record if you 
wish, but you can also take notes on the printed material you will carry with 
you (or on your computer).
-Thank the participant again and end the interview.
-Send us the result - you don't have to write a report, we can do this data 
analysis with the material you collected.
+We don't keep or publish the names or contact details of research 
participants, and any time you're going to handle participant data (be it via 
impressions, survey submissions, or other records) you should ask for their 
consent beforehand - either on the record or in writing using the consent form.
 
 ## Coordinate with the trainer and the Tor UX team
-You're not doing all this work alone - we will support you with meetings, 
guides, and mentorship if you want. You can join us at any time on our IRC 
channel #tor-ux and our [mailing 
list](https://lists.torproject.org/cgi-bin/mailman/listinfo/ux).
 
-You must be aligned about the agenda and time to run interviews (if that is 
the case) during the end of the training. **We strongly recommend that you go 
through the program of the exercise with the trainer**.
-Also, we want you two to coordinate feedback together - both for you and for 
your audience.
+You don't have to do this alone - we can support you with meetings, guides, 
and mentorship too if you wish. Join us at any time on our IRC channel #tor-ux 
or our [m

[tor-commits] [community/master] see merge request:

2021-06-16 Thread emmapeel

commit 74d056a9d87ec36e5be4a9e7ec8fb9add9df764c
Merge: 7ac78c2 50f104e
Author: emma peel 
Date:   Wed Jun 16 15:44:46 2021 +0200

see merge request:
https://gitlab.torproject.org/tpo/web/community/-/merge_requests/78
closes: https://gitlab.torproject.org/tpo/web/community/-/issues/204

 content/user-research/guidelines/contents.lr | 79 +++-
 1 file changed, 43 insertions(+), 36 deletions(-)

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

[tor-commits] [community/master] grammar changes

2021-06-16 Thread emmapeel

commit 7ac78c292b4d1fa378cc3eae4df394d2ce13019f
Author: emma peel 
Date:   Wed Jun 16 15:43:55 2021 +0200

grammar changes
---
 content/relay/community-resources/good-bad-isps/contents.lr | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/relay/community-resources/good-bad-isps/contents.lr 
b/content/relay/community-resources/good-bad-isps/contents.lr
index 5357dca..2af496c 100644
--- a/content/relay/community-resources/good-bad-isps/contents.lr
+++ b/content/relay/community-resources/good-bad-isps/contents.lr
@@ -80,7 +80,7 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 
|-|-|-|--|-|-||
 | [Creanova](http://creanova.org) | AS51765 | Yes | Yes | No | - | 12/19/2018 |
 | [TeliaSonera Finland](https://www.sonera.fi/) | AS1759 | Yes | Yes | No | - 
| 03/26/2016 |
-| [Privex](https://www.privex.io/tor-exit-policy/) | AS210083 | Yes | Yes | No 
| All node types permitted in Sweden, relays/bridges permitted in other 
regions. Tor friendly hosting provider whom run 3 relays and an exit 
themselves. Accepts cryptocurrency. | 2021/06/09 |
+| [Privex](https://www.privex.io/tor-exit-policy/) | AS210083 | Yes | Yes | No 
| All node types permitted in Sweden, relays/bridges permitted in other 
regions. Tor friendly hosting provider who runs 3 relays and an exit 
themselves. Accepts cryptocurrency. | 2021/06/09 |
 
 
 ### Germany
@@ -91,7 +91,7 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 | [EUServ](http://euserv.de) | AS35366 | Yes | Yes | Yes | "Relays only 
allowed on dedicated Servers Prime64 and Pro64, Exit nodes only allowed on 
Prime64 and Pro64 with Pro-Option, own subnet, RIPE entry along with publicly 
visible abuse and police contact." | 03/2021 |
 | [IPX-Server](https://www.ipx-server.de) | - | Yes | Yes |  - | - | - |
 | [Keyweb](https://www.keyweb.de) | AS31103 | Yes | Yes | Yes | "Everything 
that is in accordance with current jurisprudence is permitted on our servers." 
| 03/2021 |
-| [Privex](https://www.privex.io/tor-exit-policy/) | AS210083 | Yes | Yes | No 
| All node types permitted in Sweden, relays/bridges permitted in other 
regions. Tor friendly hosting provider whom run 3 relays and an exit 
themselves. Accepts cryptocurrency. | 2021/06/09 |
+| [Privex](https://www.privex.io/tor-exit-policy/) | AS210083 | Yes | Yes | No 
| All node types permitted in Sweden, relays/bridges permitted in other 
regions. Tor friendly hosting provider who runs 3 relays and an exit 
themselves. Accepts cryptocurrency. | 2021/06/09 |
 | [Afterburst](http://afterburst.com) |  AS29761, AS8100  | - | Yes | No | - | 
- |
 | [myLoc Managed IT](https://myloc.de) | AS31010, AS24961 | Yes | Yes | No | - 
| 2018-10-25 |
 | [linevast](https://www.linevast.de) | AS201206 | No | No | No |  | 03/2021 |
@@ -243,7 +243,7 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 | [HostHatch](https://hosthatch.com) | AS42708 | Yes | Yes | No | - | 2016/05 |
 | TeliaSonera | - | Yes | Yes | ? | TeliaSonera is also big in Sweden and 
deliver where other ISPs can't. | - |
 | [PRQ](http://prq.se/?p=dedicated&intl=1) |  - | Yes | Yes | Yes | - | - |
-| [Privex](https://www.privex.io/tor-exit-policy/) | AS210083 | Yes | Yes | 
Yes | Tor friendly hosting provider whom run 3 relays and an exit themselves. 
Accepts cryptocurrency. | 2021/06/09 |
+| [Privex](https://www.privex.io/tor-exit-policy/) | AS210083 | Yes | Yes | 
Yes | Tor friendly hosting provider who runs 3 relays and an exit themselves. 
Accepts cryptocurrency. | 2021/06/09 |
 | [Portlane](http://www.portlane.com/) | - | Yes | Yes | Yes | Previously 
provided connectivity for ThePirateBay, OpenBitTorrent tracker et al.  Handles 
abuse according to "Swedish praxis". |  - |
 | [Yourserver](https://www.yourserver.se/) | - | Yes | Yes | ? | Support team 
will allow relay/exit but TOR Traffic is throttled to 5Mbps speed. If your Exit 
relay receive too much complaints, they will ask to you to stop or otherwise 
they will suspend. | 2015/03/06 |
 | [Svea Hosting](https://svea.net/) | AS41634 | Yes | Yes | Yes | They run an 
exit node themselves and write on their dedicated server page "It is perfect 
for [...] TOR Exit Nodes"  | 04/2021 |



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

[tor-commits] [community/master] Added link to consent form and fixes for l10n

2021-06-16 Thread emmapeel

commit 50f104e25ceb9a55d6d3775131c96d42f83972f0
Author: Duncan 
Date:   Wed Jun 2 14:06:56 2021 +

Added link to consent form and fixes for l10n
---
 content/user-research/guidelines/contents.lr | 31 
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/content/user-research/guidelines/contents.lr 
b/content/user-research/guidelines/contents.lr
index 46a9a49..159b0e7 100644
--- a/content/user-research/guidelines/contents.lr
+++ b/content/user-research/guidelines/contents.lr
@@ -20,45 +20,58 @@ Here you will find helpful guidelines that are designed to 
make your research ea
 First of all, make sure you read the [Tor Code of 
Conduct](https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.txt).
 
 ## Respect privacy
+
 At Tor, we don't collect invasive data about user behavior, only the data 
necessary to improve our services. We test our software, not people.
 
 ## Be a good listener and open-minded
+
 Listening is a skill that helps build bridges. We believe this doesn't just 
apply to our services, but our communities too.
 
 ## Learn
-During the training session we listen to the stories people tell us about 
their lives, the laws of the jurisdictions they live in, and the difficulties 
they are going through. This way, we can learn how to facilitate better access 
to information through Tor. By listening, we learn.
+
+During the training session we listen to the stories people tell us about 
their lives, the laws of the jurisdictions they live in, and the difficulties 
they are going through.
+This way, we can learn how to facilitate better access to information through 
Tor. By listening, we learn.
 
 ## Describe and Ask for consent
-We don't keep or publish the names or contact details of research 
participants, and any time you're going to handle participant data (be it via 
impressions, survey submissions, or other records) you should ask for their 
consent beforehand - either on the record or in writing using the consent form.
+
+We don't keep or publish the names or contact details of research 
participants, and any time you're going to handle participant data (be it via 
impressions, survey submissions, or other records) you should ask for their 
consent in writing using the [consent 
form](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2021/consent_form.md)
 beforehand.
 
 ## Coordinate with the trainer and the Tor UX team
 
-You don't have to do this alone - we can support you with meetings, guides, 
and mentorship too if you wish. Join us at any time on our IRC channel #tor-ux 
or our [mailing list](https://lists.torproject.org/cgi-bin/mailman/listinfo/ux).
+You don't have to do this alone - we can support you with meetings, guides, 
and mentorship too if you wish.
+Join us at any time on our IRC channel #tor-ux or our [mailing 
list](https://lists.torproject.org/cgi-bin/mailman/listinfo/ux).
 
-**We strongly recommend that you run through the plan for your session with 
the trainer**. Your agenda must be aligned and leave sufficient time to run 
your interviews or exercise at the end of the training session.
+**We strongly recommend that you run through the plan for your session with 
the trainer**.
+Your agenda must be aligned and leave sufficient time to run your interviews 
or exercise at the end of the training session.
 
 When the training commences, be sure to let everyone know your role and why 
you're taking notes during the session.
 
 ## Get prepared!
 
-Before your session, read and print the [Demographics 
questionnaire](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/user_demographics-en.md)
 and [User Research 
Reporting](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/community/user_research_reporting.md)
 templates. You'll also need to bring your chosen usability test and its 
accompanying methodology, if applicable.
+Before your session, read and print the [Demographics 
questionnaire](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/user_demographics-en.md)
 and [User Research 
Reporting](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/community/user_research_reporting.md)
 templates.
+You'll also need to bring your chosen usability test and its accompanying 
methodology, if applicable.
 
 It's easier to have this material printed and in hand, however if you prefer 
you can use digital copies instead.
 
-Keep in mind that you might not have Internet access at the venue. If you're 
planning to install any Tor software during your exercise or interviews you may 
need to download it before the session.
+Keep in mind that you might not have Internet access at the venue.
+If you're planning to install any Tor software during your exercise or 
interviews you may need to download it before the session.
 
 ## The interview process
 
-Thank the participant for their will

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

2021-06-16 Thread translation

commit c3eb53b727d153e759cf30caaf7057d1abbb6281
Author: Translation commit bot 
Date:   Wed Jun 16 11:45:27 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
---
 hi/https-everywhere.dtd | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/hi/https-everywhere.dtd b/hi/https-everywhere.dtd
index dc4cfc62af..e33671f2a0 100644
--- a/hi/https-everywhere.dtd
+++ b/hi/https-everywhere.dtd
@@ -1,15 +1,15 @@
-
+
 
-
+
 
 
 
 
-
-
+
+
 
 
-
+
 
 
 
@@ -49,8 +49,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -63,8 +63,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -72,7 +72,7 @@
 
 
 
-
+
 
 
 

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

89 matches

Mail list logo