[tor-commits] [translation/tpo-web] Update translations for tpo-web

2019-07-02 Thread translation
commit a175de237bf9cde416773409901c8ec3387d0f00
Author: Translation commit bot 
Date:   Wed Jul 3 05:50:30 2019 +

Update translations for tpo-web
---
 contents+th.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contents+th.po b/contents+th.po
index 68d7b81ec..d59913a24 100644
--- a/contents+th.po
+++ b/contents+th.po
@@ -26,11 +26,11 @@ msgstr ""
 
 #: https//www.torproject.org/ (content/contents+en.lrpage.title)
 msgid "Anonymity Online"
-msgstr ""
+msgstr "ออนไลน์อย่างนิรนาม"
 
 #: https//www.torproject.org/ (content/contents+en.lrpage.section)
 msgid "home"
-msgstr ""
+msgstr "โฮม"
 
 #: https//www.torproject.org/ (content/contents+en.lrpage.body)
 msgid "## ABOUT US ##"
@@ -63,7 +63,7 @@ msgstr "ผู้ติดต่อ"
 #: https//www.torproject.org/thank-you/
 #: (content/thank-you/contents+en.lrpage.section)
 msgid "The Tor Project"
-msgstr ""
+msgstr "โปรเจ็ค Tor"
 
 #: https//www.torproject.org/contact/
 #: (content/contact/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/tails-misc] Update translations for tails-misc

2019-07-02 Thread translation
commit e573a9f6d2fea07c69920c176e14285a6f878d36
Author: Translation commit bot 
Date:   Wed Jul 3 03:46:38 2019 +

Update translations for tails-misc
---
 zh_CN.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/zh_CN.po b/zh_CN.po
index d1aeec711..63439d048 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -21,14 +21,15 @@
 # YFdyh000 , 2013-2016
 # ff98sha, 2019
 # shenzhui007 <12231...@bjtu.edu.cn>, 2019
+# 耀石 徐 , 2019
 # ヨイツの賢狼ホロ, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-06-30 18:53+0200\n"
-"PO-Revision-Date: 2019-07-01 01:04+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-07-03 03:38+\n"
+"Last-Translator: 耀石 徐 \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -662,7 +663,7 @@ msgstr ""
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:332
 msgid "Error locking volume"
-msgstr ""
+msgstr "锁定加密卷出错"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"

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


[tor-commits] [translation/support-portal] Update translations for support-portal

2019-07-02 Thread translation
commit 7ccc6e73ab44306efae2c74727a13360292d56f0
Author: Translation commit bot 
Date:   Wed Jul 3 03:50:55 2019 +

Update translations for support-portal
---
 contents+pt-BR.po | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 801eb86f5..5d97e1d27 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -8,8 +8,8 @@
 # Greg Strider , 2019
 # Emma Peel, 2019
 # Communia , 2019
-# Chacal E., 2019
 # Eduardo Addad de Oliveira , 2019
+# Chacal E., 2019
 # 
 msgid ""
 msgstr ""
@@ -17,7 +17,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-24 08:29+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Eduardo Addad de Oliveira , 2019\n"
+"Last-Translator: Chacal E., 2019\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -5521,6 +5521,9 @@ msgid ""
 "[Tor](#tor-/-tor-network/-core-tor). If you want to control core Tor with "
 "python, this is for you."
 msgstr ""
+"O Stem é uma biblioteca de controladores Python (linguagem de programação) 
"
+"para o núcleo [Tor](#tor-/- tor-network /-core-tor). Se você quiser "
+"controlar o núcleo do Tor com python, isto é para você."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)

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


[tor-commits] [translation/support-portal_completed] Update translations for support-portal_completed

2019-07-02 Thread translation
commit 60b9547c52202e76d0fcf1ec727b3c77b7fba11d
Author: Translation commit bot 
Date:   Wed Jul 3 03:51:02 2019 +

Update translations for support-portal_completed
---
 contents+pt-BR.po | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 801eb86f5..5d97e1d27 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -8,8 +8,8 @@
 # Greg Strider , 2019
 # Emma Peel, 2019
 # Communia , 2019
-# Chacal E., 2019
 # Eduardo Addad de Oliveira , 2019
+# Chacal E., 2019
 # 
 msgid ""
 msgstr ""
@@ -17,7 +17,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-24 08:29+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Eduardo Addad de Oliveira , 2019\n"
+"Last-Translator: Chacal E., 2019\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -5521,6 +5521,9 @@ msgid ""
 "[Tor](#tor-/-tor-network/-core-tor). If you want to control core Tor with "
 "python, this is for you."
 msgstr ""
+"O Stem é uma biblioteca de controladores Python (linguagem de programação) 
"
+"para o núcleo [Tor](#tor-/- tor-network /-core-tor). Se você quiser "
+"controlar o núcleo do Tor com python, isto é para você."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)

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


[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2019-07-02 Thread translation
commit 6c02db4676016c854516a9cc674b860c87391c34
Author: Translation commit bot 
Date:   Wed Jul 3 04:15:15 2019 +

Update translations for abouttor-homepage_completed
---
 zh-CN/aboutTor.dtd | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/zh-CN/aboutTor.dtd b/zh-CN/aboutTor.dtd
index 2048dc54e..c0a8bb618 100644
--- a/zh-CN/aboutTor.dtd
+++ b/zh-CN/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+

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


[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2019-07-02 Thread translation
commit 72a329e5820e7d30b15a931b15ceef32eff56a1f
Author: Translation commit bot 
Date:   Wed Jul 3 04:15:06 2019 +

Update translations for abouttor-homepage
---
 zh-CN/aboutTor.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh-CN/aboutTor.dtd b/zh-CN/aboutTor.dtd
index 01e438b4d..c0a8bb618 100644
--- a/zh-CN/aboutTor.dtd
+++ b/zh-CN/aboutTor.dtd
@@ -31,5 +31,5 @@
 
 
 
-
-
+
+

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


[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2019-07-02 Thread translation
commit f30ee5cb553dd85d55599e24033f1b3c4b93ac62
Author: Translation commit bot 
Date:   Wed Jul 3 04:16:50 2019 +

Update translations for tails-misc_completed
---
 zh_CN.po | 26 --
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/zh_CN.po b/zh_CN.po
index 0147c1c93..64b0a4ca1 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -19,16 +19,17 @@
 # Xiaolan , 2014
 # YFdyh000 , 2016
 # YFdyh000 , 2013-2016
-# Yikai Yang , 2019
+# ff98sha, 2019
 # shenzhui007 <12231...@bjtu.edu.cn>, 2019
+# 耀石 徐 , 2019
 # ヨイツの賢狼ホロ, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-05-29 02:00+\n"
-"Last-Translator: Yikai Yang \n"
+"POT-Creation-Date: 2019-06-30 18:53+0200\n"
+"PO-Revision-Date: 2019-07-03 04:03+\n"
+"Last-Translator: 耀石 徐 \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -441,11 +442,11 @@ msgstr "屏幕锁"
 msgid "Set up a password to unlock the screen."
 msgstr "设定解锁屏幕的密码"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:136
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
 msgid "Password"
 msgstr "密码"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:142
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
 msgid "Confirm"
 msgstr "确认"
 
@@ -651,6 +652,19 @@ msgid ""
 "{error_message}"
 msgstr "无法解锁加密卷{volume_name}:\n{error_message}"
 
+#. Translators: Don't translate {volume_name} or {error_message},
+#. they are placeholder and will be replaced.
+#: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#, python-brace-format
+msgid ""
+"Couldn't lock volume {volume_name}:\n"
+"{error_message}"
+msgstr "无法锁定卷{卷名称}:{错误信息}"
+
+#: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:332
+msgid "Error locking volume"
+msgstr "锁定卷时出错"
+
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"
 msgstr "没有添加文件容器"

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


[tor-commits] [translation/tails-misc] Update translations for tails-misc

2019-07-02 Thread translation
commit 749c8da0bc36fd972516968effae1dfb66f16abd
Author: Translation commit bot 
Date:   Wed Jul 3 04:16:44 2019 +

Update translations for tails-misc
---
 zh_CN.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zh_CN.po b/zh_CN.po
index 63439d048..64b0a4ca1 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -28,7 +28,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-06-30 18:53+0200\n"
-"PO-Revision-Date: 2019-07-03 03:38+\n"
+"PO-Revision-Date: 2019-07-03 04:03+\n"
 "Last-Translator: 耀石 徐 \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -659,11 +659,11 @@ msgstr "无法解锁加
密卷{volume_name}:\n{error_message}"
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
-msgstr ""
+msgstr "无法锁定卷{卷名称}:{错误信息}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:332
 msgid "Error locking volume"
-msgstr "锁定加密卷出错"
+msgstr "锁定卷时出错"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"

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


[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-07-02 Thread translation
commit a206a709a6436232ce71218a962ca6fe2ea931a2
Author: Translation commit bot 
Date:   Wed Jul 3 04:18:03 2019 +

Update translations for tbmanual-contentspot
---
 contents+zh-CN.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index d8ece94f9..9045a19f1 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -4,6 +4,7 @@
 # erinm, 2019
 # Emma Peel, 2019
 # ff98sha, 2019
+# 耀石 徐 , 2019
 # 
 msgid ""
 msgstr ""
@@ -11,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-06-03 14:04+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: ff98sha, 2019\n"
+"Last-Translator: 耀石 徐 , 2019\n"
 "Language-Team: Chinese (China) 
(https://www.transifex.com/otf/teams/1519/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1486,7 +1487,7 @@ msgstr "安全设置"
 msgid ""
 "By default, Tor Browser protects your security by encrypting your browsing "
 "data."
-msgstr ""
+msgstr "在默认情况下,Tor 浏览器浏览器将加密你
的浏览数据来保护你的安全性"
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/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/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed

2019-07-02 Thread translation
commit b47d78c34ccf99f7517ec4a702948e4f29e7c9a3
Author: Translation commit bot 
Date:   Wed Jul 3 04:18:10 2019 +

Update translations for tbmanual-contentspot_completed
---
 contents+zh-CN.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index d8ece94f9..9045a19f1 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -4,6 +4,7 @@
 # erinm, 2019
 # Emma Peel, 2019
 # ff98sha, 2019
+# 耀石 徐 , 2019
 # 
 msgid ""
 msgstr ""
@@ -11,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-06-03 14:04+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: ff98sha, 2019\n"
+"Last-Translator: 耀石 徐 , 2019\n"
 "Language-Team: Chinese (China) 
(https://www.transifex.com/otf/teams/1519/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1486,7 +1487,7 @@ msgstr "安全设置"
 msgid ""
 "By default, Tor Browser protects your security by encrypting your browsing "
 "data."
-msgstr ""
+msgstr "在默认情况下,Tor 浏览器浏览器将加密你
的浏览数据来保护你的安全性"
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/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/tails-misc] Update translations for tails-misc

2019-07-02 Thread translation
commit 325fba8b897574978605a7aa4e59e2d481a291d6
Author: Translation commit bot 
Date:   Tue Jul 2 13:16:39 2019 +

Update translations for tails-misc
---
 nl.po | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/nl.po b/nl.po
index ad550aa52..b38ab001f 100644
--- a/nl.po
+++ b/nl.po
@@ -5,6 +5,7 @@
 # Translators:
 # jjjdddsssxxx , 2014
 # Adriaan Callaerts , 2013
+# Anbiya Popal , 2019
 # André Koot , 2016
 # bacovane , 2018-2019
 # Bianca Hey , 2018
@@ -33,8 +34,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-06-30 18:53+0200\n"
-"PO-Revision-Date: 2019-07-01 01:04+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-07-02 13:05+\n"
+"Last-Translator: Anbiya Popal \n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +45,7 @@ msgstr ""
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39
 msgid "Tor is ready"
-msgstr "Tor is gereed"
+msgstr "Tor is gereed."
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
 msgid "You can now access the Internet."
@@ -668,7 +669,7 @@ msgstr ""
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:332
 msgid "Error locking volume"
-msgstr ""
+msgstr "Fout bij ontgrendelen van het volume"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"
@@ -822,7 +823,7 @@ msgstr "Deze toepassing is niet gekoppeld aan of 
goedgekeurd door het VeraCrypt-
 
 #: 
../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
 msgid "_Open"
-msgstr ""
+msgstr "_Open"
 
 #: 
../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
 msgid "Lock this volume"
@@ -830,7 +831,7 @@ msgstr "Dit volume vergrendelen"
 
 #: 
../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
 msgid "_Unlock"
-msgstr ""
+msgstr "_Ontgrendel"
 
 #: 
../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
 msgid "Detach this volume"

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


[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2019-07-02 Thread translation
commit 89286269c89b7f30476024bd21e2565b34c6551e
Author: Translation commit bot 
Date:   Tue Jul 2 13:45:49 2019 +

Update translations for abouttor-homepage_completed
---
 en-US/aboutTor.dtd | 3 +++
 en/aboutTor.dtd| 3 +++
 2 files changed, 6 insertions(+)

diff --git a/en-US/aboutTor.dtd b/en-US/aboutTor.dtd
index c4273ad2f..5757fae47 100644
--- a/en-US/aboutTor.dtd
+++ b/en-US/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/en/aboutTor.dtd b/en/aboutTor.dtd
index c4273ad2f..5757fae47 100644
--- a/en/aboutTor.dtd
+++ b/en/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+

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


[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2019-07-02 Thread translation
commit e1fa13a9412a968635c159c704c761779400cf70
Author: Translation commit bot 
Date:   Tue Jul 2 13:45:40 2019 +

Update translations for abouttor-homepage
---
 ar/aboutTor.dtd| 3 +++
 az/aboutTor.dtd| 3 +++
 bg/aboutTor.dtd| 3 +++
 bn-BD/aboutTor.dtd | 3 +++
 ca/aboutTor.dtd| 3 +++
 cs/aboutTor.dtd| 3 +++
 cy/aboutTor.dtd| 3 +++
 da/aboutTor.dtd| 3 +++
 de/aboutTor.dtd| 3 +++
 el/aboutTor.dtd| 3 +++
 en-GB/aboutTor.dtd | 3 +++
 en-US/aboutTor.dtd | 3 +++
 en/aboutTor.dtd| 3 +++
 eo/aboutTor.dtd| 3 +++
 es-AR/aboutTor.dtd | 3 +++
 es-ES/aboutTor.dtd | 3 +++
 es-MX/aboutTor.dtd | 3 +++
 et/aboutTor.dtd| 3 +++
 eu/aboutTor.dtd| 3 +++
 fa/aboutTor.dtd| 3 +++
 fi/aboutTor.dtd| 3 +++
 fr/aboutTor.dtd| 3 +++
 ga-IE/aboutTor.dtd | 3 +++
 he/aboutTor.dtd| 3 +++
 hi-IN/aboutTor.dtd | 3 +++
 hr/aboutTor.dtd| 3 +++
 hu/aboutTor.dtd| 3 +++
 id/aboutTor.dtd| 3 +++
 is/aboutTor.dtd| 3 +++
 it/aboutTor.dtd| 3 +++
 ja/aboutTor.dtd| 3 +++
 ka/aboutTor.dtd| 3 +++
 kk/aboutTor.dtd| 3 +++
 km/aboutTor.dtd| 3 +++
 ko/aboutTor.dtd| 3 +++
 lt/aboutTor.dtd| 3 +++
 lv/aboutTor.dtd| 3 +++
 mk/aboutTor.dtd| 3 +++
 ml/aboutTor.dtd| 3 +++
 ms/aboutTor.dtd| 3 +++
 nb-NO/aboutTor.dtd | 3 +++
 nl-BE/aboutTor.dtd | 3 +++
 nl/aboutTor.dtd| 3 +++
 nn-NO/aboutTor.dtd | 3 +++
 pa-IN/aboutTor.dtd | 3 +++
 pl/aboutTor.dtd| 3 +++
 pt-BR/aboutTor.dtd | 3 +++
 pt-PT/aboutTor.dtd | 3 +++
 ro/aboutTor.dtd| 3 +++
 ru/aboutTor.dtd| 3 +++
 si/aboutTor.dtd| 3 +++
 sk/aboutTor.dtd| 3 +++
 sl/aboutTor.dtd| 3 +++
 sq/aboutTor.dtd| 3 +++
 sr/aboutTor.dtd| 3 +++
 sv-SE/aboutTor.dtd | 3 +++
 ta/aboutTor.dtd| 3 +++
 th/aboutTor.dtd| 3 +++
 tr/aboutTor.dtd| 3 +++
 uk/aboutTor.dtd| 3 +++
 ur/aboutTor.dtd| 3 +++
 vi/aboutTor.dtd| 3 +++
 zh-CN/aboutTor.dtd | 3 +++
 zh-HK/aboutTor.dtd | 3 +++
 zh-TW/aboutTor.dtd | 3 +++
 65 files changed, 195 insertions(+)

diff --git a/ar/aboutTor.dtd b/ar/aboutTor.dtd
index 6f8460d32..05486c97f 100644
--- a/ar/aboutTor.dtd
+++ b/ar/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/az/aboutTor.dtd b/az/aboutTor.dtd
index d07563306..33a74f823 100644
--- a/az/aboutTor.dtd
+++ b/az/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/bg/aboutTor.dtd b/bg/aboutTor.dtd
index 5cc221ddd..c89f84cee 100644
--- a/bg/aboutTor.dtd
+++ b/bg/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/bn-BD/aboutTor.dtd b/bn-BD/aboutTor.dtd
index 76bc83dab..b5b6b385b 100644
--- a/bn-BD/aboutTor.dtd
+++ b/bn-BD/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/ca/aboutTor.dtd b/ca/aboutTor.dtd
index fd501f7bc..2eca70f2c 100644
--- a/ca/aboutTor.dtd
+++ b/ca/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/cs/aboutTor.dtd b/cs/aboutTor.dtd
index 06e411e51..1d62f176d 100644
--- a/cs/aboutTor.dtd
+++ b/cs/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/cy/aboutTor.dtd b/cy/aboutTor.dtd
index 2dec54164..bff338ec6 100644
--- a/cy/aboutTor.dtd
+++ b/cy/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/da/aboutTor.dtd b/da/aboutTor.dtd
index 6fba4cafd..50f79ff01 100644
--- a/da/aboutTor.dtd
+++ b/da/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd
index 1263d9284..ef055f13c 100644
--- a/de/aboutTor.dtd
+++ b/de/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/el/aboutTor.dtd b/el/aboutTor.dtd
index 1d23b6bb7..5ca6e97f6 100644
--- a/el/aboutTor.dtd
+++ b/el/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/en-GB/aboutTor.dtd b/en-GB/aboutTor.dtd
index 6aef19f37..9542f7905 100644
--- a/en-GB/aboutTor.dtd
+++ b/en-GB/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/en-US/aboutTor.dtd b/en-US/aboutTor.dtd
index c4273ad2f..5757fae47 100644
--- a/en-US/aboutTor.dtd
+++ b/en-US/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/en/aboutTor.dtd b/en/aboutTor.dtd
index c4273ad2f..5757fae47 100644
--- a/en/aboutTor.dtd
+++ b/en/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/eo/aboutTor.dtd b/eo/aboutTor.dtd
index 0877c..8b402df20 100644
--- a/eo/aboutTor.dtd
+++ b/eo/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/es-AR/aboutTor.dtd b/es-AR/aboutTor.dtd
index 552db1395..e63452183 100644
--- a/es-AR/aboutTor.dtd
+++ b/es-AR/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/es-ES/aboutTor.dtd b/es-ES/aboutTor.dtd
index aff6157d4..325e10a9f 100644
--- a/es-ES/aboutTor.dtd
+++ b/es-ES/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/es-MX/aboutTor.dtd b/es-MX/aboutTor.dtd
index efbb7dd19..261a70ac8 100644
--- a/es-MX/aboutTor.dtd
+++ b/es-MX/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/et/aboutTor.dtd b/et/aboutTor.dtd
index afc020238..94eead169 100644
--- a/et/aboutTor.dtd
+++ b/et/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/eu/aboutTor.dtd b/eu/aboutTor.dtd
index 227035d04..d2d751ee3 100644
--- a/eu/aboutTor.dtd
+++ 

[tor-commits] [tor-browser/tor-browser-60.7.0esr-9.0-1] squash! TB4: Tor Browser's Firefox preference overrides.

2019-07-02 Thread gk
commit c838651340d70b0f5cfd739ac32032315587309e
Author: Georg Koppen 
Date:   Tue Jul 2 08:16:28 2019 +

squash! TB4: Tor Browser's Firefox preference overrides.

Bug 31059: Enable Letterboxing
---
 browser/app/profile/000-tor-browser.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index ec623730bc17..546def678d7a 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -156,6 +156,8 @@ pref("dom.vr.enabled", false); // Bug 21607: Disable WebVR 
for now
 // Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575)
 pref("security.webauth.webauthn", false); // Bug 26614: Disable Web 
Authentication API for now
 pref("browser.cache.frecency_experiment", -1);
+// Enable letterboxing
+pref("privacy.resistFingerprinting.letterboxing", true);
 
 // Third party stuff
 pref("privacy.firstparty.isolate", true); // Always enforce first party 
isolation

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


[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2019-07-02 Thread translation
commit d4469daea01dd4e8243950473b00afb2a1e2518a
Author: Translation commit bot 
Date:   Tue Jul 2 14:45:05 2019 +

Update translations for abouttor-homepage
---
 fa/aboutTor.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fa/aboutTor.dtd b/fa/aboutTor.dtd
index f6ad07731..77999b0c7 100644
--- a/fa/aboutTor.dtd
+++ b/fa/aboutTor.dtd
@@ -31,5 +31,5 @@
 
 
 
-
-
+
+

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


[tor-commits] [translation/tails-misc] Update translations for tails-misc

2019-07-02 Thread translation
commit eb17a315abf02f38717a8d722c5f75d4da8cca74
Author: Translation commit bot 
Date:   Tue Jul 2 15:46:44 2019 +

Update translations for tails-misc
---
 pt_BR.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pt_BR.po b/pt_BR.po
index b8d5eb832..75a79a3c5 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -26,14 +26,15 @@
 # Matheus  Martins, 2013
 # Renato dos Santos , 2018
 # Reurison Silva Rodrigues, 2018
+# T Zabotto , 2019
 # Wagner Marques , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-06-30 18:53+0200\n"
-"PO-Revision-Date: 2019-07-01 13:14+\n"
-"Last-Translator: d fau \n"
+"PO-Revision-Date: 2019-07-02 15:46+\n"
+"Last-Translator: T Zabotto \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"
@@ -663,11 +664,11 @@ msgstr "Não foi possível desbloquear o volume 
{volume_name}:\n{error_message}"
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
-msgstr ""
+msgstr "Não foi possível bloquear  {volume_name}:{error_message}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:332
 msgid "Error locking volume"
-msgstr ""
+msgstr "Erro ao bloquear o volume"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"

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


[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2019-07-02 Thread translation
commit beef62ea6ba5c4c6322b68ae8363100326be0b30
Author: Translation commit bot 
Date:   Tue Jul 2 15:46:51 2019 +

Update translations for tails-misc_completed
---
 pt_BR.po | 29 ++---
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/pt_BR.po b/pt_BR.po
index fd41d48f7..75a79a3c5 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -9,6 +9,7 @@
 # Chacal E., 2019
 # Chacal E., 2019
 # Danton Medrado, 2015
+# d fau , 2019
 # Eduardo Addad de Oliveira , 2018-2019
 # Eduardo Bonsi, 2013-2014
 # Eduardo Luis Voltolini Tafner, 2013
@@ -25,14 +26,15 @@
 # Matheus  Martins, 2013
 # Renato dos Santos , 2018
 # Reurison Silva Rodrigues, 2018
+# T Zabotto , 2019
 # Wagner Marques , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-06-17 04:51+\n"
-"Last-Translator: Chacal E.\n"
+"POT-Creation-Date: 2019-06-30 18:53+0200\n"
+"PO-Revision-Date: 2019-07-02 15:46+\n"
+"Last-Translator: T Zabotto \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"
@@ -225,7 +227,7 @@ msgstr "Adcionar {packages} ao seus softwares adicionais?"
 msgid ""
 "To install it automatically from your persistent storage when starting "
 "Tails."
-msgstr "Para instalá-lo automaticamente a partir de seu armazenamento 
persistente ao iniciar o Tails."
+msgstr "Para instalá-lo automaticamente a partir de seu armazenamento 
permanente ao iniciar o Tails."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:296
 msgid "Install Every Time"
@@ -234,7 +236,7 @@ msgstr "Instalar todas as vezes"
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:297
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:328
 msgid "Install Only Once"
-msgstr "Instale Somente Uma Vez"
+msgstr "Instalar Somente Uma Vez"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:303
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:333
@@ -445,11 +447,11 @@ msgstr "Bloqueador de Tela"
 msgid "Set up a password to unlock the screen."
 msgstr "Configure uma senha para desbloquear a tela"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:136
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
 msgid "Password"
 msgstr "Senha"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:142
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -655,6 +657,19 @@ msgid ""
 "{error_message}"
 msgstr "Não foi possível desbloquear o volume 
{volume_name}:\n{error_message}"
 
+#. Translators: Don't translate {volume_name} or {error_message},
+#. they are placeholder and will be replaced.
+#: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#, python-brace-format
+msgid ""
+"Couldn't lock volume {volume_name}:\n"
+"{error_message}"
+msgstr "Não foi possível bloquear  {volume_name}:{error_message}"
+
+#: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:332
+msgid "Error locking volume"
+msgstr "Erro ao bloquear o volume"
+
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"
 msgstr "Nenhum volume de armazenagem de arquivos detectado."

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


[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-07-02 Thread translation
commit 6acd42f4873023f363d8e31fc9488f9c9f687a93
Author: Translation commit bot 
Date:   Tue Jul 2 15:45:41 2019 +

Update translations for donatepages-messagespot
---
 locale/cs/LC_MESSAGES/messages.po | 27 ---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/locale/cs/LC_MESSAGES/messages.po 
b/locale/cs/LC_MESSAGES/messages.po
index a23a219ff..22a2b6b75 100644
--- a/locale/cs/LC_MESSAGES/messages.po
+++ b/locale/cs/LC_MESSAGES/messages.po
@@ -1040,19 +1040,22 @@ msgstr ""
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:178
 msgid "Is what Tor does legal? Can I get in trouble for using it?"
-msgstr ""
+msgstr "Je Tor legální? Mohu mít potíže kvůli užívání Toru?"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:182
 msgid ""
 "Downloading Tor Browser or using the Tor network is legal in nearly every "
 "country."
 msgstr ""
+"Stáhnutí prohlížeče Tor a užívání sítě Tor je legální téměř 
ve všech zemích."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:184
 msgid ""
 "A few web sites occasionally block Tor, but that doesn't mean you're doing "
 "anything wrong."
 msgstr ""
+"Některé webové stránky občas blokují Tor, ale to neznamená, že 
děláte něco "
+"špatně."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:186
 msgid ""
@@ -1060,12 +1063,16 @@ msgid ""
 "using Tor in the past, or that they misunderstand what Tor is and how it "
 "works (were working to change this)."
 msgstr ""
+"Většinou to znamená, že stránka měla v minulosti potíže s 
návštěvníky "
+"používající Tor nebo vzniklo nedorozumění co Tor je a jak se používá 
(na "
+"změně pracujeme)."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:188
 msgid ""
 "But it is not illegal to use Tor, and you shouldn't get in trouble for doing"
 " it."
 msgstr ""
+"Není nelegální používat Tor a neměli byste se kvůli tomu dostat do 
potíží."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:190
 msgid ""
@@ -1089,7 +1096,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:206
 msgid "Where does the Tor Project's money come from?"
-msgstr ""
+msgstr "Kde Tor Project získává peníze?"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:210
 msgid ""
@@ -1097,6 +1104,9 @@ msgid ""
 " foundations, research institutions, private companies, and over 20,000 "
 "personal donations from people like you."
 msgstr ""
+"Tor je podporován financujícími agenturami vlády Spojených států, "
+"neziskovými organizacemi, soukromými sbírkami, výzkumnými institucemi, "
+"soukromými firmami a více než 20 000 příspěvky od lidí jako Vy."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:212
 msgid ""
@@ -1104,12 +1114,16 @@ msgid ""
 
"href=\"https://www.torproject.org/about/sponsors.html.en\;>https://www.torproject.org/about/sponsors"
 " for more.)"
 msgstr ""
+"(Více na https://www.torproject.org/about/sponsors.html.en\;>https://www.torproject.org/about/sponsors.)"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:214
 msgid ""
 "While we are grateful for this funding, we don't want the Tor Project to "
 "become too dependent on any single source."
 msgstr ""
+"I když jsme velmi vděční za tento příspěvek, nechceme, aby se Tor 
Project "
+"stal příliš závislým na jediném zdroji."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:216
 msgid ""
@@ -1117,6 +1131,9 @@ msgid ""
 " allows us to spend the money on the projects we think are most important "
 "and respond quickly to changing events."
 msgstr ""
+"Crowdfunding nám umožňuje diverzifikovat naši základnu dárců a je bez "
+"omezení - umožňuje nám utratit výdaje na projekty, které jsou pro nás "
+"důležité a rychle reagovat na změny."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:218
 msgid ""
@@ -1124,11 +1141,13 @@ msgid ""
 "Tor Project's independence and ensure the sustainability of the products and"
 " services we provide."
 msgstr ""
+"A proto Vás prosíme o finanční podporu, abychom zvýšili nezávislost 
Tor "
+"Project a zajistili udržitelnost produktů a služeb, které poskytujeme."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:224
 msgid ""
 "How much money does the Tor Project spend annually, and what is it used for?"
-msgstr ""
+msgstr "Kolik peněz Tor Projekt utratí za rok a na jaké účely?"
 
 #: 

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2019-07-02 Thread translation
commit d9b8abcae4ef020a4099229303c7c884dd39b3ce
Author: Translation commit bot 
Date:   Tue Jul 2 15:45:05 2019 +

Update translations for abouttor-homepage
---
 es-ES/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/es-ES/aboutTor.dtd b/es-ES/aboutTor.dtd
index 325e10a9f..f2fbb4c5d 100644
--- a/es-ES/aboutTor.dtd
+++ b/es-ES/aboutTor.dtd
@@ -31,5 +31,5 @@
 
 
 
-
+
 

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


[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2019-07-02 Thread translation
commit 27d7f5946e721e34e38d91223b12ac28d7b83ea4
Author: Translation commit bot 
Date:   Tue Jul 2 15:45:13 2019 +

Update translations for abouttor-homepage_completed
---
 es-ES/aboutTor.dtd | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/es-ES/aboutTor.dtd b/es-ES/aboutTor.dtd
index aff6157d4..f2fbb4c5d 100644
--- a/es-ES/aboutTor.dtd
+++ b/es-ES/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+

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


[tor-commits] [snowflake/master] Removed unecessary permissions from manifest

2019-07-02 Thread cohosh
commit 6f01a6bfc440100e061a0bc6e7057d674f3a11d5
Author: Cecylia Bocovich 
Date:   Thu Jun 27 09:36:38 2019 -0400

Removed unecessary permissions from manifest
---
 proxy/webext/manifest.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/proxy/webext/manifest.json b/proxy/webext/manifest.json
index 8cf43ae..cd7d250 100644
--- a/proxy/webext/manifest.json
+++ b/proxy/webext/manifest.json
@@ -13,6 +13,5 @@
},
"default_title": "Snowflake",
"default_popup": "popup.html"
-   },
-"permissions": ["cookies", "https://snowflake.torproject.org/;]
+   }
 }



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


[tor-commits] [snowflake/master] Refactored poll loop

2019-07-02 Thread cohosh
commit ead579a6e9b426cb6182dea402343b26431e2eb3
Author: Cecylia Bocovich 
Date:   Wed Jun 26 20:16:17 2019 -0400

Refactored poll loop

This enables breaking the loop from the outside and cleans up the
countdown
---
 proxy/proxypair.coffee |  1 -
 proxy/snowflake.coffee | 54 --
 2 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee
index f174a37..efcc8c7 100644
--- a/proxy/proxypair.coffee
+++ b/proxy/proxypair.coffee
@@ -60,7 +60,6 @@ class ProxyPair
   log 'Invalid SDP message.'
   return false
 dbg 'SDP ' + offer.type + ' successfully received.'
-@active = true
 true
 
   # Given a WebRTC DataChannel, prepare callbacks.
diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee
index bb03cf0..b86e0b7 100644
--- a/proxy/snowflake.coffee
+++ b/proxy/snowflake.coffee
@@ -13,6 +13,7 @@ TODO: More documentation
 class Snowflake
   relayAddr:  null
   rateLimit:  null
+  pollInterval: null
   retries:0
 
   # Janky state machine
@@ -54,43 +55,29 @@ class Snowflake
   @makeProxyPair @relayAddr
 log 'ProxyPair Slots: ' + @proxyPairs.length
 log 'Snowflake IDs: ' + (@proxyPairs.map (p) -> p.id).join ' | '
-@pollBroker()
+@pollInterval = setInterval((=> @pollBroker()), 
config.defaultBrokerPollInterval)
+log @pollInterval
 
   # Regularly poll Broker for clients to serve until this snowflake is
   # serving at capacity, at which point stop polling.
   pollBroker: ->
-# Temporary countdown. TODO: Simplify
-countdown = (msg, sec, skip) =>
-  if not skip then dbg msg
-  if sec > 0
-@ui.setStatus msg + ' (Polling in ' + sec + ' seconds...)'
-sec--
-setTimeout((-> countdown(msg, sec, true)), 1000)
-  else
-@ui.setStatus msg
-findClients()
 # Poll broker for clients.
-findClients = =>
-  pair = @nextAvailableProxyPair()
-  if !pair
-log 'At client capacity.'
-# Do nothing until a new proxyPair is available.
-return
-  msg = 'Polling for client ... '
-  msg += '[retries: ' + @retries + ']' if @retries > 0
-  @ui.setStatus msg
-  recv = @broker.getClientOffer pair.id
-  recv.then (desc) =>
-@receiveOffer pair, desc
-countdown(
-  'Serving 1 new client.',
-  @config.defaultBrokerPollInterval / 1000
-)
-  , (err) =>
-countdown(err, @config.defaultBrokerPollInterval / 1000)
-  @retries++
-
-findClients()
+pair = @nextAvailableProxyPair()
+if !pair
+  log 'At client capacity.'
+  # Do nothing until a new proxyPair is available.
+  return
+pair.active = true
+msg = 'Polling for client ... '
+msg += '[retries: ' + @retries + ']' if @retries > 0
+@ui.setStatus msg
+recv = @broker.getClientOffer pair.id
+recv.then (desc) =>
+  @receiveOffer pair, desc
+, (err) =>
+  pair.active = false
+@retries++
+
 
   # Returns the first ProxyPair that's available to connect.
   nextAvailableProxyPair: ->
@@ -99,7 +86,6 @@ class Snowflake
   # Receive an SDP offer from some client assigned by the Broker,
   # |pair| - an available ProxyPair.
   receiveOffer: (pair, desc) =>
-console.assert !pair.active
 try
   offer = JSON.parse desc
   dbg 'Received:\n\n' + offer.sdp + '\n'
@@ -131,6 +117,8 @@ class Snowflake
   cease: ->
 while @proxyPairs.length > 0
   @proxyPairs.pop().close()
+log @pollInterval
+clearInterval(@pollInterval)
 
   disable: ->
 log 'Disabling Snowflake.'



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


[tor-commits] [snowflake/master] Update to popup UI and addition of toggle

2019-07-02 Thread cohosh
commit eeae741262ad565d64abd5714599df31fde32e8f
Author: Antonela D 
Date:   Wed Jun 26 12:13:15 2019 -0400

Update to popup UI and addition of toggle
---
 proxy/webext/popup.css  | 101 
 proxy/webext/popup.html |  21 ++
 2 files changed, 108 insertions(+), 14 deletions(-)

diff --git a/proxy/webext/popup.css b/proxy/webext/popup.css
index ca3c426..479d2f4 100644
--- a/proxy/webext/popup.css
+++ b/proxy/webext/popup.css
@@ -2,20 +2,107 @@ body {
margin: 10px;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, 
Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
width: 300px;
+font-size:12px;
 }
 
 #active {
-   padding: 20px;
+   margin: 20px 0;
text-align: center;
 }
 
-.learn {
-   padding-top: 10px;
-   border-top: 1px solid grey;
+.b {
+  border-top: 1px solid gainsboro;
+  padding: 10px;
+  position: relative;
 }
 
-.learn a {
-   display: block;
-   color: grey;
+.b a {
+  color: black;
+   display: inline-block;
text-decoration: none;
 }
+
+.learn:before {
+  content : " ";
+  display: block;
+  position: absolute;
+  top: 12px;
+  background-image: 
url(https://design.firefox.com/icons/icons/desktop/arrowhead-right-12.svg);
+  width: 12px;
+  height: 12px;
+  opacity : 0.6;
+  z-index: ;
+  right: 0px;
+  margin-right: 10px;
+
+}
+
+/* Snowflake Status */
+
+.transfering {
+-webkit-animation:spin 8s linear infinite;
+-moz-animation:spin 8s linear infinite;
+animation:spin 8s linear infinite;
+
+fill: BlueViolet;
+}
+@-moz-keyframes spin { 100% { -moz-transform: rotate(360deg); } }
+@-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } }
+@keyframes spin { 100% { -webkit-transform: rotate(360deg); 
transform:rotate(360deg); } }
+
+
+/* Toggle */
+
+.switch {
+  position: relative;
+  display: inline-block;
+  width: 30px;
+  height: 17px;
+  float: right;
+}
+
+.switch input {
+  opacity: 0;
+  width: 0;
+  height: 0;
+}
+
+  .slider {
+  position: absolute;
+  cursor: pointer;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: #ccc;
+  -webkit-transition: .4s;
+  transition: .4s;
+  border-radius: 17px;
+}
+
+.slider:before {
+  position: absolute;
+  content: "";
+  height: 13px;
+  width: 13px;
+  left: 2px;
+  bottom: 2px;
+  background-color: white;
+  -webkit-transition: .4s;
+  transition: .4s;
+  border-radius: 50%;
+}
+
+input:checked + .slider {
+  background-color: BlueViolet;
+}
+
+input:focus + .slider {
+  box-shadow: 0 0 1px BlueViolet;
+}
+
+input:checked + .slider:before {
+  -webkit-transform: translateX(13px);
+  -ms-transform: translateX(13px);
+  transform: translateX(13px);
+}
diff --git a/proxy/webext/popup.html b/proxy/webext/popup.html
index 6795b2e..8149232 100644
--- a/proxy/webext/popup.html
+++ b/proxy/webext/popup.html
@@ -8,11 +8,18 @@



-   
-   
-   
-   
-   https://snowflake.torproject.org/;>Learn more
-   
-   
+
+
+
+
+Turn Off
+
+
+
+
+
+
+https://snowflake.torproject.org/;>Learn more
+
+
 



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


[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-07-02 Thread translation
commit 3b6af04b9c1a8d170b4ed21ee575fd4d2ccd0fa1
Author: Translation commit bot 
Date:   Tue Jul 2 14:18:07 2019 +

Update translations for tbmanual-contentspot
---
 contents+ru.po | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/contents+ru.po b/contents+ru.po
index 7051f1a44..ea363ec84 100644
--- a/contents+ru.po
+++ b/contents+ru.po
@@ -8,6 +8,7 @@
 # Emma Peel, 2019
 # Sergey Smirnov , 2019
 # solokot , 2019
+# Valentine Bobrovsy , 2019
 # 
 msgid ""
 msgstr ""
@@ -15,7 +16,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-06-03 14:04+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: solokot , 2019\n"
+"Last-Translator: Valentine Bobrovsy , 2019\n"
 "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -205,6 +206,8 @@ msgstr ""
 #: (content/about/contents+en.lrtopic.body)
 msgid "# HOW TOR WORKS"
 msgstr ""
+"# КАК РАБОТАЕТ TOR\n"
+" "
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -257,6 +260,8 @@ msgid ""
 "The safest and simplest way to download Tor Browser is from the official Tor"
 " Project website at https://www.torproject.org/download.;
 msgstr ""
+"Cамый простой и безопасный способ скачать 
Tor Browser - с официального сайта"
+" https://www.torproject.org/download.;
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -289,7 +294,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "# MIRRORS"
-msgstr ""
+msgstr "# ЗЕРКАЛА"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -1663,7 +1668,7 @@ msgstr ""
 msgid ""
 "By default, Tor Browser protects your security by encrypting your browsing "
 "data."
-msgstr ""
+msgstr "По умолчанию, Tor Browser зашищает Ваши 
данные с помощью шифрования."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/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] [snowflake/master] Stop resetting after every pair closes

2019-07-02 Thread cohosh
commit b1116a1c356bef91dd53f83563af49e0c422b127
Author: Arlo Breault 
Date:   Sat Jun 29 18:09:12 2019 -0400

Stop resetting after every pair closes
---
 proxy/init-badge.coffee  |  2 +-
 proxy/init-webext.coffee |  2 +-
 proxy/proxypair.coffee   |  3 +--
 proxy/snowflake.coffee   | 29 -
 4 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/proxy/init-badge.coffee b/proxy/init-badge.coffee
index 7802ca4..eead5b0 100644
--- a/proxy/init-badge.coffee
+++ b/proxy/init-badge.coffee
@@ -54,7 +54,7 @@ window.onbeforeunload = ->
   null
 
 window.onunload = ->
-  pair.close() for pair in snowflake.proxyPairs
+  snowflake.disable()
   null
 
 window.onload = init
diff --git a/proxy/init-webext.coffee b/proxy/init-webext.coffee
index 104384d..20b8bc3 100644
--- a/proxy/init-webext.coffee
+++ b/proxy/init-webext.coffee
@@ -45,7 +45,7 @@ window.onbeforeunload = ->
   null
 
 window.onunload = ->
-  pair.close() for pair in snowflake.proxyPairs
+  snowflake.disable()
   null
 
 window.onload = init
diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee
index efcc8c7..b66ba4f 100644
--- a/proxy/proxypair.coffee
+++ b/proxy/proxypair.coffee
@@ -78,8 +78,6 @@ class ProxyPair
   snowflake.state = Snowflake.MODE.INIT
   @flush()
   @close()
-  # TODO: Change this for multiplexing.
-  snowflake.reset()
 channel.onerror = -> log 'Data channel error!'
 channel.binaryType = "arraybuffer"
 channel.onmessage = @onClientToRelayMessage
@@ -149,6 +147,7 @@ class ProxyPair
 @client.close() if @webrtcIsReady()
 @relay.close() if @relayIsReady()
 relay = null
+@onCleanup()
 
   # Send as much data in both directions as the rate limit currently allows.
   flush: =>
diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee
index 99dd2bd..d2fdf91 100644
--- a/proxy/snowflake.coffee
+++ b/proxy/snowflake.coffee
@@ -51,8 +51,6 @@ class Snowflake
   # process. |pollBroker| automatically arranges signalling.
   beginWebRTC: ->
 @state = Snowflake.MODE.WEBRTC_CONNECTING
-for i in [1..@config.connectionsPerClient]
-  @makeProxyPair @relayAddr
 log 'ProxyPair Slots: ' + @proxyPairs.length
 log 'Snowflake IDs: ' + (@proxyPairs.map (p) -> p.id).join ' | '
 @pollBroker()
@@ -82,6 +80,8 @@ class Snowflake
 
   # Returns the first ProxyPair that's available to connect.
   nextAvailableProxyPair: ->
+if @proxyPairs.length < @config.connectionsPerClient
+  return @makeProxyPair @relayAddr
 return @proxyPairs.find (pp, i, arr) -> return !pp.active
 
   # Receive an SDP offer from some client assigned by the Broker,
@@ -110,27 +110,14 @@ class Snowflake
 @proxyPairs.push pair
 pair.onCleanup = (event) =>
   # Delete from the list of active proxy pairs.
-  @proxyPairs.splice(@proxyPairs.indexOf(pair), 1)
-  @pollBroker()
+  ind = @proxyPairs.indexOf(pair)
+  if ind > -1 then @proxyPairs.splice(ind, 1)
 pair.begin()
+return pair
 
   # Stop all proxypairs.
-  cease: ->
-while @proxyPairs.length > 0
-  @proxyPairs.pop().close()
-clearInterval(@pollInterval)
-
   disable: ->
 log 'Disabling Snowflake.'
-@cease()
-
-  die: ->
-log 'Snowflake died.'
-@cease()
-
-  # Close all existing ProxyPairs and begin finding new clients from scratch.
-  reset: ->
-@cease()
-log 'Snowflake resetting...'
-@retries = 0
-@beginWebRTC()
+clearInterval(@pollInterval)
+while @proxyPairs.length > 0
+  @proxyPairs.pop().close()



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


[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-07-02 Thread translation
commit af66c01299c5d2736ae38961f4607399bb91583b
Author: Translation commit bot 
Date:   Tue Jul 2 14:15:44 2019 +

Update translations for donatepages-messagespot
---
 locale/cs/LC_MESSAGES/messages.po | 45 +--
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/locale/cs/LC_MESSAGES/messages.po 
b/locale/cs/LC_MESSAGES/messages.po
index 055049273..575a6b366 100644
--- a/locale/cs/LC_MESSAGES/messages.po
+++ b/locale/cs/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@
 # Šimon Bořek, 2018
 # erinm, 2019
 # Michal Stanke , 2019
+# Zuzana Láskorádová, 2019
 # 
 msgid ""
 msgstr ""
-"Last-Translator: Michal Stanke , 2019\n"
+"Last-Translator: Zuzana Láskorádová, 2019\n"
 "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n"
 "Language: cs\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 
4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
@@ -133,22 +134,23 @@ msgstr ""
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:35
 #: 
tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:35
 msgid "Support the Tor Project Today!"
-msgstr ""
+msgstr "Podpořte projekt Tor ještě dnes!"
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:61
 msgid "Want to donate by credit card or PayPal?"
-msgstr ""
+msgstr "Chcete nás podpořit finančně za použití karty či služby 
PayPal?"
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:70
 msgid ""
 "Thanks for your interest in donating cryptocurrency to the Tor Project."
-msgstr ""
+msgstr "Děkujeme za Váš zájem, podpořit Tor Project v kryptoměně."
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:77
 msgid ""
 "Please fill out this form and then send your coins to the appropriate "
 "wallet."
 msgstr ""
+"Vyplňte prosím tento formulář a pošlete Vaše mince do příslušné 
peněženky."
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:79
 msgid ""
@@ -181,21 +183,21 @@ msgstr ""
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:110
 msgid "Copied"
-msgstr ""
+msgstr "Kopírováno"
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:114
 msgid "Currency Amount must be a number."
-msgstr ""
+msgstr "Výška příspěvku musí být číslo."
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:118
 #: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:51
 msgid "Choose a Currency"
-msgstr ""
+msgstr "Vyberte měnu"
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:122
 #: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:73
 msgid "Currency Amount"
-msgstr ""
+msgstr "Výška příspěvku"
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:124
 msgid "Estimated Donation Date"
@@ -203,7 +205,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:128
 msgid "I'd like to make my donation anonymous."
-msgstr ""
+msgstr "Chtěl bych darovat anonymně"
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:132
 #: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:46
@@ -214,23 +216,23 @@ msgstr "Email"
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:320
 #: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:29
 msgid "First Name"
-msgstr ""
+msgstr "Křestní jméno"
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:140
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:324
 #: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:33
 msgid "Last Name"
-msgstr ""
+msgstr "Příjmení"
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:144
 #: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:80
 msgid "Report Donation"
-msgstr ""
+msgstr "Nahlašte dar"
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:148
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:370
 msgid "Start sending me email updates about the Tor Project!"
-msgstr ""
+msgstr "Posílejte mi novinky o Tor Project přes email!"
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:152
 #: 

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-07-02 Thread translation
commit 4cfb527e7a1c9822aa76c41dc143871e96d3e536
Author: Translation commit bot 
Date:   Tue Jul 2 14:45:41 2019 +

Update translations for donatepages-messagespot
---
 locale/cs/LC_MESSAGES/messages.po | 77 +++
 1 file changed, 53 insertions(+), 24 deletions(-)

diff --git a/locale/cs/LC_MESSAGES/messages.po 
b/locale/cs/LC_MESSAGES/messages.po
index 575a6b366..35da9829d 100644
--- a/locale/cs/LC_MESSAGES/messages.po
+++ b/locale/cs/LC_MESSAGES/messages.po
@@ -254,11 +254,11 @@ msgstr ""
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:36
 msgid "Fit"
-msgstr "Velikost"
+msgstr "Tvar"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:40
 msgid "Select Fit"
-msgstr "Vyberte velikost"
+msgstr "Vyberte tvar"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:44
 msgid "Slim"
@@ -290,20 +290,20 @@ msgstr "M"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:82
 msgid "L"
-msgstr ""
+msgstr "L"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:86
 msgid "XL"
-msgstr ""
+msgstr "XL"
 
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:90
 msgid "XXL"
-msgstr ""
+msgstr "XXL"
 
 #: 
tmp/cache_locale/ca/ca1cd152d40544030a642d8d074e6afb769c3bf80a1b2b61c380f1466e3a03a4.php:34
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:34
 msgid "Tor Thanks You"
-msgstr ""
+msgstr "Tor Vám děkuje!"
 
 #: 
tmp/cache_locale/ca/ca1cd152d40544030a642d8d074e6afb769c3bf80a1b2b61c380f1466e3a03a4.php:44
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:44
@@ -313,13 +313,13 @@ msgstr "Děkujeme!"
 #: 
tmp/cache_locale/ca/ca1cd152d40544030a642d8d074e6afb769c3bf80a1b2b61c380f1466e3a03a4.php:51
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:51
 msgid "Thank you for supporting Tor's Strength in Numbers campaign."
-msgstr ""
+msgstr "Děkujeme za podporu Torův Strenght v kampani Numbers."
 
 #: 
tmp/cache_locale/ca/ca1cd152d40544030a642d8d074e6afb769c3bf80a1b2b61c380f1466e3a03a4.php:53
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:53
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:63
 msgid "You should receive an email receipt shortly."
-msgstr ""
+msgstr "Měli byste brzy obdržet účtenku na Váš email."
 
 #: 
tmp/cache_locale/ca/ca1cd152d40544030a642d8d074e6afb769c3bf80a1b2b61c380f1466e3a03a4.php:55
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:55
@@ -1498,10 +1498,12 @@ msgid ""
 "amount you donated, your full name, the payment method you used and your "
 "country of origin."
 msgstr ""
+"Abychom zpracovali Váš požadavek na vrácení peněz, budeme potřebovat 
datum "
+"příspěvku, výši příspěvku, Vaše jméno, způsob platby a zemi 
původu."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:466
 msgid "Please also tell us why you're asking for a refund."
-msgstr ""
+msgstr "Prosím povězte nám, proč prosíte o vrácení peněz."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:468
 msgid ""
@@ -1512,22 +1514,24 @@ msgstr ""
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:474
 msgid "Can I donate by mail?"
-msgstr ""
+msgstr "Mohu darovat poštou?"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:478
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:584
 msgid "Yes."
-msgstr ""
+msgstr "Ano."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:480
 msgid ""
 "Our mailing address is The Tor Project, 217 First Avenue South #4903, "
 "Seattle WA 98194, USA"
 msgstr ""
+"Naše poštovní adresa je The Tor Project, 217 First Avenue South #4903, "
+"Seattle WA 98194, USA"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:486
 msgid "Do you accept cash donations?"
-msgstr ""
+msgstr "Přijímáte dary v hotovosti?"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:490
 msgid "Yes"
@@ -1566,13 +1570,14 @@ msgstr ""
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:512
 msgid "Can I become a Tor Project member?"
-msgstr ""
+msgstr "Mohu se stát členem Tor Project?"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:516
 msgid ""
 "Right now, we don't have a membership program, but we may 

[tor-commits] [torbutton/master] Update translations

2019-07-02 Thread gk
commit fc5f85c225f7518b078ca20457468e38a78430ad
Author: Georg Koppen 
Date:   Tue Jul 2 14:39:06 2019 +

Update translations
---
 src/chrome/locale/ar/aboutTor.dtd  |  3 +++
 src/chrome/locale/bn-BD/aboutTor.dtd   |  3 +++
 src/chrome/locale/bn-BD/securityLevel.properties   | 10 
 src/chrome/locale/bn-BD/torbutton.dtd  |  2 +-
 src/chrome/locale/ca/aboutTor.dtd  |  3 +++
 src/chrome/locale/ca/browserOnboarding.properties  | 26 ++--
 src/chrome/locale/cs/aboutTor.dtd  |  3 +++
 src/chrome/locale/da/aboutTor.dtd  |  3 +++
 src/chrome/locale/da/browserOnboarding.properties  |  6 ++---
 src/chrome/locale/da/securityLevel.properties  |  2 +-
 src/chrome/locale/da/torbutton.dtd |  2 +-
 src/chrome/locale/da/torbutton.properties  |  2 +-
 src/chrome/locale/de/aboutTor.dtd  |  3 +++
 src/chrome/locale/el/aboutTor.dtd  |  3 +++
 src/chrome/locale/es-AR/aboutTor.dtd   |  3 +++
 src/chrome/locale/es-ES/aboutTor.dtd   |  3 +++
 src/chrome/locale/eu/aboutTor.dtd  |  3 +++
 src/chrome/locale/fa/aboutTor.dtd  |  3 +++
 src/chrome/locale/fr/aboutTor.dtd  |  3 +++
 src/chrome/locale/ga-IE/aboutTor.dtd   |  3 +++
 src/chrome/locale/he/aboutTor.dtd  |  3 +++
 src/chrome/locale/hu/aboutTor.dtd  |  3 +++
 src/chrome/locale/id/aboutTor.dtd  |  3 +++
 src/chrome/locale/id/securityLevel.properties  |  2 +-
 src/chrome/locale/id/torbutton.dtd |  2 +-
 src/chrome/locale/is/aboutTor.dtd  |  3 +++
 src/chrome/locale/it/aboutTor.dtd  |  3 +++
 src/chrome/locale/ja/aboutTor.dtd  |  3 +++
 src/chrome/locale/ka/aboutTor.dtd  |  3 +++
 src/chrome/locale/ko/aboutTor.dtd  |  3 +++
 src/chrome/locale/nb-NO/aboutTor.dtd   |  3 +++
 .../locale/nb-NO/browserOnboarding.properties  | 28 +++---
 src/chrome/locale/nl/aboutTor.dtd  |  3 +++
 src/chrome/locale/pl/aboutTor.dtd  |  3 +++
 src/chrome/locale/pt-BR/aboutTor.dtd   |  3 +++
 src/chrome/locale/ro/aboutTor.dtd  |  3 +++
 src/chrome/locale/ru/aboutTor.dtd  |  3 +++
 src/chrome/locale/sv-SE/aboutTor.dtd   |  3 +++
 src/chrome/locale/tr/aboutTBUpdate.dtd |  2 +-
 src/chrome/locale/tr/aboutTor.dtd  | 13 ++
 src/chrome/locale/vi/aboutTor.dtd  |  3 +++
 src/chrome/locale/zh-CN/aboutTor.dtd   |  5 +++-
 src/chrome/locale/zh-TW/aboutTor.dtd   |  3 +++
 43 files changed, 144 insertions(+), 48 deletions(-)

diff --git a/src/chrome/locale/ar/aboutTor.dtd 
b/src/chrome/locale/ar/aboutTor.dtd
index 6f8460d3..05486c97 100644
--- a/src/chrome/locale/ar/aboutTor.dtd
+++ b/src/chrome/locale/ar/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/src/chrome/locale/bn-BD/aboutTor.dtd 
b/src/chrome/locale/bn-BD/aboutTor.dtd
index 76bc83da..b5b6b385 100644
--- a/src/chrome/locale/bn-BD/aboutTor.dtd
+++ b/src/chrome/locale/bn-BD/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/src/chrome/locale/bn-BD/securityLevel.properties 
b/src/chrome/locale/bn-BD/securityLevel.properties
index 5a19cb74..c596f9ba 100644
--- a/src/chrome/locale/bn-BD/securityLevel.properties
+++ b/src/chrome/locale/bn-BD/securityLevel.properties
@@ -9,14 +9,14 @@ securityLevel.safer.tooltip = নিরাপত্তা 
স্তর: নি
 securityLevel.safer.summary = ওয়েবসাইটের 
বৈশিষ্ট্যগুলি প্রায়ই 
বিপজ্জনক করে, যা কিছু 
সাইটগুলি কার্যকারিতা হারাতে 
বাধা দেয়।
 securityLevel.safer.description1 = Non-HTTPS সাইটগুলিতে 
জাভাস্ক্রিপ্ট অক্ষম করা আছে।
 securityLevel.safer.description2 = কিছু ফন্ট এবং 
গণিত চিহ্ন অক্ষম আছে।
-securityLevel.safer.description3 = Audio and video (HTML5 media), and WebGL 
are click-to-play.
-securityLevel.safest.level = নিরাপদ
-securityLevel.safest.tooltip = নিরাপত্তা স্তর: 
নিশ্চিত নিরাপদ
+securityLevel.safer.description3 = অডিও ও ভিডিও 
(এইচটিএমএল5 মিডিয়া) এবং 
ওয়েবজিএলসমুহ ক্লিক করে সচল 
করুন
+securityLevel.safest.level = সবচে’ নিরাপদ
+securityLevel.safest.tooltip = নিরাপত্তা স্তর: 
সবচে’ নিরাপদ
 securityLevel.safest.summary = শুধুমাত্র 
স্থায়ী 

[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2019-07-02 Thread translation
commit aa5ca1ec10db6de9887fa219159c4943d2300497
Author: Translation commit bot 
Date:   Tue Jul 2 14:45:12 2019 +

Update translations for abouttor-homepage_completed
---
 fa/aboutTor.dtd | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fa/aboutTor.dtd b/fa/aboutTor.dtd
index c097eb759..77999b0c7 100644
--- a/fa/aboutTor.dtd
+++ b/fa/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+

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


[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2019-07-02 Thread translation
commit e24611ffc783c1bdd16e198fd2ddd272dfc1d167
Author: Translation commit bot 
Date:   Tue Jul 2 14:15:14 2019 +

Update translations for abouttor-homepage_completed
---
 pt-BR/aboutTor.dtd | 3 +++
 ru/aboutTor.dtd| 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pt-BR/aboutTor.dtd b/pt-BR/aboutTor.dtd
index 62792d16f..fb64963ab 100644
--- a/pt-BR/aboutTor.dtd
+++ b/pt-BR/aboutTor.dtd
@@ -31,3 +31,6 @@
 
 
 
+
+
+
diff --git a/ru/aboutTor.dtd b/ru/aboutTor.dtd
index fddd66c7a..125ac059c 100644
--- a/ru/aboutTor.dtd
+++ b/ru/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+

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


[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2019-07-02 Thread translation
commit 866684f6786a89754038a5e3a78c2af9e2b15d11
Author: Translation commit bot 
Date:   Tue Jul 2 14:15:05 2019 +

Update translations for abouttor-homepage
---
 pt-BR/aboutTor.dtd | 4 ++--
 ru/aboutTor.dtd| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pt-BR/aboutTor.dtd b/pt-BR/aboutTor.dtd
index deed46287..fb64963ab 100644
--- a/pt-BR/aboutTor.dtd
+++ b/pt-BR/aboutTor.dtd
@@ -32,5 +32,5 @@
 
 
 
-
-
+
+
diff --git a/ru/aboutTor.dtd b/ru/aboutTor.dtd
index 18a7e52dc..125ac059c 100644
--- a/ru/aboutTor.dtd
+++ b/ru/aboutTor.dtd
@@ -31,5 +31,5 @@
 
 
 
-
-
+
+

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


[tor-commits] [snowflake/master] Updated popup icon to be purple when it's enabled

2019-07-02 Thread cohosh
commit f890739a389c959442e8e74a025929ffed96271d
Author: Cecylia Bocovich 
Date:   Thu Jun 27 10:41:15 2019 -0400

Updated popup icon to be purple when it's enabled
---
 proxy/snowflake.coffee |  2 +-
 proxy/ui.coffee|  6 +++---
 proxy/webext/popup.js  | 10 ++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee
index 4bf6cb6..99dd2bd 100644
--- a/proxy/snowflake.coffee
+++ b/proxy/snowflake.coffee
@@ -73,7 +73,7 @@ class Snowflake
 msg += '[retries: ' + @retries + ']' if @retries > 0
 @ui.setStatus msg
 recv = @broker.getClientOffer pair.id
-recv.then (desc) ->
+recv.then (desc) =>
   @receiveOffer pair, desc
 , (err) ->
   pair.active = false
diff --git a/proxy/ui.coffee b/proxy/ui.coffee
index a47e224..e316e54 100644
--- a/proxy/ui.coffee
+++ b/proxy/ui.coffee
@@ -86,6 +86,9 @@ class WebExtUI extends UI
   onMessage: (m) =>
 @enabled = m.enabled
 update()
+chrome.browserAction.setIcon
+  path:
+32: "icons/status-" + (if @enabled then "on" else "off") + ".png"
 @postActive()
 
   onDisconnect: (port) =>
@@ -95,6 +98,3 @@ class WebExtUI extends UI
 super connected
 if connected then @stats[0] += 1
 @postActive()
-chrome.browserAction.setIcon
-  path:
-32: "icons/status-" + (if connected then "on" else "off") + ".png"
diff --git a/proxy/webext/popup.js b/proxy/webext/popup.js
index f02bdff..b926f75 100644
--- a/proxy/webext/popup.js
+++ b/proxy/webext/popup.js
@@ -6,17 +6,19 @@ port.onMessage.addListener((m) => {
const active = m.active;
const div = document.getElementById('active');
const img = div.querySelector('img');
-   img.src = `icons/status-${active ? "on" : "off"}.png`;
+const enabled = m.enabled
+   img.src = `icons/status-${enabled ? "on" : "off"}.png`;
const ps = div.querySelectorAll('p');
const clients = active ? 1 : 0;
-   ps[0].innerText = `${clients} client${(clients !== 1) ? 's' : ''} 
connected.`;
-   ps[1].innerText = `Your snowflake has helped ${m.total} user${(m.total 
!== 1) ? 's' : ''} circumvent censorship in the last 24 hours.`;
-const enabled = m.enabled
 const enabledText = document.getElementById('toggle');
 if (enabled) {
 document.getElementById('enabled').checked = true;
 enabledText.innerText = 'Turn Off';
+ps[0].innerText = `${clients} client${(clients !== 1) ? 's' : ''} 
connected.`;
+ps[1].innerText = `Your snowflake has helped ${m.total} 
user${(m.total !== 1) ? 's' : ''} circumvent censorship in the last 24 hours.`;
 } else {
+ps[0].innerText = "Snowflake is off";
+ps[1].innerText = "";
 document.getElementById('enabled').checked = false;
 enabledText.innerText = 'Turn On';
 }



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


[tor-commits] [snowflake/master] Include a local copy of the arrow icon

2019-07-02 Thread cohosh
commit 51bc1cf3ed8ec66a1caffbfa20d4dfb5b261cda1
Author: Arlo Breault 
Date:   Sat Jun 29 19:49:52 2019 -0400

Include a local copy of the arrow icon

From https://design.firefox.com/icons/icons/desktop/arrowhead-right-12.svg
---
 proxy/webext/icons/arrowhead-right-12.svg | 4 
 proxy/webext/popup.css| 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/proxy/webext/icons/arrowhead-right-12.svg 
b/proxy/webext/icons/arrowhead-right-12.svg
new file mode 100644
index 000..54afc2e
--- /dev/null
+++ b/proxy/webext/icons/arrowhead-right-12.svg
@@ -0,0 +1,4 @@
+
+http://www.w3.org/2000/svg; width="12" height="12" viewBox="0 0 12 
12">
\ No newline at end of file
diff --git a/proxy/webext/popup.css b/proxy/webext/popup.css
index 332092d..856e855 100644
--- a/proxy/webext/popup.css
+++ b/proxy/webext/popup.css
@@ -27,7 +27,7 @@ body {
   display: block;
   position: absolute;
   top: 12px;
-  background-image: 
url(https://design.firefox.com/icons/icons/desktop/arrowhead-right-12.svg);
+  background-image: url(../icons/arrowhead-right-12.svg);
   width: 12px;
   height: 12px;
   opacity : 0.6;



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


[tor-commits] [snowflake/master] Add toggle functionality to web extension

2019-07-02 Thread cohosh
commit 799a13d3853c26b51bb2ed3c05690f6650cebec2
Author: Cecylia Bocovich 
Date:   Wed Jun 26 20:21:44 2019 -0400

Add toggle functionality to web extension
---
 proxy/init-webext.coffee   | 12 
 proxy/ui.coffee|  8 
 proxy/webext/manifest.json |  3 ++-
 proxy/webext/popup.html|  4 ++--
 proxy/webext/popup.js  | 13 +
 5 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/proxy/init-webext.coffee b/proxy/init-webext.coffee
index 1ba6391..104384d 100644
--- a/proxy/init-webext.coffee
+++ b/proxy/init-webext.coffee
@@ -4,6 +4,9 @@ Entry point.
 
 debug = false
 snowflake = null
+config = null
+broker = null
+ui = null
 
 # Log to both console and UI if applicable.
 # Requires that the snowflake and UI objects are hooked up in order to
@@ -21,8 +24,17 @@ init = () ->
   snowflake = new Snowflake config, ui, broker
 
   log '== snowflake proxy =='
+
+update = () ->
+  if !ui.enabled
+# Do not activate the proxy if any number of conditions are true.
+snowflake.disable()
+log 'Currently not active.'
+return
+
   # Otherwise, begin setting up WebRTC and acting as a proxy.
   dbg 'Contacting Broker at ' + broker.url
+  log 'Starting snowflake'
   snowflake.setRelayAddr config.relayAddr
   snowflake.beginWebRTC()
 
diff --git a/proxy/ui.coffee b/proxy/ui.coffee
index 505fa45..fa45823 100644
--- a/proxy/ui.coffee
+++ b/proxy/ui.coffee
@@ -4,6 +4,7 @@ All of Snowflake's DOM manipulation and inputs.
 
 class UI
   active: false
+  enabled: false
 
   setStatus: (msg) ->
 
@@ -74,10 +75,17 @@ class WebExtUI extends UI
   total: @stats.reduce ((t, c) ->
 t + c
   ), 0
+  enabled: @enabled
 
   onConnect: (port) =>
 @port = port
 port.onDisconnect.addListener @onDisconnect
+port.onMessage.addListener @onMessage
+@postActive()
+  
+  onMessage: (m) =>
+@enabled = m.enabled
+update()
 @postActive()
 
   onDisconnect: (port) =>
diff --git a/proxy/webext/manifest.json b/proxy/webext/manifest.json
index cd7d250..8cf43ae 100644
--- a/proxy/webext/manifest.json
+++ b/proxy/webext/manifest.json
@@ -13,5 +13,6 @@
},
"default_title": "Snowflake",
"default_popup": "popup.html"
-   }
+   },
+"permissions": ["cookies", "https://snowflake.torproject.org/;]
 }
diff --git a/proxy/webext/popup.html b/proxy/webext/popup.html
index 8149232..c32a5f8 100644
--- a/proxy/webext/popup.html
+++ b/proxy/webext/popup.html
@@ -12,9 +12,9 @@
 
 
 
-Turn Off
+Turn On
 
-
+
 
 
 
diff --git a/proxy/webext/popup.js b/proxy/webext/popup.js
index 3869a5f..f02bdff 100644
--- a/proxy/webext/popup.js
+++ b/proxy/webext/popup.js
@@ -11,4 +11,17 @@ port.onMessage.addListener((m) => {
const clients = active ? 1 : 0;
ps[0].innerText = `${clients} client${(clients !== 1) ? 's' : ''} 
connected.`;
ps[1].innerText = `Your snowflake has helped ${m.total} user${(m.total 
!== 1) ? 's' : ''} circumvent censorship in the last 24 hours.`;
+const enabled = m.enabled
+const enabledText = document.getElementById('toggle');
+if (enabled) {
+document.getElementById('enabled').checked = true;
+enabledText.innerText = 'Turn Off';
+} else {
+document.getElementById('enabled').checked = false;
+enabledText.innerText = 'Turn On';
+}
 });
+
+document.addEventListener('change', (event) => {
+port.postMessage({enabled: event.target.checked});
+})



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


[tor-commits] [snowflake/master] Fixed linting errors/warnings and tests

2019-07-02 Thread cohosh
commit 788f2a595fa5daf076e08b80c9476cb0a1064c37
Author: Cecylia Bocovich 
Date:   Thu Jun 27 09:28:36 2019 -0400

Fixed linting errors/warnings and tests

The test failure was due to pollBorker waiting the full 5 seconds before
polling for the first time.

The lint errors were some trailing whitespace and unecessary fat arrows
---
 proxy/snowflake.coffee | 8 +---
 proxy/ui.coffee| 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee
index b86e0b7..30f1d6b 100644
--- a/proxy/snowflake.coffee
+++ b/proxy/snowflake.coffee
@@ -55,7 +55,9 @@ class Snowflake
   @makeProxyPair @relayAddr
 log 'ProxyPair Slots: ' + @proxyPairs.length
 log 'Snowflake IDs: ' + (@proxyPairs.map (p) -> p.id).join ' | '
-@pollInterval = setInterval((=> @pollBroker()), 
config.defaultBrokerPollInterval)
+@pollBroker()
+@pollInterval = setInterval((=> @pollBroker()),
+  config.defaultBrokerPollInterval)
 log @pollInterval
 
   # Regularly poll Broker for clients to serve until this snowflake is
@@ -72,9 +74,9 @@ class Snowflake
 msg += '[retries: ' + @retries + ']' if @retries > 0
 @ui.setStatus msg
 recv = @broker.getClientOffer pair.id
-recv.then (desc) =>
+recv.then (desc) ->
   @receiveOffer pair, desc
-, (err) =>
+, (err) ->
   pair.active = false
 @retries++
 
diff --git a/proxy/ui.coffee b/proxy/ui.coffee
index fa45823..a47e224 100644
--- a/proxy/ui.coffee
+++ b/proxy/ui.coffee
@@ -82,7 +82,7 @@ class WebExtUI extends UI
 port.onDisconnect.addListener @onDisconnect
 port.onMessage.addListener @onMessage
 @postActive()
-  
+
   onMessage: (m) =>
 @enabled = m.enabled
 update()



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


[tor-commits] [snowflake/master] getClientOffer can return after snowflake is disabled

2019-07-02 Thread cohosh
commit 7090316e5c3a780dbf877fab6e5339534b3f5377
Author: Arlo Breault 
Date:   Sat Jun 29 20:19:51 2019 -0400

getClientOffer can return after snowflake is disabled
---
 proxy/snowflake.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee
index d2fdf91..d54f593 100644
--- a/proxy/snowflake.coffee
+++ b/proxy/snowflake.coffee
@@ -72,7 +72,7 @@ class Snowflake
 @ui.setStatus msg
 recv = @broker.getClientOffer pair.id
 recv.then (desc) =>
-  @receiveOffer pair, desc
+  if pair.running then @receiveOffer pair, desc
 , (err) ->
   pair.active = false
 @retries++

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


[tor-commits] [snowflake/master] Remove unecessary logging

2019-07-02 Thread cohosh
commit 651dca464ff981564fad46b99ac2261ead097408
Author: Cecylia Bocovich 
Date:   Thu Jun 27 09:40:30 2019 -0400

Remove unecessary logging
---
 proxy/snowflake.coffee | 2 --
 1 file changed, 2 deletions(-)

diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee
index 30f1d6b..4bf6cb6 100644
--- a/proxy/snowflake.coffee
+++ b/proxy/snowflake.coffee
@@ -58,7 +58,6 @@ class Snowflake
 @pollBroker()
 @pollInterval = setInterval((=> @pollBroker()),
   config.defaultBrokerPollInterval)
-log @pollInterval
 
   # Regularly poll Broker for clients to serve until this snowflake is
   # serving at capacity, at which point stop polling.
@@ -119,7 +118,6 @@ class Snowflake
   cease: ->
 while @proxyPairs.length > 0
   @proxyPairs.pop().close()
-log @pollInterval
 clearInterval(@pollInterval)
 
   disable: ->



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


[tor-commits] [snowflake/master] Fix whitespace to match conventions

2019-07-02 Thread cohosh
commit 58d07788c794734bfdf2a1bc64f22b4d244a6cb2
Author: Cecylia Bocovich 
Date:   Tue Jul 2 09:56:47 2019 -0400

Fix whitespace to match conventions
---
 proxy/webext/popup.css  | 26 +-
 proxy/webext/popup.html | 44 ++--
 proxy/webext/popup.js   | 42 +-
 3 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/proxy/webext/popup.css b/proxy/webext/popup.css
index 479d2f4..332092d 100644
--- a/proxy/webext/popup.css
+++ b/proxy/webext/popup.css
@@ -1,13 +1,13 @@
 body {
-   margin: 10px;
-   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, 
Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-   width: 300px;
-font-size:12px;
+  margin: 10px;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, 
Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+  width: 300px;
+  font-size:12px;
 }
 
 #active {
-   margin: 20px 0;
-   text-align: center;
+  margin: 20px 0;
+  text-align: center;
 }
 
 .b {
@@ -18,8 +18,8 @@ body {
 
 .b a {
   color: black;
-   display: inline-block;
-   text-decoration: none;
+  display: inline-block;
+  text-decoration: none;
 }
 
 .learn:before {
@@ -40,11 +40,11 @@ body {
 /* Snowflake Status */
 
 .transfering {
--webkit-animation:spin 8s linear infinite;
--moz-animation:spin 8s linear infinite;
-animation:spin 8s linear infinite;
+  -webkit-animation:spin 8s linear infinite;
+  -moz-animation:spin 8s linear infinite;
+  animation:spin 8s linear infinite;
 
-fill: BlueViolet;
+  fill: BlueViolet;
 }
 @-moz-keyframes spin { 100% { -moz-transform: rotate(360deg); } }
 @-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } }
@@ -67,7 +67,7 @@ body {
   height: 0;
 }
 
-  .slider {
+.slider {
   position: absolute;
   cursor: pointer;
   top: 0;
diff --git a/proxy/webext/popup.html b/proxy/webext/popup.html
index c32a5f8..1074333 100644
--- a/proxy/webext/popup.html
+++ b/proxy/webext/popup.html
@@ -1,25 +1,25 @@
 
 
-   
-   
-   
-   
-   
-   
-   
-   
-
-
-
-
-Turn On
-
-
-
-
-
-
-https://snowflake.torproject.org/;>Learn more
-
-
+  
+
+
+
+  
+  
+
+  
+
+
+
+
+  Turn On
+  
+
+
+  
+
+
+  https://snowflake.torproject.org/;>Learn 
more
+
+  
 
diff --git a/proxy/webext/popup.js b/proxy/webext/popup.js
index b926f75..c447b86 100644
--- a/proxy/webext/popup.js
+++ b/proxy/webext/popup.js
@@ -1,29 +1,29 @@
 const port = chrome.runtime.connect({
-   name: "popup"
+  name: "popup"
 });
 
 port.onMessage.addListener((m) => {
-   const active = m.active;
-   const div = document.getElementById('active');
-   const img = div.querySelector('img');
-const enabled = m.enabled
-   img.src = `icons/status-${enabled ? "on" : "off"}.png`;
-   const ps = div.querySelectorAll('p');
-   const clients = active ? 1 : 0;
-const enabledText = document.getElementById('toggle');
-if (enabled) {
-document.getElementById('enabled').checked = true;
-enabledText.innerText = 'Turn Off';
-ps[0].innerText = `${clients} client${(clients !== 1) ? 's' : ''} 
connected.`;
-ps[1].innerText = `Your snowflake has helped ${m.total} 
user${(m.total !== 1) ? 's' : ''} circumvent censorship in the last 24 hours.`;
-} else {
-ps[0].innerText = "Snowflake is off";
-ps[1].innerText = "";
-document.getElementById('enabled').checked = false;
-enabledText.innerText = 'Turn On';
-}
+  const active = m.active;
+  const div = document.getElementById('active');
+  const img = div.querySelector('img');
+  const enabled = m.enabled
+  img.src = `icons/status-${enabled ? "on" : "off"}.png`;
+  const ps = div.querySelectorAll('p');
+  const clients = active ? 1 : 0;
+  const enabledText = document.getElementById('toggle');
+  if (enabled) {
+document.getElementById('enabled').checked = true;
+enabledText.innerText = 'Turn Off';
+ps[0].innerText = `${clients} client${(clients !== 1) ? 's' : ''} 
connected.`;
+ps[1].innerText = `Your snowflake has helped ${m.total} user${(m.total !== 
1) ? 's' : ''} circumvent censorship in the last 24 hours.`;
+  } else {
+ps[0].innerText = "Snowflake is off";
+ps[1].innerText = "";
+document.getElementById('enabled').checked = false;
+enabledText.innerText = 'Turn On';
+  }
 });
 
 document.addEventListener('change', 

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2019-07-02 Thread translation
commit 474e2817788c8b8695c7e6c1597f12abd537c256
Author: Translation commit bot 
Date:   Tue Jul 2 14:16:48 2019 +

Update translations for tails-misc
---
 ru.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ru.po b/ru.po
index e45b11f9f..0e390a9a3 100644
--- a/ru.po
+++ b/ru.po
@@ -23,6 +23,7 @@
 # Oul Gocke , 2013-2014
 # Sergey Briskin, 2015
 # Sergey Lapshov , 2018
+# solokot , 2019
 # tetyana muirhead, 2015
 # solokot , 2017
 # Valid Olov, 2013
@@ -37,8 +38,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-06-30 18:53+0200\n"
-"PO-Revision-Date: 2019-07-01 01:04+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-07-02 14:14+\n"
+"Last-Translator: solokot \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"
@@ -668,11 +669,11 @@ msgstr "Не удалось разблокировать 
том {volume_name}:\n
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
-msgstr ""
+msgstr "Невозможно заблокировать раздел 
{volume_name}:\n{error_message}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:332
 msgid "Error locking volume"
-msgstr ""
+msgstr "Ошибка блокировки раздела"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"

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


[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2019-07-02 Thread translation
commit 5c2f7f8756ac31e408def4f09c4bfc5d34c018c9
Author: Translation commit bot 
Date:   Tue Jul 2 14:16:06 2019 +

Update translations for https_everywhere
---
 cs/https-everywhere.dtd | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cs/https-everywhere.dtd b/cs/https-everywhere.dtd
index 043c69ef3..24dd141ca 100644
--- a/cs/https-everywhere.dtd
+++ b/cs/https-everywhere.dtd
@@ -8,13 +8,13 @@
 
 
 
-
+
 
 
 
-
+
 
-
+
 
 
 
@@ -36,7 +36,7 @@
 
 
 
-
+
 
 
 
@@ -48,7 +48,7 @@
 
 
 
-
+
 
 
 

___
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-60.7.0esr-9.0-1] Picking up latest Torbutton changes

2019-07-02 Thread gk
commit c8dce5f0a165026ecacec69132b568876916ddc1
Author: Georg Koppen 
Date:   Tue Jul 2 14:40:18 2019 +

Picking up latest Torbutton changes
---
 toolkit/torproject/torbutton | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton
index 73ef44a6ece3..fc5f85c225f7 16
--- a/toolkit/torproject/torbutton
+++ b/toolkit/torproject/torbutton
@@ -1 +1 @@
-Subproject commit 73ef44a6ece304438cf6db89a0c8bbc75d65c16b
+Subproject commit fc5f85c225f7518b078ca20457468e38a78430ad

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


[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2019-07-02 Thread translation
commit ad296b1a5872a860ab9806708b59e653475e1ff3
Author: Translation commit bot 
Date:   Tue Jul 2 19:45:14 2019 +

Update translations for abouttor-homepage_completed
---
 lt/aboutTor.dtd | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lt/aboutTor.dtd b/lt/aboutTor.dtd
index 0203f2f60..8571544d0 100644
--- a/lt/aboutTor.dtd
+++ b/lt/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+

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


[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2019-07-02 Thread translation
commit 22349e98b5251319d39f6446604111ef5940
Author: Translation commit bot 
Date:   Tue Jul 2 19:45:05 2019 +

Update translations for abouttor-homepage
---
 lt/aboutTor.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lt/aboutTor.dtd b/lt/aboutTor.dtd
index dac9f5005..8571544d0 100644
--- a/lt/aboutTor.dtd
+++ b/lt/aboutTor.dtd
@@ -31,5 +31,5 @@
 
 
 
-
-
+
+

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


[tor-commits] [tor-browser-build/master] Remove four default bridges.

2019-07-02 Thread gk
commit e26e91bef8bd8d04d79bdd69f087efd808bc925d
Author: Philipp Winter 
Date:   Mon Jul 1 14:11:37 2019 -0700

Remove four default bridges.

The operator wants to reduce the maintenance burden and eliminate the
risk of seeing both entry and exit traffic.

This fixes .
---
 .../Bundle-Data/PTConfigs/bridge_prefs.js  | 27 +-
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js 
b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
index 61fdba1..4eb4644 100644
--- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -2,22 +2,17 @@
 pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4");
 
 // Default bridges.
-pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 
109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED");
-pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 
109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A");
-
-pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 
109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E 
cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA 
iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 
109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D 
cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA 
iat-mode=2");
-pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.95.36.142:443 
CDF2E852BF539B82BD10E27E9115A31734E378C2 
cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ 
iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 85.17.30.79:443 
FC259A04A328A07FED1413E9FC6526530D9FD87A 
cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 38.229.1.78:80 
C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 
cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg 
iat-mode=1");
-/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.6"/**/, 
/**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 
cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ 
iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 
[2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 
CDF2E852BF539B82BD10E27E9115A31734E378C2 
cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ 
iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 
37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 
cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg 
iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 
37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D 
cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 85.31.186.98:443 
011F2599C0E9B27EE74B353155E244813763C3E5 
cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 85.31.186.26:443 
91A6354697E6B02A386312F68D82CF86824D3606 
cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 
216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 
cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 
144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB 
cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw 
iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 192.95.36.142:443 
CDF2E852BF539B82BD10E27E9115A31734E378C2 
cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ 
iat-mode=1");
+pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 85.17.30.79:443 
FC259A04A328A07FED1413E9FC6526530D9FD87A 
cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA 
iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 38.229.1.78:80 
C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 
cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg 
iat-mode=1");
+/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.4"/**/, 
/**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 
cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ 
iat-mode=1");
+pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 
[2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 
CDF2E852BF539B82BD10E27E9115A31734E378C2 

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2019-07-02 Thread translation
commit 95e1a85a0107f81500fae43194f420dbdb5b18a3
Author: Translation commit bot 
Date:   Tue Jul 2 09:16:37 2019 +

Update translations for tails-misc
---
 ka.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ka.po b/ka.po
index 435c0b22d..074a7f41b 100644
--- a/ka.po
+++ b/ka.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-06-30 18:53+0200\n"
-"PO-Revision-Date: 2019-07-01 01:04+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-07-02 08:57+\n"
+"Last-Translator: Georgianization\n"
 "Language-Team: Georgian 
(http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -633,7 +633,7 @@ msgstr "შეცდომა დანაყოფის 
გახსნის
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
-msgstr "ვერ მოხერხდა დანაყოფის 
გახსნა {volume_name}:\n{error_message}"
+msgstr "ვერ მოხერხდა გახსნა 
დანაყოფის {volume_name}:\n{error_message}"
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
@@ -642,11 +642,11 @@ msgstr "ვერ მოხერხდა 
დანაყოფის გახ
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
-msgstr ""
+msgstr "ვერ მოხერხდა ჩაკეტვა 
დანაყოფის {volume_name}:\n{error_message}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:332
 msgid "Error locking volume"
-msgstr ""
+msgstr "შეცდომა დანაყოფის 
ჩაკეტვისას"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"

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


[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2019-07-02 Thread translation
commit f339b206bcc5ad97814e9c8cb860a67d041ff611
Author: Translation commit bot 
Date:   Tue Jul 2 09:16:44 2019 +

Update translations for tails-misc_completed
---
 ka.po | 23 ++-
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/ka.po b/ka.po
index 8d98028fb..074a7f41b 100644
--- a/ka.po
+++ b/ka.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-05-20 14:14+\n"
+"POT-Creation-Date: 2019-06-30 18:53+0200\n"
+"PO-Revision-Date: 2019-07-02 08:57+\n"
 "Last-Translator: Georgianization\n"
 "Language-Team: Georgian 
(http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -425,11 +425,11 @@ msgstr "ეკრანის ჩამკეტი"
 msgid "Set up a password to unlock the screen."
 msgstr "დააყენეთ პაროლი ეკრანის 
გასახსნელად"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:136
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
 msgid "Password"
 msgstr "პაროლი"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:142
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
 msgid "Confirm"
 msgstr "დაადასტურეთ"
 
@@ -633,7 +633,20 @@ msgstr "შეცდომა დანაყოფის 
გახსნის
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
-msgstr "ვერ მოხერხდა დანაყოფის 
გახსნა {volume_name}:\n{error_message}"
+msgstr "ვერ მოხერხდა გახსნა 
დანაყოფის {volume_name}:\n{error_message}"
+
+#. Translators: Don't translate {volume_name} or {error_message},
+#. they are placeholder and will be replaced.
+#: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#, python-brace-format
+msgid ""
+"Couldn't lock volume {volume_name}:\n"
+"{error_message}"
+msgstr "ვერ მოხერხდა ჩაკეტვა 
დანაყოფის {volume_name}:\n{error_message}"
+
+#: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:332
+msgid "Error locking volume"
+msgstr "შეცდომა დანაყოფის 
ჩაკეტვისას"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"

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


[tor-commits] [onionperf/master] Adds short deployment instructions

2019-07-02 Thread irl
commit 2df6b54fd5ebd1f854ba6f263b0462df0a8d6e13
Author: Ana C. Custura 
Date:   Wed Jun 5 14:45:52 2019 +0100

Adds short deployment instructions
---
 README.md | 37 +++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d2f2f05..ccd4065 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,37 @@ can later be used to visualize changes in Tor client 
performance over time.
 For more information, see https://git.torproject.org/onionperf
 For a dockerized setup, see https://github.com/hiromipaw/onionperf-docker
 
+## Quick deployment instructions
+
+These are the quick deployment instructions for the current Debian stable 
distribution.
+
+```
+sudo apt install git cmake make build-essential gcc libigraph0-dev 
libglib2.0-dev python-dev libxml2-dev python-lxml python-networkx python-scipy 
python-matplotlib python-numpy libevent-dev libssl-dev
+
+echo 'deb http://deb.debian.org/debian stretch-backports main' >> 
/etc/apt/sources.list
+apt update
+apt-get -t stretch-backports install python-stem tor
+
+
+git clone https://github.com/shadow/tgen.git
+cd tgen
+mkdir build
+cd build
+cmake .. -DCMAKE_INSTALL_PREFIX=/home/$USER/.local
+make
+ln -s ~/tgen/build/tgen /usr/bin/tgen
+
+git clone https://github.com/ana-cc/onionperf
+cd onionperf
+git checkout steins_gate
+sudo python setup.py build
+sudo python setup.py install
+```
+
+## Step-by-step installation instructions
+
+Here you can find more detailed instructions for the current Debian stable 
distribution.
+
 ### Get OnionPerf
 
 ```
@@ -95,10 +126,12 @@ large dependencies.
 ### Build Tor
 
 **Note**: You can install Tor with apt, although the
-preferred method is to build from source. To install using apt:
+preferred method is to build from source. To install using from backports:
 
 ```
-sudo apt install tor
+echo 'deb http://deb.debian.org/debian stretch-backports main' >> 
/etc/apt/sources.list
+apt update
+apt-get -t stretch-backports install tor
 ```
 Or, if building from source:
 

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


[tor-commits] [translation/tpo-web] Update translations for tpo-web

2019-07-02 Thread translation
commit f3c296319c96083c0177aed1a1feb8f5acabd0bc
Author: Translation commit bot 
Date:   Tue Jul 2 10:50:27 2019 +

Update translations for tpo-web
---
 contents+th.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contents+th.po b/contents+th.po
index a4908e746..83c59041b 100644
--- a/contents+th.po
+++ b/contents+th.po
@@ -34,7 +34,7 @@ msgstr ""
 
 #: https//www.torproject.org/ (content/contents+en.lrpage.body)
 msgid "## ABOUT US ##"
-msgstr "เกี่ยวกับเรา"
+msgstr "## เกี่ยวกับเรา ##"
 
 #: https//www.torproject.org/ (content/contents+en.lrpage.body)
 msgid ""
@@ -43,7 +43,7 @@ msgstr 
"เราเชื่อมั่นว่าทุกคนควรท
 
 #: https//www.torproject.org/ (content/contents+en.lrpage.body)
 msgid "We are the Tor Project, a 501(c)3 US nonprofit."
-msgstr ""
+msgstr "เราคือโปรเจค Tor 
องค์กรไม่แสวงหาผลกำไร US 501(c)(3)."
 
 #: https//www.torproject.org/ (content/contents+en.lrpage.body)
 msgid ""

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


[tor-commits] [translation/tpo-web] Update translations for tpo-web

2019-07-02 Thread translation
commit 1e992a37f07364fd87e42774221769cfaf90b050
Author: Translation commit bot 
Date:   Tue Jul 2 11:20:32 2019 +

Update translations for tpo-web
---
 contents+th.po | 43 ++-
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/contents+th.po b/contents+th.po
index 83c59041b..68d7b81ec 100644
--- a/contents+th.po
+++ b/contents+th.po
@@ -239,6 +239,8 @@ msgid ""
 "The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of "
 "\"onion routing\" began in the mid 1990s."
 msgstr ""
+"องค์กร โปรเจค Tor กลายเป็น 
คือองค์กรไม่แสวงหาผลกำไร 
501(c)(3) ในปี 2006 "
+"แต่แนวคิด \"onion routing\" 
นั้นเริ่มขึ้นเมื่อกลางปี 1990"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -262,7 +264,7 @@ msgid ""
 "(NRL) asked themselves if there was a way to create internet connections "
 "that don't reveal who is talking to whom, even to someone monitoring the "
 "network."
-msgstr ""
+msgstr " "
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -428,6 +430,8 @@ msgid ""
 "We are an international team who believes everyone should have private "
 "access to the uncensored web."
 msgstr ""
+"เราคือทีมนานาชาติ "
+"ผู้ที่เชื่อว่าทุกคนควรมีสิทธิ์ความเป็นส่วนตัวในการเข้าถึงเว็บที่ถูกปิดกั้น"
 
 #: https//www.torproject.org/about/sponsors/
 #: (content/about/sponsors/contents+en.lrsponsors.body)
@@ -447,7 +451,7 @@ msgstr ""
 #: https//www.torproject.org/press/-new-release-tails/
 #: (content/press/new-release-tails/contents+en.lrpost.title)
 msgid "New Release: Tails 3.12"
-msgstr ""
+msgstr "ใหม่: Tails 3.12"
 
 #: https//www.torproject.org/press/-new-release-tails/
 #: (content/press/new-release-tails/contents+en.lrpost.summary)
@@ -466,7 +470,7 @@ msgstr ""
 #: https//www.torproject.org/press/-new-release-tor/
 #: (content/press/new-release-tor/contents+en.lrpost.title)
 msgid "New Release: Tor 0.4.0.1-alpha"
-msgstr ""
+msgstr "ใหม่: Tor 0.4.0.1-alpha"
 
 #: https//www.torproject.org/press/-new-release-tor/
 #: (content/press/new-release-tor/contents+en.lrpost.summary)
@@ -626,7 +630,7 @@ msgstr "ภาษา"
 
 #: templates/download-tor.html:25 templates/download-tor.html:30
 msgid "sig"
-msgstr ""
+msgstr "ลายเซ็น"
 
 #: templates/download.html:5
 msgid "Get Connected"
@@ -654,11 +658,11 @@ msgstr ""
 
 #: templates/download.html:14
 msgid "Support Portal"
-msgstr ""
+msgstr "พอร์ทัล สนับสนุน"
 
 #: templates/download.html:14
 msgid "Read other FAQs at our Support Portal"
-msgstr ""
+msgstr "อ่าน คำถามที่พบบ่อย ที่ 
พอร์ทัล สนับสนุน ของเรา"
 
 #: templates/download.html:19 templates/download.html:21
 msgid "Stay safe"
@@ -673,12 +677,16 @@ msgid ""
 "Tor Browser will block browser plugins such as Flash, RealPlayer, Quicktime,"
 " and others: they can be manipulated into revealing your IP address."
 msgstr ""
+"Tor Browser 
จะปิดกั้นปลั๊กอินของเบราว์เซอร์เช่น
 Flash, RealPlayer, Quicktime"
+" และอื่น ๆ : 
เหล่านั้นมันสามารถปรับข้อมูลเพื่อเปิดเผยที่อยู่
 IP ของคุณได้"
 
 #: templates/download.html:27
 msgid ""
 "We do not recommend installing additional add-ons or plugins into Tor "
 "Browser"
 msgstr ""
+"เราไม่แนะนำให้ติดตั้งส่วนเสริม,
 แอด-ออน หรือโปรแกรมส่วนขยาย 
เพิ่มเติมใน Tor "
+"Browser"
 
 #: templates/download.html:28
 msgid ""
@@ -690,15 +698,15 @@ msgstr ""
 #: templates/download.html:40
 #, python-format
 msgid "Check out the %s for more troubleshooting tips."
-msgstr ""
+msgstr "ดู %s 
สำหรับเคล็ดลับการแก้ปัญหาเพิ่มเติม"
 
 #: templates/download.html:49
 msgid "Verify Tor Browser signature"
-msgstr ""
+msgstr "ตรวจสอบลายเซ็น Tor Browser"
 
 #: templates/download.html:54
 msgid "Stand up for privacy and freedom online."
-msgstr ""
+msgstr 
"ยืนหยัดเพื่อความเป็นส่วนตัวและอิสระทางออนไลน์"
 
 #: templates/download.html:55
 msgid ""
@@ -775,7 +783,7 @@ msgstr 
"ตัวเลือกการติดตั้งขั้นสู
 
 #: 

[tor-commits] [tor-browser/tor-browser-60.7.0esr-8.5-1] Bug 1549833, r=valentin

2019-07-02 Thread gk
commit e0c4aa5835df2a0ea4c2555872fc467649e2cc49
Author: Gijs Kruitbosch 
Date:   Tue May 7 23:23:30 2019 +0100

Bug 1549833, r=valentin

Differential Revision: https://phabricator.services.mozilla.com//D30285

--HG--
extra : rebase_source : dcd2ecd154c5423143f449f52411eda32c61a972
---
 modules/libpref/init/all.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 9dc30b8efe44..4257bc55742c 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1629,6 +1629,7 @@ pref("network.protocol-handler.external.vbscript", false);
 pref("network.protocol-handler.external.javascript", false);
 pref("network.protocol-handler.external.data", false);
 pref("network.protocol-handler.external.ms-help", false);
+pref("network.protocol-handler.external.res", false);
 pref("network.protocol-handler.external.shell", false);
 pref("network.protocol-handler.external.vnd.ms.radio", false);
 #ifdef XP_MACOSX



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


[tor-commits] [translation/tpo-web] Update translations for tpo-web

2019-07-02 Thread translation
commit 580a9d8083895f585ac33d2f8c0a47c5128b3029
Author: Translation commit bot 
Date:   Tue Jul 2 08:50:35 2019 +

Update translations for tpo-web
---
 contents+th.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+th.po b/contents+th.po
index 58ba6a1e5..dcc36f960 100644
--- a/contents+th.po
+++ b/contents+th.po
@@ -80,7 +80,7 @@ msgstr ""
 "ต้องการความช่วยเหลือ? 
ติดต่อเรา [พอร์ทัล "
 "ช่วยเหลือ](https://support.torproject.org) 
สำหรับ "
 
"คำตอบสำหรับคำถามที่พบบ่อยเกี่ยวกับการเชื่อมต่อกับ
 Tor , "
-"การหลีกเลี่ยงการเซ็นเซอร์การใช้บริการ
 onion และอื่น ๆ"
+"การหลบเลี่ยงการถูกปิดกั้นในการใช้บริการ
 onion และอื่น ๆ"
 
 #: https//www.torproject.org/download/
 #: (content/download/contents+en.lrpage.title)

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


[tor-commits] [tor-browser/tor-browser-60.7.0esr-9.0-1] Bug 1549833, r=valentin

2019-07-02 Thread gk
commit 35560e850f9dbf29e18895b3e55ad9b4e684cd24
Author: Gijs Kruitbosch 
Date:   Tue May 7 23:23:30 2019 +0100

Bug 1549833, r=valentin

Differential Revision: https://phabricator.services.mozilla.com//D30285

--HG--
extra : rebase_source : dcd2ecd154c5423143f449f52411eda32c61a972
---
 modules/libpref/init/all.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 5b1d0a1c8972..dfcd043cac75 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1632,6 +1632,7 @@ pref("network.protocol-handler.external.vbscript", false);
 pref("network.protocol-handler.external.javascript", false);
 pref("network.protocol-handler.external.data", false);
 pref("network.protocol-handler.external.ms-help", false);
+pref("network.protocol-handler.external.res", false);
 pref("network.protocol-handler.external.shell", false);
 pref("network.protocol-handler.external.vnd.ms.radio", false);
 #ifdef XP_MACOSX



___
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-60.7.0esr-8.5-1] Bug 1552627 - pt 2, r=dveditz

2019-07-02 Thread gk
commit cb68eb598242fd211bf032e704069ea453f57c05
Author: Gijs Kruitbosch 
Date:   Mon May 20 06:19:51 2019 +

Bug 1552627 - pt 2, r=dveditz

Depends on D31722

Differential Revision: https://phabricator.services.mozilla.com/D31723

--HG--
extra : moz-landing-system : lando
---
 modules/libpref/init/all.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 4257bc55742c..7cded5261c17 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1628,6 +1628,9 @@ pref("network.protocol-handler.external.hcp", false);
 pref("network.protocol-handler.external.vbscript", false);
 pref("network.protocol-handler.external.javascript", false);
 pref("network.protocol-handler.external.data", false);
+pref("network.protocol-handler.external.ie.http", false);
+pref("network.protocol-handler.external.iehistory", false);
+pref("network.protocol-handler.external.ierss", false);
 pref("network.protocol-handler.external.ms-help", false);
 pref("network.protocol-handler.external.res", false);
 pref("network.protocol-handler.external.shell", false);

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


[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket31008_035_01'

2019-07-02 Thread asn
commit 15e28af2d18b26b9ec4eda4bc2e84ed8465a166f
Merge: c0ea6f9c6 f446db59e
Author: George Kadianakis 
Date:   Tue Jul 2 13:19:40 2019 +0300

Merge remote-tracking branch 'dgoulet/ticket31008_035_01'

 changes/ticket31008 | 3 +++
 doc/tor.1.txt   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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


[tor-commits] [tor/master] man: Fix -help typo to --help

2019-07-02 Thread asn
commit f446db59e1fc3f87f1312defbb12894ad006d978
Author: David Goulet 
Date:   Thu Jun 27 14:47:11 2019 -0400

man: Fix -help typo to --help

Signed-off-by: David Goulet 
---
 changes/ticket31008 | 3 +++
 doc/tor.1.txt   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/ticket31008 b/changes/ticket31008
new file mode 100644
index 0..c7077de6c
--- /dev/null
+++ b/changes/ticket31008
@@ -0,0 +1,3 @@
+  o Documentation (tor.1 man page):
+- Fix typo -help to --help in tor.1 man page. Fixes bug 31008; bugfix on
+  0.2.2.9-alpha.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 975a19818..3909a829b 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -37,7 +37,7 @@ Project's website.
 
 COMMAND-LINE OPTIONS
 
-[[opt-h]] **-h**, **-help**::
+[[opt-h]] **-h**, **--help**::
 Display a short help message and exit.
 
 [[opt-f]] **-f** __FILE__::



___
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-60.7.0esr-9.0-1] Bug 1552627 - pt 2, r=dveditz

2019-07-02 Thread gk
commit 0be8d76933ec1e36553f1bfaffb261169757fa77
Author: Gijs Kruitbosch 
Date:   Mon May 20 06:19:51 2019 +

Bug 1552627 - pt 2, r=dveditz

Depends on D31722

Differential Revision: https://phabricator.services.mozilla.com/D31723

--HG--
extra : moz-landing-system : lando
---
 modules/libpref/init/all.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index dfcd043cac75..7793f3c201b6 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1631,6 +1631,9 @@ pref("network.protocol-handler.external.hcp", false);
 pref("network.protocol-handler.external.vbscript", false);
 pref("network.protocol-handler.external.javascript", false);
 pref("network.protocol-handler.external.data", false);
+pref("network.protocol-handler.external.ie.http", false);
+pref("network.protocol-handler.external.iehistory", false);
+pref("network.protocol-handler.external.ierss", false);
 pref("network.protocol-handler.external.ms-help", false);
 pref("network.protocol-handler.external.res", false);
 pref("network.protocol-handler.external.shell", false);

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


[tor-commits] [torbutton/master] Merge remote-tracking branch 'acat/30577+2'

2019-07-02 Thread gk
commit 1f05efdb50291d26e7e52d07f3bddabf86ee7796
Merge: a13b6c87 676f9b37
Author: Georg Koppen 
Date:   Tue Jul 2 10:51:12 2019 +

Merge remote-tracking branch 'acat/30577+2'

 src/chrome/content/aboutTor/aboutTor-content.js |  19 ++
 src/chrome/content/aboutTor/aboutTor.xhtml  |  13 
 src/chrome/content/torbutton.js |  17 +
 src/chrome/locale/en-US/aboutTor.dtd|   3 +
 src/chrome/skin/aboutTor.css|  83 
 src/chrome/skin/icon_monthly_donors.png | Bin 0 -> 3093 bytes
 src/defaults/preferences/preferences.js |   1 +
 7 files changed, 136 insertions(+)

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


[tor-commits] [torbutton/master] Bug 30577: Add Fundraising Banner

2019-07-02 Thread gk
commit 676f9b37aa8a74c4fb0e2d624d7e4b2a73082352
Author: Alex Catarineu 
Date:   Mon Jul 1 12:08:29 2019 +0200

Bug 30577: Add Fundraising Banner
---
 src/chrome/content/aboutTor/aboutTor-content.js |  19 ++
 src/chrome/content/aboutTor/aboutTor.xhtml  |  13 
 src/chrome/content/torbutton.js |  17 +
 src/chrome/locale/en-US/aboutTor.dtd|   3 +
 src/chrome/skin/aboutTor.css|  83 
 src/chrome/skin/icon_monthly_donors.png | Bin 0 -> 3093 bytes
 src/defaults/preferences/preferences.js |   1 +
 7 files changed, 136 insertions(+)

diff --git a/src/chrome/content/aboutTor/aboutTor-content.js 
b/src/chrome/content/aboutTor/aboutTor-content.js
index 2b65dbcf..d4399624 100644
--- a/src/chrome/content/aboutTor/aboutTor-content.js
+++ b/src/chrome/content/aboutTor/aboutTor-content.js
@@ -24,6 +24,7 @@ let { bindPrefAndInit, show_torbrowser_manual } = 
Cu.import("resource://torbutto
 var AboutTorListener = {
   kAboutTorLoadedMessage: "AboutTor:Loaded",
   kAboutTorChromeDataMessage: "AboutTor:ChromeData",
+  kAboutTorHideDonationBanner: "AboutTor:HideDonationBanner",
 
   get isAboutTor() {
 return content.document.documentURI.toLowerCase() == "about:tor";
@@ -58,6 +59,22 @@ var AboutTorListener = {
 }
   },
 
+  setupBannerClosing: function () {
+let that = this;
+let closer = content.document.getElementById("donation-banner-closer");
+closer.addEventListener("click", function () {
+  sendAsyncMessage(that.kAboutTorHideDonationBanner);
+});
+
+bindPrefAndInit("extensions.torbutton.donation_banner_countdown3",
+countdown => {
+  if (content.document && content.document.body) {
+content.document.body.setAttribute(
+  "show-donation-banner", countdown > 0);
+  }
+});
+  },
+
   onPageLoad: function() {
 // Arrange to update localized text and links.
 bindPrefAndInit("intl.locale.requested", aNewVal => {
@@ -66,6 +83,8 @@ var AboutTorListener = {
   }
 });
 
+this.setupBannerClosing();
+
 // Add message and event listeners.
 addMessageListener(this.kAboutTorChromeDataMessage, this);
 addEventListener("pagehide", this, false);
diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml 
b/src/chrome/content/aboutTor/aboutTor.xhtml
index 4736f653..106bd936 100644
--- a/src/chrome/content/aboutTor/aboutTor.xhtml
+++ b/src/chrome/content/aboutTor/aboutTor.xhtml
@@ -34,6 +34,19 @@ window.addEventListener("pageshow", function() {
 
 
 
+  
+
+
+  
+  
+https://donate.torproject.org/monthly-giving;>
+  
+
+  
+
+
+  
+
   
 
   
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 53fe4fc9..f0456a3e 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -22,6 +22,7 @@ const k_tb_last_browser_version_pref = 
"extensions.torbutton.lastBrowserVersion"
 const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded";
 const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck";
 const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed";
+const k_tb_donation_banner_countdown = 
"extensions.torbutton.donation_banner_countdown3";
 
 var m_tb_prefs = Services.prefs;
 
@@ -217,6 +218,14 @@ function torbutton_init_toolbutton()
 }
 }
 
+// Show the donation banner a finite number of times.
+function torbutton_donation_banner_countdown() {
+  let count = m_tb_prefs.getIntPref(k_tb_donation_banner_countdown, 0);
+  if (count > 0) {
+m_tb_prefs.setIntPref(k_tb_donation_banner_countdown, count - 1);
+  }
+}
+
 function torbutton_is_mobile() {
 return Services.appinfo.OS === "Android";
 }
@@ -329,6 +338,10 @@ function torbutton_init() {
 // Add about:tor IPC message listener.
 window.messageManager.addMessageListener("AboutTor:Loaded",
torbutton_abouttor_message_handler);
+window.messageManager.addMessageListener("AboutTor:HideDonationBanner",
+   torbutton_abouttor_message_handler);
+
+torbutton_donation_banner_countdown();
 
 setupPreferencesForMobile();
 
@@ -444,6 +457,10 @@ var torbutton_abouttor_message_handler = {
 aMessage.target.messageManager.sendAsyncMessage("AboutTor:ChromeData",
 this.getChromeData(true));
 break;
+  case "AboutTor:HideDonationBanner":
+torbutton_log(5, "message AboutTor:HideDonationBanner received");
+m_tb_prefs.setIntPref(k_tb_donation_banner_countdown, 0);
+break;
 }
   },
 
diff --git a/src/chrome/locale/en-US/aboutTor.dtd 
b/src/chrome/locale/en-US/aboutTor.dtd
index c4273ad2..5757fae4 100644
--- a/src/chrome/locale/en-US/aboutTor.dtd
+++ 

[tor-commits] [translation/tpo-web] Update translations for tpo-web

2019-07-02 Thread translation
commit 9ac1ea0010fd15dbbd9f4d8789bd2262cf31392e
Author: Translation commit bot 
Date:   Tue Jul 2 09:20:34 2019 +

Update translations for tpo-web
---
 contents+th.po | 34 +++---
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/contents+th.po b/contents+th.po
index dcc36f960..fb95179ed 100644
--- a/contents+th.po
+++ b/contents+th.po
@@ -205,6 +205,10 @@ msgid ""
 
"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
 " and are not putting yourself at risk."
 msgstr ""
+"กรุณาดาวน์โหลด alpha 
ถ้าคุณโอเคกับบางสิ่งที่มันทำงานไม่ถูกต้อง
 "
+"เพื่อช่วยเราค้นหาและ 
[รายงานบั๊ก] "
+"(https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
+" และ 
ต้องไม่พาตัวคุณเองไปอยู่ภ
ายใต้ความเสี่ยง"
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -219,6 +223,10 @@ msgid ""
 "add more. Want to help us translate? [See here](https://tb-;
 "manual.torproject.org/becoming-tor-translator/)"
 msgstr ""
+"เราต้องการให้ทุกคนสามารถเพลิดเพลินไปกับ
 Tor Browser ในภาษาของพวกเขาเอง "
+"ตอนนี้เบราว์เซอร์ของ Tor 
มีให้บริการใน 25 "
+"ภ
าษาและเรากำลังเพิ่มจำนวนให้มากขึ้น
 ต้องการช่วยเราแปลไหม 
[ดูที่นี่] (https"
+"://tb-manual.torproject.org/becoming-tor-translator/)"
 
 #: https//www.torproject.org/download/tor/
 #: (content/download/tor/contents+en.lrpage.title)
@@ -240,6 +248,10 @@ msgid ""
 "been involved in Tor are united by a common belief: internet users should "
 "have private access to an uncensored web.**"
 msgstr ""
+"** เช่นเดียวกัน ผู้ที่ใช้ Tor , 
นักพัฒนา , นักวิจัย 
และผู้ก่อตั้ง "
+"คือผู้ที่ทำให้ Tor เป็นไปได้ 
เป็นกลุ่มคนที่หลากหลาย 
แต่ทุกคนที่เกี่ยวข้องกับ"
+" Tor 
นั้นล้วนเป็นปึกแผ่นที่มาจากความเชื่อร่วมกันว่า:
 "
+"ผู้ใช้อินเทอร์เน็ตควรมีสิทธิ์ความเป็นส่วนตัวในเข้าถึงเว็บถูกปิดกั้น
 **"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -408,7 +420,7 @@ msgstr ""
 #: https//www.torproject.org/about/people/
 #: (content/about/people/contents+en.lrpeople.title)
 msgid "People"
-msgstr ""
+msgstr "ผู้คน"
 
 #: https//www.torproject.org/about/people/
 #: (content/about/people/contents+en.lrpeople.body)
@@ -481,11 +493,11 @@ msgstr ""
 
 #: templates/contact.html:8
 msgid "Chat with us on"
-msgstr ""
+msgstr "พูดคุยกับเรา"
 
 #: templates/contact.html:9
 msgid "Ask questions about using Tor."
-msgstr ""
+msgstr "สอบถามเกี่ยวกับการใช้ Tor"
 
 #: templates/contact.html:10
 msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
@@ -503,7 +515,7 @@ msgstr ""
 
 #: templates/contact.html:13
 msgid "Discuss running a Tor relay."
-msgstr ""
+msgstr "พูดคุยการดำเนินงาน Tor relay"
 
 #: templates/contact.html:14
 msgid "Talk with Tor's global south community."
@@ -511,15 +523,15 @@ msgstr ""
 
 #: templates/contact.html:20
 msgid "Find us on Social Media"
-msgstr ""
+msgstr "ค้นหาเราบนสื่อสังคม"
 
 #: templates/contact.html:34
 msgid "Volunteer with Tor"
-msgstr ""
+msgstr "อาสาสมัคร กับ Tor"
 
 #: templates/contact.html:38
 msgid "Get Involved"
-msgstr ""
+msgstr "มีส่วนเกี่ยวข้อง"
 
 #: templates/contact.html:44
 msgid "Join an email list"
@@ -743,19 +755,19 @@ msgstr ""
 #: templates/hero-download-languages.html:2
 #: templates/hero-download-options.html:2
 msgid "DEFEND YOURSELF"
-msgstr ""
+msgstr "ปกป้อง ตัวคุณ"
 
 #: templates/hero-download-tor.html:2
 msgid "GROW THE NETWORK"
-msgstr ""
+msgstr "เครือข่ายที่เติบโต"
 
 #: templates/hero-download.html:2
 msgid "Defend yourself."
-msgstr ""
+msgstr "ปกป้อง ตัวคุณ."
 
 #: templates/hero-download.html:45
 msgid "Download in another 

[tor-commits] [onionperf/master] Fixes log collect bug introduced by adding new logs in the data directory

2019-07-02 Thread irl
commit 74d9e01f8aa78f9c11c47e06cbcce60df3093389
Author: Ana Custura 
Date:   Thu Jun 27 02:07:59 2019 +0100

Fixes log collect bug introduced by adding new logs in the data directory
---
 onionperf/tests/test_reprocessing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/onionperf/tests/test_reprocessing.py 
b/onionperf/tests/test_reprocessing.py
index 6c58bcd..54b6ddf 100644
--- a/onionperf/tests/test_reprocessing.py
+++ b/onionperf/tests/test_reprocessing.py
@@ -25,7 +25,7 @@ def test_log_collection_tgen():
 
 def test_log_collection_torctl():
 log_list = reprocessing.collect_logs(DATA_DIR, '*torctl.log')
-well_known_list = [ DATA_DIR + 'logs/onionperf.torctl.log', DATA_DIR + 
'logs/onionperf_2019-01-10_23:59:59.torctl.log' ]
+well_known_list = [ DATA_DIR + 
'logs/onionperf_2019-01-10_23:59:59.torctl.log', DATA_DIR + 
'logs/onionperf.torctl.log' ]
 assert_equals(log_list, well_known_list )
 
 def test_log_match():

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


[tor-commits] [translation/tpo-web] Update translations for tpo-web

2019-07-02 Thread translation
commit 4adf21ce0db901d391a2541daa41650234710a43
Author: Translation commit bot 
Date:   Tue Jul 2 09:50:29 2019 +

Update translations for tpo-web
---
 contents+th.po | 70 +-
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/contents+th.po b/contents+th.po
index fb95179ed..a4908e746 100644
--- a/contents+th.po
+++ b/contents+th.po
@@ -248,10 +248,10 @@ msgid ""
 "been involved in Tor are united by a common belief: internet users should "
 "have private access to an uncensored web.**"
 msgstr ""
-"** เช่นเดียวกัน ผู้ที่ใช้ Tor , 
นักพัฒนา , นักวิจัย 
และผู้ก่อตั้ง "
-"คือผู้ที่ทำให้ Tor เป็นไปได้ 
เป็นกลุ่มคนที่หลากหลาย 
แต่ทุกคนที่เกี่ยวข้องกับ"
-" Tor 
นั้นล้วนเป็นปึกแผ่นที่มาจากความเชื่อร่วมกันว่า:
 "
-"ผู้ใช้อินเทอร์เน็ตควรมีสิทธิ์ความเป็นส่วนตัวในเข้าถึงเว็บถูกปิดกั้น
 **"
+"** เช่นเดียวกับผู้ที่ใช้ Tor , 
นักพัฒนา , นักวิจัย 
และผู้ก่อตั้ง "
+"ผู้ซึ่งทำให้ Tor 
เป็นไปได้นั้น คือ/เป็น 
กลุ่มคนที่หลากหลาย "
+"แต่ทุกคนที่เกี่ยวข้องกับ Tor 
รวมกลุ่มกันจากการมีความเชื่อร่วมกันว่า:
 "
+"ผู้ใช้อินเทอร์เน็ตควรมีสิทธิ์ความเป็นส่วนตัวในการเข้าถึงเว็บที่ถูกปิดกั้น
 **"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -282,7 +282,7 @@ msgstr ""
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
 msgid "This is still a simple explanation for how Tor works today."
-msgstr ""
+msgstr "นี่เป็นสิ่งที่อธิบายว่า 
Tor 
ทำงานอย่างไรในวันนี้อย่างง่ายๆ"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -535,7 +535,7 @@ msgstr "มีส่วนเกี่ยวข้อง"
 
 #: templates/contact.html:44
 msgid "Join an email list"
-msgstr ""
+msgstr "ลงทะเบียนรับข่าวสาร"
 
 #: templates/contact.html:47
 msgid ""
@@ -547,7 +547,7 @@ msgstr ""
 
 #: templates/contact.html:60
 msgid "Report a bug or give feedback."
-msgstr ""
+msgstr "รายงานบั๊ก หรือ 
ข้อเสนอแนะ"
 
 #: templates/contact.html:61
 msgid ""
@@ -558,7 +558,7 @@ msgstr ""
 
 #: templates/contact.html:67
 msgid "Tell us about a bad relay."
-msgstr ""
+msgstr "บอกเราเกี่ยวกับ bad relay"
 
 #: templates/contact.html:68
 msgid ""
@@ -568,7 +568,7 @@ msgstr ""
 
 #: templates/contact.html:76
 msgid "Report a security issue."
-msgstr ""
+msgstr "รายงานปัญหาความปลอดภัย"
 
 #: templates/contact.html:77
 msgid ""
@@ -581,7 +581,7 @@ msgstr ""
 
 #: templates/contact.html:97
 msgid "Email us"
-msgstr ""
+msgstr "อีเมล์ถึงเรา"
 
 #: templates/contact.html:98
 msgid ""
@@ -593,11 +593,11 @@ msgstr ""
 
 #: templates/contact.html:104
 msgid "Send us Mail"
-msgstr ""
+msgstr "ส่งเมล์ถึงเรา"
 
 #: templates/download-android.html:12
 msgid "Get Tor Browser for Android."
-msgstr ""
+msgstr "รับ Tor Browser สำหรับ Android."
 
 #: templates/download-android.html:15 templates/hero-download.html:5
 msgid "Protect yourself against tracking, surveillance, and censorship."
@@ -605,20 +605,20 @@ msgstr ""
 
 #: templates/download-android.html:20 templates/download-android.html:22
 msgid "Download .apk"
-msgstr ""
+msgstr "ดาวน์โหลด .apk"
 
 #: templates/download-android.html:24
 msgid "Go to Google Play"
-msgstr ""
+msgstr "ไปยัง Google Play"
 
 #: templates/download-android.html:26
 #, python-format
 msgid "Go to F-droid %s"
-msgstr ""
+msgstr "ไปยัง F-droid %s"
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
-msgstr ""
+msgstr "คุณเป็นผู้ใช้ iOS? 
เราสนับสนุนให้คุณลองใช้ Onion 
Browser."
 
 #: templates/download-languages.html:11 

[tor-commits] [onionperf/master] Removes unecessary raise and adds unit tests to validate behaviour

2019-07-02 Thread irl
commit 60fff2d9a1b212013cc854f00b8e1450eec7ea46
Author: Ana Custura 
Date:   Thu Jun 27 02:04:29 2019 +0100

Removes unecessary raise and adds unit tests to validate behaviour
---
 onionperf/analysis.py|  1 -
 onionperf/tests/data/parse_error |  1 +
 onionperf/tests/test_analysis.py | 15 +--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/onionperf/analysis.py b/onionperf/analysis.py
index 0bc1811..e90d005 100644
--- a/onionperf/analysis.py
+++ b/onionperf/analysis.py
@@ -532,7 +532,6 @@ class TGenParser(Parser):
 break
 except:
 logging.warning("TGenParser: skipping line due to parsing 
error: {0}".format(line))
-raise
 continue
 source.close()
 
diff --git a/onionperf/tests/data/parse_error b/onionperf/tests/data/parse_error
new file mode 100644
index 000..3c8cde7
--- /dev/null
+++ b/onionperf/tests/data/parse_error
@@ -0,0 +1 @@
+2018-04-14 21:10:04 1523740204.809894 [message] [shd-tgen-transfer.c:803] 
[_tgentransfer_log] [transfer-error] transport 
TCP,17,NULL:37.218.247.40:26006,NULL:0.0.0.0:0,146.0.73.4:146.0.73.4:1313,state=SUCCESS,error=NONE
 transfer (null),26847,op-nl,NONE,0,(null),0,state=ERROR,error=AUTH 
total-bytes-read=1 total-bytes-write=0 payload-bytes-write=0/0 (-nan%) 
usecs-to-socket-create=0 usecs-to-socket-connect=8053676879205 
usecs-to-proxy-init=-1 usecs-to-proxy-choice=-1 usecs-to-proxy-request=-1 
usecs-to-proxy-response=-1 usecs-to-command=-1 usecs-to-response=-1 
usecs-to-first-byte=-1 usecs-to-last-byte=-1 usecs-to-checksum=-1
diff --git a/onionperf/tests/test_analysis.py b/onionperf/tests/test_analysis.py
index 150e8f0..6463458 100644
--- a/onionperf/tests/test_analysis.py
+++ b/onionperf/tests/test_analysis.py
@@ -1,7 +1,7 @@
 import os
 import pkg_resources
 from nose.tools import *
-from onionperf import analysis
+from onionperf import analysis, util
 
 
 def absolute_data_path(relative_path=""):
@@ -11,10 +11,10 @@ def absolute_data_path(relative_path=""):
 return pkg_resources.resource_filename("onionperf",
"tests/data/" + relative_path)
 
-
 DATA_DIR = absolute_data_path()
 LINE_ERROR = '2019-04-22 14:41:20 1555940480.647663 [message] 
[shd-tgen-transfer.c:1504] [_tgentransfer_log] [transfer-error] transport 
TCP,12,localhost:127.0.0.1:46878,localhost:127.0.0.1:43735,dc34og3c3aqdqntblnxkstzfvh7iy7llojd4fi5j23y2po32ock2k7ad.onion:0.0.0.0:8080,state=ERROR,error=READ
 transfer transfer5m,4,cyan,GET,5242880,(null),0,state=ERROR,error=PROXY 
total-bytes-read=0 total-bytes-write=0 payload-bytes-read=0/5242880 (0.00%) 
usecs-to-socket-create=11 usecs-to-socket-connect=210 usecs-to-proxy-init=283 
usecs-to-proxy-choice=348 usecs-to-proxy-request=412 usecs-to-proxy-response=-1 
usecs-to-command=-1 usecs-to-response=-1 usecs-to-first-byte=-1 
usecs-to-last-byte=-1 usecs-to-checksum=-1'
 
+NO_PARSE_LINE = '2018-04-14 21:10:04 1523740204.809894 [message] 
[shd-tgen-transfer.c:803] [_tgentransfer_log] [transfer-error] transport 
TCP,17,NULL:37.218.247.40:26006,NULL:0.0.0.0:0,146.0.73.4:146.0.73.4:1313,state=SUCCESS,error=NONE
 transfer (null),26847,op-nl,NONE,0,(null),0,state=ERROR,error=AUTH 
total-bytes-read=1 total-bytes-write=0 payload-bytes-write=0/0 (-nan%) 
usecs-to-socket-create=0 usecs-to-socket-connect=8053676879205 
usecs-to-proxy-init=-1 usecs-to-proxy-choice=-1 usecs-to-proxy-request=-1 
usecs-to-proxy-response=-1 usecs-to-command=-1 usecs-to-response=-1 
usecs-to-first-byte=-1 usecs-to-last-byte=-1 usecs-to-checksum=-1'
 
 def test_transfer_status_event():
 transfer = analysis.TransferStatusEvent(LINE_ERROR)
@@ -186,3 +186,14 @@ def test_transfer_object_end_to_end():
 'filesize_bytes':
 5242880
 })
+
+
+@raises(ZeroDivisionError)
+def test_transfer_status_parse_error():
+transfer = analysis.TransferStatusEvent(NO_PARSE_LINE)
+t = analysis.Transfer(transfer.transfer_id)
+t.add_event(transfer)
+
+def test_parsing_parse_error():
+parser = analysis.TGenParser()
+parser.parse(util.DataSource(DATA_DIR + 'parse_error'))



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


[tor-commits] [onionperf/master] Allows source to be given as a parameter on the commandline

2019-07-02 Thread irl
commit 096c2bb23d79033be79503754e180145879d3449
Author: Ana C. Custura 
Date:   Wed Jun 5 15:07:10 2019 +0100

Allows source to be given as a parameter on the commandline
---
 onionperf/onionperf   |  9 -
 onionperf/reprocessing.py | 42 --
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/onionperf/onionperf b/onionperf/onionperf
index fab805b..45ead3c 100755
--- a/onionperf/onionperf
+++ b/onionperf/onionperf
@@ -385,6 +385,13 @@ files generated by this script will be written""",
 action="store", dest="date_filter",
 default=None)
 
+reprocess_parser.add_argument('-n', '--nickname',
+help="""a nickname STRING that identifies the machine where the input 
logfiles were produced""",
+metavar="STRING", type=str,
+action="store", dest="nickname",
+default=None)
+
+
 # get args and call the command handler for the chosen mode
 args = main_parser.parse_args()
 args.func(args)
@@ -495,7 +502,7 @@ def reprocess(args):
 torctl_logs = reprocessing.collect_logs(args.torctl_dirpath, 
'*torctl.log')
 log_pairs = reprocessing.match(tgen_logs, torctl_logs, 
args.date_filter)
 logging.info("Found {0} matching log pairs to be 
reprocessed".format(len(log_pairs)))
-reprocessing.multiprocess_logs(log_pairs, args.prefix)
+reprocessing.multiprocess_logs(log_pairs, args.prefix, args.nickname)
 
 def type_nonnegative_integer(value):
 i = int(value)
diff --git a/onionperf/reprocessing.py b/onionperf/reprocessing.py
index 25111ba..66b82c7 100644
--- a/onionperf/reprocessing.py
+++ b/onionperf/reprocessing.py
@@ -7,6 +7,8 @@ import fnmatch
 import logging
 import os
 import re
+import sys
+
 
 def collect_logs(dirpath, pattern):
 logs = []
@@ -14,7 +16,7 @@ def collect_logs(dirpath, pattern):
 for filename in fnmatch.filter(filenames, pattern):
 logs.append(os.path.join(root, filename))
 return logs
-
+
 
 def match(tgen_logs, tor_logs, date_filter):
 log_pairs = []
@@ -24,41 +26,47 @@ def match(tgen_logs, tor_logs, date_filter):
 date = m.group(0)
 fdate = datetime.datetime.strptime(date, "%Y-%m-%d")
 found = False
-if date_filter is None or util.do_dates_match(date_filter,fdate):
+if date_filter is None or util.do_dates_match(date_filter, fdate):
 for tor_log in tor_logs:
 if date in tor_log:
 log_pairs.append((tgen_log, tor_log, fdate))
 found = True
-break   
+break
 if not found:
-logging.warning('Skipping file {0}, could not find a match 
for it'.format(tgen_log))
-   
+logging.warning(
+'Skipping file {0}, could not find a match for it'.
+format(tgen_log))
+
 else:
-logging.warning('Filename {0} does not contain a 
date'.format(tgen_log))
+logging.warning(
+'Filename {0} does not contain a date'.format(tgen_log))
 if not log_pairs:
-   logging.warning('Could not find any log matches. No analyses will be 
performed')
+logging.warning(
+'Could not find any log matches. No analyses will be performed')
 return log_pairs
- 
 
-def analyze_func(prefix, pair):
-analysis = Analysis()
+
+def analyze_func(prefix, nick, pair):
+analysis = Analysis(nickname=nick)
 logging.info('Analysing pair for date {0}'.format(pair[2]))
 analysis.add_tgen_file(pair[0])
 analysis.add_torctl_file(pair[1])
 analysis.analyze(do_simple=False, date_filter=pair[2])
 analysis.save(output_prefix=prefix)
-analysis.export_torperf_version_1_1(output_prefix=prefix, 
do_compress=False)
+analysis.export_torperf_version_1_1(
+output_prefix=prefix, do_compress=False)
 return 1
- 
- 
-def multiprocess_logs(log_pairs, prefix):
+
+
+def multiprocess_logs(log_pairs, prefix, nick):
 pool = Pool(cpu_count())
 analyses = None
 try:
-func = partial(analyze_func, prefix)
+func = partial(analyze_func, prefix, nick)
 mr = pool.map_async(func, log_pairs)
 pool.close()
-while not mr.ready(): mr.wait(1)
+while not mr.ready():
+mr.wait(1)
 except KeyboardInterrupt:
 logging.info("interrupted, terminating process pool")
 pool.terminate()
@@ -66,5 +74,3 @@ def multiprocess_logs(log_pairs, prefix):
 sys.exit()
 except Exception as e:
 logging.error(e)
-
-   

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


[tor-commits] [translation/tpo-web] Update translations for tpo-web

2019-07-02 Thread translation
commit 657bee40652835409077c00a5d82f076d7010804
Author: Translation commit bot 
Date:   Tue Jul 2 07:20:32 2019 +

Update translations for tpo-web
---
 contents+th.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+th.po b/contents+th.po
index 59a99654e..58ba6a1e5 100644
--- a/contents+th.po
+++ b/contents+th.po
@@ -39,7 +39,7 @@ msgstr "เกี่ยวกับเรา"
 #: https//www.torproject.org/ (content/contents+en.lrpage.body)
 msgid ""
 "We believe everyone should be able to explore the internet with privacy."
-msgstr 
"เราเชื่อมั่นว่าทุกคนควรท่องอินเตอร์เน็ตได้อย่างเป็นส่วนตัว"
+msgstr 
"เราเชื่อมั่นว่าทุกคนควรท่องอินเทอร์เน็ตได้อย่างเป็นส่วนตัว"
 
 #: https//www.torproject.org/ (content/contents+en.lrpage.body)
 msgid "We are the Tor Project, a 501(c)3 US nonprofit."

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


[tor-commits] [tor-browser-build/maint-8.5] Remove four default bridges.

2019-07-02 Thread gk
commit 0b95a1414db6e4a8be0ddd47fdeec5b9fd16c6de
Author: Philipp Winter 
Date:   Mon Jul 1 14:11:37 2019 -0700

Remove four default bridges.

The operator wants to reduce the maintenance burden and eliminate the
risk of seeing both entry and exit traffic.

This fixes .
---
 .../Bundle-Data/PTConfigs/bridge_prefs.js  | 27 +-
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js 
b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
index 61fdba1..4eb4644 100644
--- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -2,22 +2,17 @@
 pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4");
 
 // Default bridges.
-pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 
109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED");
-pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 
109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A");
-
-pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 
109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E 
cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA 
iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 
109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D 
cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA 
iat-mode=2");
-pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.95.36.142:443 
CDF2E852BF539B82BD10E27E9115A31734E378C2 
cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ 
iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 85.17.30.79:443 
FC259A04A328A07FED1413E9FC6526530D9FD87A 
cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 38.229.1.78:80 
C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 
cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg 
iat-mode=1");
-/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.6"/**/, 
/**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 
cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ 
iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 
[2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 
CDF2E852BF539B82BD10E27E9115A31734E378C2 
cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ 
iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 
37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 
cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg 
iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 
37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D 
cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 85.31.186.98:443 
011F2599C0E9B27EE74B353155E244813763C3E5 
cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 85.31.186.26:443 
91A6354697E6B02A386312F68D82CF86824D3606 
cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 
216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 
cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 
144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB 
cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw 
iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 192.95.36.142:443 
CDF2E852BF539B82BD10E27E9115A31734E378C2 
cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ 
iat-mode=1");
+pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 85.17.30.79:443 
FC259A04A328A07FED1413E9FC6526530D9FD87A 
cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA 
iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 38.229.1.78:80 
C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 
cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg 
iat-mode=1");
+/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.4"/**/, 
/**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 
cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ 
iat-mode=1");
+pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 
[2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 
CDF2E852BF539B82BD10E27E9115A31734E378C2 

[tor-commits] [translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed

2019-07-02 Thread translation
commit 9df90b4a529844ec23f00528ce6b9159158fdb0a
Author: Translation commit bot 
Date:   Tue Jul 2 16:15:49 2019 +

Update translations for donatepages-messagespot_completed
---
 locale/de/LC_MESSAGES/messages.po | 113 +++---
 1 file changed, 69 insertions(+), 44 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po 
b/locale/de/LC_MESSAGES/messages.po
index ac694d475..c4818aa09 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -246,6 +246,72 @@ msgstr ""
 "Wenn du Fragen hast oder eine Kryptowährung spenden möchtest, die hier 
nicht"
 " aufgeführt ist, schicke uns bitte eine E-Mail an giv...@torproject.org."
 
+#: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:110
+msgid "Copied"
+msgstr "Kopiert"
+
+#: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:114
+msgid "Currency Amount must be a number."
+msgstr "Der Währungsbetrag muss eine Zahl sein."
+
+#: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:118
+#: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:51
+msgid "Choose a Currency"
+msgstr "Wähle eine Währung"
+
+#: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:122
+#: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:73
+msgid "Currency Amount"
+msgstr "Höhe des Betrags"
+
+#: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:124
+msgid "Estimated Donation Date"
+msgstr "Geschätztes Spende Datum"
+
+#: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:128
+msgid "I'd like to make my donation anonymous."
+msgstr "Ich möchte meine Spende gerne anonym machen."
+
+#: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:132
+#: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:46
+msgid "Email"
+msgstr "E-Mail"
+
+#: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:136
+#: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:320
+#: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:29
+msgid "First Name"
+msgstr "Vorname"
+
+#: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:140
+#: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:324
+#: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:33
+msgid "Last Name"
+msgstr "Nachname"
+
+#: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:144
+#: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:80
+msgid "Report Donation"
+msgstr "Spendenbericht"
+
+#: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:148
+#: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:370
+msgid "Start sending me email updates about the Tor Project!"
+msgstr ""
+"Ich möchte Updates und aktuelle Infos über das Tor Projekt per E-Mail "
+"bekommen."
+
+#: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:152
+#: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:87
+msgid "Wallet Addresses"
+msgstr "Wallet-Adressen"
+
+#: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:156
+#: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:311
+#: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:24
+msgid "Your Info"
+msgstr "Deine Informationen"
+
 #: 
tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:29
 msgid ""
 "The European shirt fits run a little small so you might want to consider "
@@ -555,25 +621,10 @@ msgstr "Kreditkarte"
 msgid "Want to donate Bitcoin, Stock, or via snail mail?"
 msgstr "Wollen Sie Bitcoin oder Stock spenden oder mithilfe von snail mail?"
 
-#: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:311
-#: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:24
-msgid "Your Info"
-msgstr "Deine Informationen"
-
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:315
 msgid "* required fields"
 msgstr "* obligatorische Felder"
 
-#: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:320
-#: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:29
-msgid "First Name"

[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2019-07-02 Thread translation
commit bc7128b5bcff0ded176999863c74080ed14faaf8
Author: Translation commit bot 
Date:   Tue Jul 2 16:15:14 2019 +

Update translations for abouttor-homepage_completed
---
 de/aboutTor.dtd | 3 +++
 fr/aboutTor.dtd | 3 +++
 he/aboutTor.dtd | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd
index 1263d9284..33e9be156 100644
--- a/de/aboutTor.dtd
+++ b/de/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd
index fc6929b51..eef30f5ba 100644
--- a/fr/aboutTor.dtd
+++ b/fr/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+
diff --git a/he/aboutTor.dtd b/he/aboutTor.dtd
index 5f1efea6c..dfa2fbaec 100644
--- a/he/aboutTor.dtd
+++ b/he/aboutTor.dtd
@@ -30,3 +30,6 @@
 
 
 
+
+
+

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


[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2019-07-02 Thread translation
commit 49ea4f6fcde64e53f8e35f216496824786b1b9a4
Author: Translation commit bot 
Date:   Tue Jul 2 16:15:06 2019 +

Update translations for abouttor-homepage
---
 de/aboutTor.dtd | 4 ++--
 fr/aboutTor.dtd | 4 ++--
 he/aboutTor.dtd | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd
index ef055f13c..33e9be156 100644
--- a/de/aboutTor.dtd
+++ b/de/aboutTor.dtd
@@ -31,5 +31,5 @@
 
 
 
-
-
+
+
diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd
index c44b3ddd0..eef30f5ba 100644
--- a/fr/aboutTor.dtd
+++ b/fr/aboutTor.dtd
@@ -31,5 +31,5 @@
 
 
 
-
-
+
+
diff --git a/he/aboutTor.dtd b/he/aboutTor.dtd
index b42fdfc4f..dfa2fbaec 100644
--- a/he/aboutTor.dtd
+++ b/he/aboutTor.dtd
@@ -31,5 +31,5 @@
 
 
 
-
-
+
+

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


[tor-commits] [tor/master] Merge branch 'bug30958_035' into bug30958_040

2019-07-02 Thread nickm
commit e350dfc085b6632d0134b11751496ace72c27184
Merge: afa2c39ba b7dda83cf
Author: teor 
Date:   Mon Jun 24 21:31:10 2019 +1000

Merge branch 'bug30958_035' into bug30958_040

 changes/bug30958   |  5 +
 src/feature/relay/router.c | 12 +++-
 2 files changed, 12 insertions(+), 5 deletions(-)




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


[tor-commits] [tor/master] stats: Stop removing the ed25519 signature if the extra info file is too big

2019-07-02 Thread nickm
commit 5beb32d3d9a9640e515e6369d3a908e93b8895ef
Author: teor 
Date:   Mon Jun 24 21:19:49 2019 +1000

stats: Stop removing the ed25519 signature if the extra info file is too big

If the signature data was removed, but the keyword was kept, this could
result in an unparseable extra info file.

Fixes bug 30958; bugfix on 0.2.7.2-alpha.
---
 changes/bug30958 |  5 +
 src/or/router.c  | 12 +++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/changes/bug30958 b/changes/bug30958
new file mode 100644
index 0..374c8e46f
--- /dev/null
+++ b/changes/bug30958
@@ -0,0 +1,5 @@
+  o Minor bugfixes (statistics):
+- Stop removing the ed25519 signature if the extra info file is too big.
+  If the signature data was removed, but the keyword was kept, this could
+  result in an unparseable extra info file. Fixes bug 30958;
+  bugfix on 0.2.7.2-alpha.
diff --git a/src/or/router.c b/src/or/router.c
index c41647422..3fce45115 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -3252,11 +3252,13 @@ extrainfo_dump_to_string(char **s_out, extrainfo_t 
*extrainfo,
   while (strlen(s) > MAX_EXTRAINFO_UPLOAD_SIZE - DIROBJ_MAX_SIG_LEN) {
 /* So long as there are at least two chunks (one for the initial
  * extra-info line and one for the router-signature), we can keep removing
- * things. */
-if (smartlist_len(chunks) > 2) {
-  /* We remove the next-to-last element (remember, len-1 is the last
- element), since we need to keep the router-signature element. */
-  int idx = smartlist_len(chunks) - 2;
+ * things. If emit_ed_sigs is true, we also keep 2 additional chunks at the
+ * end for the ed25519 signature. */
+const int required_chunks = emit_ed_sigs ? 4 : 2;
+if (smartlist_len(chunks) > required_chunks) {
+  /* We remove the next-to-last or 4th-last element (remember, len-1 is the
+   * last element), since we need to keep the router-signature elements. */
+  int idx = smartlist_len(chunks) - required_chunks;
   char *e = smartlist_get(chunks, idx);
   smartlist_del_keeporder(chunks, idx);
   log_warn(LD_GENERAL, "We just generated an extra-info descriptor "



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


[tor-commits] [tor/master] hs-v3: Close intro circuits when cleaning client cache

2019-07-02 Thread nickm
commit 87511766873fd22ebeff1bc9dcfa78773a890083
Author: David Goulet 
Date:   Wed Jun 19 09:22:07 2019 -0400

hs-v3: Close intro circuits when cleaning client cache

Fixes #30921

Signed-off-by: David Goulet 
---
 changes/ticket30921   |  5 +++
 src/feature/hs/hs_cache.c |  5 +++
 src/test/test_hs_client.c | 89 +++
 3 files changed, 99 insertions(+)

diff --git a/changes/ticket30921 b/changes/ticket30921
new file mode 100644
index 0..50ec570ff
--- /dev/null
+++ b/changes/ticket30921
@@ -0,0 +1,5 @@
+  o Minor bugfixes (onion service v3):
+- When purging the client descriptor cache, always also close any
+  introduction point circuits associated with it. This avoids picking those
+  when connecting to them later while not having the descriptor to complete
+  the introduction. Fixes bug 30921; bugfix on 0.3.2.1-alpha.
diff --git a/src/feature/hs/hs_cache.c b/src/feature/hs/hs_cache.c
index 05f9940ae..9817113b2 100644
--- a/src/feature/hs/hs_cache.c
+++ b/src/feature/hs/hs_cache.c
@@ -710,6 +710,11 @@ cache_clean_v3_as_client(time_t now)
 MAP_DEL_CURRENT(key);
 entry_size = cache_get_client_entry_size(entry);
 bytes_removed += entry_size;
+/* We just removed an old descriptor. We need to close all intro circuits
+ * so we don't have leftovers that can be selected while lacking a
+ * descriptor. We leave the rendezvous circuits opened because they could
+ * be in use. */
+hs_client_close_intro_circuits_from_desc(entry->desc);
 /* Entry is not in the cache anymore, destroy it. */
 cache_client_desc_free(entry);
 /* Update our OOM. We didn't use the remove() function because we are in
diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c
index 0d25a98bb..fb497d52a 100644
--- a/src/test/test_hs_client.c
+++ b/src/test/test_hs_client.c
@@ -37,6 +37,7 @@
 #include "feature/hs/hs_config.h"
 #include "feature/hs/hs_ident.h"
 #include "feature/hs/hs_cache.h"
+#include "feature/rend/rendcache.h"
 #include "core/or/circuitlist.h"
 #include "core/or/circuitbuild.h"
 #include "core/mainloop/connection.h"
@@ -1007,6 +1008,92 @@ test_close_intro_circuits_new_desc(void *arg)
   UNMOCK(networkstatus_get_live_consensus);
 }
 
+static void
+test_close_intro_circuits_cache_clean(void *arg)
+{
+  int ret;
+  ed25519_keypair_t service_kp;
+  circuit_t *circ = NULL;
+  origin_circuit_t *ocirc = NULL;
+  hs_descriptor_t *desc1 = NULL;
+
+  (void) arg;
+
+  hs_init();
+  rend_cache_init();
+
+  /* This is needed because of the client cache expiration timestamp is based
+   * on having a consensus. See cached_client_descriptor_has_expired(). */
+  MOCK(networkstatus_get_live_consensus,
+   mock_networkstatus_get_live_consensus);
+
+  /* Set consensus time */
+  parse_rfc1123_time("Sat, 26 Oct 1985 13:00:00 UTC",
+ _ns.valid_after);
+  parse_rfc1123_time("Sat, 26 Oct 1985 14:00:00 UTC",
+ _ns.fresh_until);
+  parse_rfc1123_time("Sat, 26 Oct 1985 16:00:00 UTC",
+ _ns.valid_until);
+
+  /* Generate service keypair */
+  tt_int_op(0, OP_EQ, ed25519_keypair_generate(_kp, 0));
+
+  /* Create and add to the global list a dummy client introduction circuits.
+   * We'll then make sure the hs_ident is attached to a dummy descriptor. */
+  circ = dummy_origin_circuit_new(0);
+  tt_assert(circ);
+  circ->purpose = CIRCUIT_PURPOSE_C_INTRODUCING;
+  ocirc = TO_ORIGIN_CIRCUIT(circ);
+
+  /* Build the first descriptor and cache it. */
+  {
+char *encoded;
+desc1 = hs_helper_build_hs_desc_with_ip(_kp);
+tt_assert(desc1);
+ret = hs_desc_encode_descriptor(desc1, _kp, NULL, );
+tt_int_op(ret, OP_EQ, 0);
+tt_assert(encoded);
+
+/* Store it */
+ret = hs_cache_store_as_client(encoded, _kp.pubkey);
+tt_int_op(ret, OP_EQ, 0);
+tor_free(encoded);
+tt_assert(hs_cache_lookup_as_client(_kp.pubkey));
+  }
+
+  /* We'll pick one introduction point and associate it with the circuit. */
+  {
+const hs_desc_intro_point_t *ip =
+  smartlist_get(desc1->encrypted_data.intro_points, 0);
+tt_assert(ip);
+ocirc->hs_ident = hs_ident_circuit_new(_kp.pubkey,
+   HS_IDENT_CIRCUIT_INTRO);
+ed25519_pubkey_copy(>hs_ident->intro_auth_pk,
+>auth_key_cert->signed_key);
+  }
+
+  /* Before we are about to clean up the intro circuits, make sure it is
+   * actually there. */
+  tt_assert(circuit_get_next_intro_circ(NULL, true));
+
+  /* Cleanup the client cache. The ns valid after time is what decides if the
+   * descriptor has expired so put it in the future enough (72h) so we are
+   * sure to always expire. */
+  mock_ns.valid_after = approx_time() + (72 * 24 * 60 * 60);
+  hs_cache_clean_as_client(0);
+
+  /* Once stored, our intro circuit should be closed because it is related to
+   * an old introduction point that doesn't exists anymore. */
+ 

[tor-commits] [tor/master] Merge branch 'bug30958_040' into bug30958_041

2019-07-02 Thread nickm
commit d9f49e9bc1b19e2d3246e696374cde964a8e4673
Merge: 4ecd09cfb e350dfc08
Author: teor 
Date:   Mon Jun 24 21:31:27 2019 +1000

Merge branch 'bug30958_040' into bug30958_041

 changes/bug30958   |  5 +
 src/feature/relay/router.c | 12 +++-
 2 files changed, 12 insertions(+), 5 deletions(-)




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


[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1136'

2019-07-02 Thread nickm
commit fdbd139495639576c233df47ae2db3becd7f43fd
Merge: cf92c096a c131b0763
Author: Nick Mathewson 
Date:   Tue Jul 2 13:33:50 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1136'

 changes/bug30958 |  5 +
 scripts/maint/practracker/exceptions.txt |  2 +-
 src/feature/relay/router.c   | 22 +-
 3 files changed, 23 insertions(+), 6 deletions(-)

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


[tor-commits] [tor/master] Merge branch 'bug30958_041' into bug30958_master

2019-07-02 Thread nickm
commit 2663bca39246cdf54fe43593b2e632a7bbe9af97
Merge: aec359ef6 d9f49e9bc
Author: teor 
Date:   Tue Jun 25 12:29:28 2019 +1000

Merge branch 'bug30958_041' into bug30958_master

 changes/bug30958   |  5 +
 src/feature/relay/router.c | 12 +++-
 2 files changed, 12 insertions(+), 5 deletions(-)




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


[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2019-07-02 Thread translation
commit 8379452e94e1ae8b410684f09820972c8f650a5a
Author: Translation commit bot 
Date:   Tue Jul 2 14:16:53 2019 +

Update translations for tails-misc_completed
---
 ru.po | 28 +---
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/ru.po b/ru.po
index 71d70931c..0e390a9a3 100644
--- a/ru.po
+++ b/ru.po
@@ -23,22 +23,23 @@
 # Oul Gocke , 2013-2014
 # Sergey Briskin, 2015
 # Sergey Lapshov , 2018
+# solokot , 2019
 # tetyana muirhead, 2015
-# Timofey Lisunov , 2017
+# solokot , 2017
 # Valid Olov, 2013
 # Viktor Kutcevich , 2019
 # Wagan , 2015
 # Uho Lot , 2016
-# Виктор Ерухин , 2018
+# Виктор Ерухин , 2018
 # Руслан , 2014
 # Тимур Нагорских , 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-05-22 13:14+\n"
-"Last-Translator: Dmitry Schneider \n"
+"POT-Creation-Date: 2019-06-30 18:53+0200\n"
+"PO-Revision-Date: 2019-07-02 14:14+\n"
+"Last-Translator: solokot \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"
@@ -451,11 +452,11 @@ msgstr "Экранный блокировщик"
 msgid "Set up a password to unlock the screen."
 msgstr "Настройте пароль для разблокировки 
экрана."
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:136
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
 msgid "Password"
 msgstr "Пароль"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:142
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
 msgid "Confirm"
 msgstr "Подтвердить"
 
@@ -661,6 +662,19 @@ msgid ""
 "{error_message}"
 msgstr "Не удалось разблокировать том 
{volume_name}:\n{error_message}"
 
+#. Translators: Don't translate {volume_name} or {error_message},
+#. they are placeholder and will be replaced.
+#: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#, python-brace-format
+msgid ""
+"Couldn't lock volume {volume_name}:\n"
+"{error_message}"
+msgstr "Невозможно заблокировать раздел 
{volume_name}:\n{error_message}"
+
+#: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:332
+msgid "Error locking volume"
+msgstr "Ошибка блокировки раздела"
+
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"
 msgstr "Контейнеры файлов не добавлены"

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


[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-07-02 Thread translation
commit f538cca7dd07678029876222015e31c7512eca4e
Author: Translation commit bot 
Date:   Tue Jul 2 15:15:39 2019 +

Update translations for donatepages-messagespot
---
 locale/cs/LC_MESSAGES/messages.po | 78 +++
 1 file changed, 54 insertions(+), 24 deletions(-)

diff --git a/locale/cs/LC_MESSAGES/messages.po 
b/locale/cs/LC_MESSAGES/messages.po
index 35da9829d..a23a219ff 100644
--- a/locale/cs/LC_MESSAGES/messages.po
+++ b/locale/cs/LC_MESSAGES/messages.po
@@ -1132,7 +1132,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:228
 msgid "The Tor Project spends about $4 million annually."
-msgstr ""
+msgstr "Tor Project utratí asi 4 miliony dolarů ročně."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:230
 #, php-format
@@ -1140,12 +1140,15 @@ msgid ""
 "About 80% of the Tor Project's spending goes to staffing, mostly software "
 "engineers."
 msgstr ""
+"Okolo 80% využíváme k vyplácení zaměstnanců, zejména softwarových 
inženýrů."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:232
 msgid ""
 "About 10% goes towards administrative costs such as accounting and legal "
 "costs and bank fees."
 msgstr ""
+"Okolo 10% jde na administrativní výdaje jako účetnictví a právní, 
bankovní "
+"poplatky."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:234
 msgid ""
@@ -1180,11 +1183,11 @@ msgstr ""
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:264
 msgid "If I am not in the United States, can I still donate?"
-msgstr ""
+msgstr "Pokud nejsem ve Spojených státech, mohu stále přispět?"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:268
 msgid "Yes, definitely."
-msgstr ""
+msgstr "Ano, určitě."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:270
 msgid ""
@@ -1197,11 +1200,13 @@ msgid ""
 "Can I donate to a specific project, or restrict my donation to a particular "
 "purpose?"
 msgstr ""
+"Mohu přispět pouze na určitý projekt nebo omezit příspěvek na 
použití ke "
+"konkrétnímu účelu?"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:280
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:560
 msgid "No, sorry."
-msgstr ""
+msgstr "Ne, to bohužel nejde."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:282
 msgid ""
@@ -1256,11 +1261,11 @@ msgstr ""
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:308
 msgid "If you run into any problems donating via PayPal, please let us know."
-msgstr ""
+msgstr "Pokud máte problémy s darováním přes PayPal, dejte nám vědět."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:314
 msgid "How can I donate via debit or credit card?"
-msgstr ""
+msgstr "Jak mohu darovat debitní či kreditní kartou?"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:318
 msgid ""
@@ -1271,7 +1276,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:324
 msgid "Why do you ask for my address and similar information?"
-msgstr ""
+msgstr "Proč chcete znát mou adresu a podobné informace?"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:328
 msgid ""
@@ -1294,23 +1299,27 @@ msgstr ""
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:338
 msgid "Why is there a minimum donation?"
-msgstr ""
+msgstr "Jaká je minimální výše příspěvku?"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:342
 msgid ""
 "People who have stolen credit card information often donate to nonprofits as"
 " a way of testing whether the card works."
 msgstr ""
+"Lidé, kteří ukradli informace o kreditní kartě, často darují 
neziskovkám, "
+"aby otestovali jejich funkčnost."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:344
 msgid ""
 "These people typically use a very small amount for their testing, and we've "
 "found that setting a $1 minimum donation seems to deter them."
 msgstr ""
+"Tito lidé typicky zadávají malou částku pro účely testu, stanovení 
minimální"
+" částky $1 je odradí."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:350
 msgid "Is there a maximum donation?"
-msgstr ""
+msgstr "Je dána maximální částka příspěvku?"
 
 #: 

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-07-02 Thread translation
commit 9440727b342e0d08f0e639aabe5f0fb4a2737d74
Author: Translation commit bot 
Date:   Tue Jul 2 17:15:40 2019 +

Update translations for donatepages-messagespot
---
 locale/fr/LC_MESSAGES/messages.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 40cc71010..2b3d6c272 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -738,7 +738,7 @@ msgstr "Chandail en coton molletonné"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:493
 msgid "A required field is missing from the form."
-msgstr "Un champ obligatoire du formulaire n’est pas renseigné."
+msgstr "Un champ obligatoire du formulaire n’est pas rempli."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:495
 msgid "Please reload the page and try again."
@@ -757,7 +757,7 @@ msgstr "échec de validation"
 #. javascript.
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:509
 msgid "__field_name__ must be filled out."
-msgstr "__field_name__ doit être renseigné."
+msgstr "__field_name__ doit être rempli."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:514
 msgid "This field is required"

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


[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2019-07-02 Thread translation
commit 5eb9e4d3b84514de570e842ecc908abfb265ff84
Author: Translation commit bot 
Date:   Tue Jul 2 16:16:55 2019 +

Update translations for tails-misc_completed
---
 de.po | 23 ++-
 fr.po | 23 ++-
 he.po | 21 +
 3 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/de.po b/de.po
index 90edffe0b..ffb413465 100644
--- a/de.po
+++ b/de.po
@@ -36,9 +36,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-05-19 16:05+\n"
-"Last-Translator: Ettore Atalan \n"
+"POT-Creation-Date: 2019-06-30 18:53+0200\n"
+"PO-Revision-Date: 2019-07-02 16:00+\n"
+"Last-Translator: Curtis Baltimore \n"
 "Language-Team: German 
(http://www.transifex.com/otf/torproject/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -451,11 +451,11 @@ msgstr "Bildschirmsperre"
 msgid "Set up a password to unlock the screen."
 msgstr "Stellen Sie ein Passwort zum Sperren des Bildschirms ein."
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:136
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
 msgid "Password"
 msgstr "Passwort"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:142
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
 msgid "Confirm"
 msgstr "Bestätigen"
 
@@ -661,6 +661,19 @@ msgid ""
 "{error_message}"
 msgstr "Volumen {volume_name}:{error_message} konnte nicht entsperrt werden"
 
+#. Translators: Don't translate {volume_name} or {error_message},
+#. they are placeholder and will be replaced.
+#: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#, python-brace-format
+msgid ""
+"Couldn't lock volume {volume_name}:\n"
+"{error_message}"
+msgstr "Der Datenträger {volume_name} konnte nicht gesperrt 
werden:\n{error_message}"
+
+#: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:332
+msgid "Error locking volume"
+msgstr "Fehler beim Entsperren des Datenträgers"
+
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"
 msgstr "Keine Datei-Container hinzugefügt"
diff --git a/fr.po b/fr.po
index c0a47ff46..859f70a18 100644
--- a/fr.po
+++ b/fr.po
@@ -39,9 +39,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-06-30 09:22+\n"
-"Last-Translator: xin\n"
+"POT-Creation-Date: 2019-06-30 18:53+0200\n"
+"PO-Revision-Date: 2019-07-02 16:07+\n"
+"Last-Translator: Curtis Baltimore \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -454,11 +454,11 @@ msgstr "Verrouillage de l’écran"
 msgid "Set up a password to unlock the screen."
 msgstr "Définir un mot de passe pour déverrouiller l’écran"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:136
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
 msgid "Password"
 msgstr "Mot de passe"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:142
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
 msgid "Confirm"
 msgstr "Confirmer"
 
@@ -664,6 +664,19 @@ msgid ""
 "{error_message}"
 msgstr "Impossible de déverrouiller le volume {volume_name} 
:\n{error_message}"
 
+#. Translators: Don't translate {volume_name} or {error_message},
+#. they are placeholder and will be replaced.
+#: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#, python-brace-format
+msgid ""
+"Couldn't lock volume {volume_name}:\n"
+"{error_message}"
+msgstr "Impossible de verrouiller le volume {volume_name}:\n{error_message}"
+
+#: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:332
+msgid "Error locking volume"
+msgstr "Erreur en verrouillant le volume"
+
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"
 msgstr "Aucun fichier conteneur ajouté"
diff --git a/he.po b/he.po
index 8326b821f..98923761e 100644
--- a/he.po
+++ b/he.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-05-20 19:11+\n"
+"POT-Creation-Date: 2019-06-30 18:53+0200\n"
+"PO-Revision-Date: 2019-07-02 16:13+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -429,11 +429,11 @@ msgstr "נועל המסך"
 msgid "Set up a password to 

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2019-07-02 Thread translation
commit 4d8dbbce8a23bc816e090ffa9517fe8c202666a4
Author: Translation commit bot 
Date:   Tue Jul 2 16:16:49 2019 +

Update translations for tails-misc
---
 de.po | 8 
 fr.po | 8 
 he.po | 8 
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/de.po b/de.po
index 0f267d1d3..ffb413465 100644
--- a/de.po
+++ b/de.po
@@ -37,8 +37,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-06-30 18:53+0200\n"
-"PO-Revision-Date: 2019-07-01 01:04+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-07-02 16:00+\n"
+"Last-Translator: Curtis Baltimore \n"
 "Language-Team: German 
(http://www.transifex.com/otf/torproject/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -668,11 +668,11 @@ msgstr "Volumen {volume_name}:{error_message} konnte 
nicht entsperrt werden"
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
-msgstr ""
+msgstr "Der Datenträger {volume_name} konnte nicht gesperrt 
werden:\n{error_message}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:332
 msgid "Error locking volume"
-msgstr ""
+msgstr "Fehler beim Entsperren des Datenträgers"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"
diff --git a/fr.po b/fr.po
index cfb63879a..859f70a18 100644
--- a/fr.po
+++ b/fr.po
@@ -40,8 +40,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-06-30 18:53+0200\n"
-"PO-Revision-Date: 2019-07-01 01:04+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-07-02 16:07+\n"
+"Last-Translator: Curtis Baltimore \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -671,11 +671,11 @@ msgstr "Impossible de déverrouiller le volume 
{volume_name} :\n{error_message}
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
-msgstr ""
+msgstr "Impossible de verrouiller le volume {volume_name}:\n{error_message}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:332
 msgid "Error locking volume"
-msgstr ""
+msgstr "Erreur en verrouillant le volume"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"
diff --git a/he.po b/he.po
index 8d4d54049..98923761e 100644
--- a/he.po
+++ b/he.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-06-30 18:53+0200\n"
-"PO-Revision-Date: 2019-07-01 01:04+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-07-02 16:13+\n"
+"Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -646,11 +646,11 @@ msgstr "לא היה ניתן לבטל נעילת כרך 
{volume_name}:\n{error_m
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
-msgstr ""
+msgstr "לא היה ניתן לנעול כרך {volume_name}:\n{error_message}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:332
 msgid "Error locking volume"
-msgstr ""
+msgstr "שגיאה בנעילת כרך"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"

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


[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-07-02 Thread translation
commit a5512dd8b11564fa7746e3f2170ee842028a70eb
Author: Translation commit bot 
Date:   Tue Jul 2 16:15:43 2019 +

Update translations for donatepages-messagespot
---
 locale/de/LC_MESSAGES/messages.po | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po 
b/locale/de/LC_MESSAGES/messages.po
index 451f656d7..c4818aa09 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -248,11 +248,11 @@ msgstr ""
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:110
 msgid "Copied"
-msgstr ""
+msgstr "Kopiert"
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:114
 msgid "Currency Amount must be a number."
-msgstr ""
+msgstr "Der Währungsbetrag muss eine Zahl sein."
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:118
 #: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:51
@@ -266,11 +266,11 @@ msgstr "Höhe des Betrags"
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:124
 msgid "Estimated Donation Date"
-msgstr ""
+msgstr "Geschätztes Spende Datum"
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:128
 msgid "I'd like to make my donation anonymous."
-msgstr ""
+msgstr "Ich möchte meine Spende gerne anonym machen."
 
 #: 
tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:132
 #: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:46
@@ -885,6 +885,9 @@ msgid ""
 "continue our mission to provide tools that protect people's privacy and "
 "identity online."
 msgstr ""
+"Das Tor Project zählt auf die Unterstützung unserer Verteidiger der "
+"Privatsphäre, um unsere Mission fortzusetzen, Werkzeuge bereitzustellen, die"
+" die Privatsphäre und Identität der Menschen online schützen."
 
 #: 
tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:115
 msgid "With your help, we will make the Tor network accessible to everyone!"

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


[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1120'

2019-07-02 Thread nickm
commit cf92c096ad4338717a11aab71fd020d0514004e5
Merge: 15e28af2d 875117668
Author: Nick Mathewson 
Date:   Tue Jul 2 13:33:37 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1120'

 changes/ticket30921   |  5 +++
 src/feature/hs/hs_cache.c |  5 +++
 src/test/test_hs_client.c | 89 +++
 3 files changed, 99 insertions(+)



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


[tor-commits] [tor/master] stats: add comments about the required chunk structure in extra info files

2019-07-02 Thread nickm
commit c131b0763e994ea850f457319ec6d9c487760a85
Author: teor 
Date:   Mon Jun 24 21:20:34 2019 +1000

stats: add comments about the required chunk structure in extra info files

These comments should prevent future instances of 30958.

And allow a larger file in practracker.

Follow up after 30958.
---
 scripts/maint/practracker/exceptions.txt |  2 +-
 src/feature/relay/router.c   | 10 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index 4db452b89..ffe238a67 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -225,7 +225,7 @@ problem function-size 
/src/feature/nodelist/routerlist.c:update_extrainfo_downlo
 problem function-size /src/feature/relay/dns.c:dns_resolve_impl() 134
 problem function-size /src/feature/relay/dns.c:configure_nameservers() 161
 problem function-size /src/feature/relay/dns.c:evdns_callback() 109
-problem file-size /src/feature/relay/router.c 3510
+problem file-size /src/feature/relay/router.c 3522
 problem include-count /src/feature/relay/router.c 56
 problem function-size /src/feature/relay/router.c:init_keys() 252
 problem function-size /src/feature/relay/router.c:get_my_declared_family() 114
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index 782084caa..51ced6289 100644
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -3158,6 +3158,8 @@ extrainfo_dump_to_string_header_helper(
 ed_cert_line = tor_strdup("");
   }
 
+  /* This is the first chunk in the file. If the file is too big, other chunks
+   * are removed. So we must only add one chunk here. */
   tor_asprintf(, "extra-info %s %s\n%spublished %s\n",
extrainfo->nickname, identity,
ed_cert_line,
@@ -3187,6 +3189,10 @@ extrainfo_dump_to_string_stats_helper(smartlist_t 
*chunks,
   char *contents = NULL;
   time_t now = time(NULL);
 
+  /* If the file is too big, these chunks are removed, starting with the last
+   * chunk. So each chunk must be a complete line, and the file must be valid
+   * after each chunk. */
+
   /* Add information about the pluggable transports we support, even if we
* are not publishing statistics. This information is needed by BridgeDB
* to distribute bridges. */
@@ -3269,6 +3275,8 @@ extrainfo_dump_to_string_ed_sig_helper(
   char buf[ED25519_SIG_BASE64_LEN+1];
   int rv = -1;
 
+  /* These are two of the three final chunks in the file. If the file is too
+   * big, other chunks are removed. So we must only add two chunks here. */
   smartlist_add_strdup(chunks, "router-sig-ed25519 ");
   crypto_digest_smartlist_prefix(sha256_digest, DIGEST256_LEN,
  ED_DESC_SIGNATURE_PREFIX,
@@ -3362,6 +3370,8 @@ extrainfo_dump_to_string(char **s_out, extrainfo_t 
*extrainfo,
   goto err;
   }
 
+  /* This is one of the three final chunks in the file. If the file is too big,
+   * other chunks are removed. So we must only add one chunk here. */
   smartlist_add_strdup(chunks, "router-signature\n");
   s = smartlist_join_strings(chunks, "", 0, NULL);
 



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


[tor-commits] [translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed

2019-07-02 Thread translation
commit 14afed93f91ea86f7363b79f515743c030c3bd40
Author: Translation commit bot 
Date:   Tue Jul 2 17:15:49 2019 +

Update translations for donatepages-messagespot_completed
---
 locale/fr/LC_MESSAGES/messages.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 40cc71010..2b3d6c272 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -738,7 +738,7 @@ msgstr "Chandail en coton molletonné"
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:493
 msgid "A required field is missing from the form."
-msgstr "Un champ obligatoire du formulaire n’est pas renseigné."
+msgstr "Un champ obligatoire du formulaire n’est pas rempli."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:495
 msgid "Please reload the page and try again."
@@ -757,7 +757,7 @@ msgstr "échec de validation"
 #. javascript.
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:509
 msgid "__field_name__ must be filled out."
-msgstr "__field_name__ doit être renseigné."
+msgstr "__field_name__ doit être rempli."
 
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:514
 msgid "This field is required"

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