date:20190826

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

2019-08-26 Thread translation

commit 8e34eb55c7dee23e524cf334292597a174c77257
Author: Translation commit bot 
Date:   Tue Aug 27 05:20:52 2019 +

Update translations for tails-misc_release
---
 tr.po | 104 +-
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/tr.po b/tr.po
index 893ca8e08..367289300 100644
--- a/tr.po
+++ b/tr.po
@@ -30,7 +30,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-08-14 14:11+0200\n"
-"PO-Revision-Date: 2019-08-27 04:45+\n"
+"PO-Revision-Date: 2019-08-27 05:06+\n"
 "Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -139,16 +139,16 @@ msgstr "Kilidi AÃ§"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:482
 msgid "Failed to relock persistent storage."
-msgstr "KalÄ±cÄ± depolama yeniden kilitlenemedi"
+msgstr "KalÄ±cÄ± depolama yeniden kilitlenemedi."
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:500
 msgid "Unlockingâ¦"
-msgstr "Kilidi aÃ§Ä±lÄ±yor..."
+msgstr "Kilit aÃ§Ä±lÄ±yor..."
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:533
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
 msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Bu parola ifadesi ile ÅifrelenmiÅ depolama kilidi aÃ§Ä±lamadÄ±."
+msgstr "Bu parola ile Åifreli depolama alanÄ±nÄ±n kilidi aÃ§Ä±lamadÄ±."
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:595
 msgid "Additional Settings"
@@ -188,7 +188,7 @@ msgstr "default:LTR"
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
-msgstr "live-persist {returncode} Åu hata kodu ile baÅarÄ±sÄ±z 
oldu:\n{stderr}"
+msgstr "live-persist Åu hata kodu ile yÃ¼rÃ¼tÃ¼lemedi {returncode}:\n{stderr}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:124
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:141
@@ -197,7 +197,7 @@ msgid ""
 "cryptsetup failed with return code {returncode}:\n"
 "{stdout}\n"
 "{stderr}"
-msgstr "cryptsetup Åu hata kodu ile baÅarÄ±sÄ±z oldu 
{returncode}:\n{stdout}\n{stderr}"
+msgstr "cryptsetup Åu hata kodu ile yÃ¼rÃ¼tÃ¼lemedi 
{returncode}:\n{stdout}\n{stderr}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:158
 #, python-brace-format
@@ -205,7 +205,7 @@ msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stdout}\n"
 "{stderr}"
-msgstr "live-persist Åu hata kodu ile baÅarÄ±sÄ±z oldu 
{returncode}:\n{stdout}\n{stderr}"
+msgstr "live-persist Åu hata kodu ile yÃ¼rÃ¼tÃ¼lemedi 
{returncode}:\n{stdout}\n{stderr}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:172
 #, python-brace-format
@@ -213,7 +213,7 @@ msgid ""
 "umount failed with return code {returncode}:\n"
 "{stdout}\n"
 "{stderr}"
-msgstr "umount Åu hata kodu ile baÅarÄ±sÄ±z oldu 
{returncode}:\n{stdout}\n{stderr}"
+msgstr "umount Åu hata kodu ile yÃ¼rÃ¼tÃ¼lemedi 
{returncode}:\n{stdout}\n{stderr}"
 
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
@@ -226,11 +226,11 @@ msgid ""
 "Set up an administration password if you need to perform administrative "
 "tasks. Otherwise, the administration password is disabled for better "
 "security."
-msgstr ""
+msgstr "YÃ¶netim iÅlemleri yapacaksanÄ±z bir yÃ¶netim parolasÄ± yazÄ±n. Yoksa 
gÃ¼venlik iÃ§in yÃ¶netim parolasÄ± devre dÄ±ÅÄ± bÄ±rakÄ±lÄ±r."
 
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
 msgid "Enter an administration password"
-msgstr ""
+msgstr "YÃ¶netim parolasÄ±nÄ± yazÄ±n"
 
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
@@ -239,34 +239,34 @@ msgstr "Onayla"
 
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
 msgid "Confirm your administration password"
-msgstr ""
+msgstr "YÃ¶netim parolasÄ±nÄ± onaylayÄ±n"
 
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
 msgid "Disable"
-msgstr ""
+msgstr "Devre DÄ±ÅÄ± BÄ±rak"
 
 #. This string will never be displayed in the 1st version of the greeter.
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
 msgid "Windows Camouflage"
-msgstr ""
+msgstr "Windows Gizlenmesi"
 
 #. This string will never be displayed in the 1st version of the greeter.
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
 msgid ""
 "This option makes Tails look like Microsoft Windows 10.

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

2019-08-26 Thread translation

commit 0ee6419352fe803a5cca4290b0fc05cde9f75b35
Author: Translation commit bot 
Date:   Tue Aug 27 05:19:55 2019 +

Update translations for tails-misc_completed
---
 tr.po | 1157 +
 1 file changed, 1157 insertions(+)

diff --git a/tr.po b/tr.po
new file mode 100644
index 0..367289300
--- /dev/null
+++ b/tr.po
@@ -0,0 +1,1157 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Ayca Omrak , 2013
+# Bullgeschichte , 2015
+# Can GÃ¼nay , 2018
+# Cenk YÄ±ldÄ±zlÄ± , 2019
+# cmldrs, 2014
+# cmldrs, 2014
+# imratirtil , 2014
+# ecocan , 2014
+# ecocan , 2014
+# Emma Peel, 2018
+# imratirtil , 2014
+# Kaya Zeren , 2015-2019
+# metint, 2014
+# metint, 2014
+# Ozancan KarataÅ , 2015-2016
+# Tails_developers , 2014
+# Tails_developers , 2014
+# T. E. Kalayci , 2017-2018
+# Th3Kh3d1v3, 2018
+# Ãmit TÃ¼rk , 2013
+# Volkan Gezer , 2013-2016
+# Yasin Ãzel , 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-08-14 14:11+0200\n"
+"PO-Revision-Date: 2019-08-27 05:06+\n"
+"Last-Translator: Kaya Zeren \n"
+"Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39
+msgid "Tor is ready"
+msgstr "Tor hazÄ±r"
+
+#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
+msgid "You can now access the Internet."
+msgstr "ArtÄ±k Ä°nternet'e eriÅebilirsiniz."
+
+#: config/chroot_local-includes/etc/whisperback/config.py:69
+#, python-format
+msgid ""
+"Help us fix your bug!\n"
+"Read our bug reporting instructions.\n"
+"Do not include more personal information than\n"
+"needed!\n"
+"About giving us an email address\n"
+"\n"
+"Giving us an email address allows us to contact you to clarify the problem. 
This\n"
+"is needed for the vast majority of the reports we receive as most reports\n"
+"without any contact information are useless. On the other hand it also 
provides\n"
+"an opportunity for eavesdroppers, like your email or Internet provider, to\n"
+"confirm that you are using Tails.\n"
+"\n"
+msgstr "KarÅÄ±laÅtÄ±ÄÄ±nÄ±z sorunu Ã§Ã¶zmemize yardÄ±m 
edin!\nHata bildirme yÃ¶nergelerini 
okuyun.\nGerektiÄinden fazla kiÅisel bilgi 
vermeyin!\nE-posta adresinizi bildirmeniz 
hakkÄ±nda\n\nBir e-posta adresi bildirmeniz, sorununuzu daha iyi 
anlamak iÃ§in sizinle iletiÅim\nkurmamÄ±zÄ± saÄlar. Bize iletilen pek Ã§ok 
hata bildirimi, iletiÅim bilgileri bulunmadÄ±ÄÄ±\niÃ§in iÅe yaramÄ±yor. 
Ancak gerÃ§ek bilgilerinizi verdiÄinizde sizi izliyor olabilecek \nkiÅi ya da 
kuruluÅlara (e-posta ya da Ä°nternet hizmeti saÄlayÄ±cÄ±nÄ±za) Tails 
uygulamasÄ±nÄ± kullandÄ±ÄÄ±nÄ±zÄ±\nbelirleme fÄ±rsatÄ± vermiÅ olursunuz. Bu 
nedenle farklÄ± bir e-posta adresi kullanmanÄ±z Ã¶nerilir.\n\n"
+
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
+#: 
../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
+msgid "Additional Software"
+msgstr "Ek YazÄ±lÄ±mlar"
+
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:51
+msgid ""
+"You can install additional software automatically from your persistent "
+"storage when starting Tails."
+msgstr "Tails baÅlatÄ±lÄ±rken otomatik olarak kalÄ±cÄ± depolama alanÄ±nÄ±zdan 
ek yazÄ±lÄ±mlar kurabilirsiniz."
+
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77
+msgid ""
+"The following software is installed automatically from your persistent "
+"storage when starting Tails."
+msgstr "Åu yazÄ±lÄ±mlar Tails baÅlatÄ±lÄ±rken otomatik olarak kalÄ±cÄ± 
depolama alanÄ±nÄ±zdan kurulacak."
+
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:135
+#: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:171
+msgid ""
+"To add more, install some software using Synaptic Package Manager or APT on the command line."
+msgstr "BaÅka yazÄ±lÄ±mlar eklemek iÃ§in Synaptic Paket YÃ¶neticisi ya da komut satÄ±rÄ±ndan APT kullanarak 
baÅka yazÄ±lÄ±mlar kurun."
+
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:154
+msgid "_Create persistent storage"
+msgstr "_KalÄ±cÄ± depolama oluÅtur"
+
+#: config/chroot_local-includes/usr/local/bin/electrum:57
+msgid "Persistence is disabled for Electrum"
+msgstr "Electrum iÃ§in kalÄ±cÄ±lÄ±k devre dÄ±ÅÄ± bÄ±rakÄ±ldÄ±"
+
+#: config/chroot_local-includes/usr/local/bin/electrum:59
+msgid ""
+"When you reboot Tails, all of

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

2019-08-26 Thread translation

commit 8bf94c53c4a158e5c22343672accfffc69e464a7
Author: Translation commit bot 
Date:   Tue Aug 27 05:19:50 2019 +

Update translations for tails-misc
---
 tr.po | 104 +-
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/tr.po b/tr.po
index 893ca8e08..367289300 100644
--- a/tr.po
+++ b/tr.po
@@ -30,7 +30,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-08-14 14:11+0200\n"
-"PO-Revision-Date: 2019-08-27 04:45+\n"
+"PO-Revision-Date: 2019-08-27 05:06+\n"
 "Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -139,16 +139,16 @@ msgstr "Kilidi AÃ§"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:482
 msgid "Failed to relock persistent storage."
-msgstr "KalÄ±cÄ± depolama yeniden kilitlenemedi"
+msgstr "KalÄ±cÄ± depolama yeniden kilitlenemedi."
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:500
 msgid "Unlockingâ¦"
-msgstr "Kilidi aÃ§Ä±lÄ±yor..."
+msgstr "Kilit aÃ§Ä±lÄ±yor..."
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:533
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
 msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Bu parola ifadesi ile ÅifrelenmiÅ depolama kilidi aÃ§Ä±lamadÄ±."
+msgstr "Bu parola ile Åifreli depolama alanÄ±nÄ±n kilidi aÃ§Ä±lamadÄ±."
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:595
 msgid "Additional Settings"
@@ -188,7 +188,7 @@ msgstr "default:LTR"
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
-msgstr "live-persist {returncode} Åu hata kodu ile baÅarÄ±sÄ±z 
oldu:\n{stderr}"
+msgstr "live-persist Åu hata kodu ile yÃ¼rÃ¼tÃ¼lemedi {returncode}:\n{stderr}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:124
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:141
@@ -197,7 +197,7 @@ msgid ""
 "cryptsetup failed with return code {returncode}:\n"
 "{stdout}\n"
 "{stderr}"
-msgstr "cryptsetup Åu hata kodu ile baÅarÄ±sÄ±z oldu 
{returncode}:\n{stdout}\n{stderr}"
+msgstr "cryptsetup Åu hata kodu ile yÃ¼rÃ¼tÃ¼lemedi 
{returncode}:\n{stdout}\n{stderr}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:158
 #, python-brace-format
@@ -205,7 +205,7 @@ msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stdout}\n"
 "{stderr}"
-msgstr "live-persist Åu hata kodu ile baÅarÄ±sÄ±z oldu 
{returncode}:\n{stdout}\n{stderr}"
+msgstr "live-persist Åu hata kodu ile yÃ¼rÃ¼tÃ¼lemedi 
{returncode}:\n{stdout}\n{stderr}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:172
 #, python-brace-format
@@ -213,7 +213,7 @@ msgid ""
 "umount failed with return code {returncode}:\n"
 "{stdout}\n"
 "{stderr}"
-msgstr "umount Åu hata kodu ile baÅarÄ±sÄ±z oldu 
{returncode}:\n{stdout}\n{stderr}"
+msgstr "umount Åu hata kodu ile yÃ¼rÃ¼tÃ¼lemedi 
{returncode}:\n{stdout}\n{stderr}"
 
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
@@ -226,11 +226,11 @@ msgid ""
 "Set up an administration password if you need to perform administrative "
 "tasks. Otherwise, the administration password is disabled for better "
 "security."
-msgstr ""
+msgstr "YÃ¶netim iÅlemleri yapacaksanÄ±z bir yÃ¶netim parolasÄ± yazÄ±n. Yoksa 
gÃ¼venlik iÃ§in yÃ¶netim parolasÄ± devre dÄ±ÅÄ± bÄ±rakÄ±lÄ±r."
 
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
 msgid "Enter an administration password"
-msgstr ""
+msgstr "YÃ¶netim parolasÄ±nÄ± yazÄ±n"
 
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
@@ -239,34 +239,34 @@ msgstr "Onayla"
 
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
 msgid "Confirm your administration password"
-msgstr ""
+msgstr "YÃ¶netim parolasÄ±nÄ± onaylayÄ±n"
 
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
 msgid "Disable"
-msgstr ""
+msgstr "Devre DÄ±ÅÄ± BÄ±rak"
 
 #. This string will never be displayed in the 1st version of the greeter.
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
 msgid "Windows Camouflage"
-msgstr ""
+msgstr "Windows Gizlenmesi"
 
 #. This string will never be displayed in the 1st version of the greeter.
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can

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

2019-08-26 Thread translation

commit ee684092aa82fe3a634661ba47d5003271ae619e
Author: Translation commit bot 
Date:   Tue Aug 27 04:50:59 2019 +

Update translations for tails-misc_release
---
 tr.po | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/tr.po b/tr.po
index ceebd14d1..893ca8e08 100644
--- a/tr.po
+++ b/tr.po
@@ -30,8 +30,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-08-14 14:11+0200\n"
-"PO-Revision-Date: 2019-08-24 02:11+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-08-27 04:45+\n"
+"Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -121,38 +121,38 @@ msgstr "ÃÄ±_kÄ±Å"
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:386
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
 msgid "Direct (default)"
-msgstr ""
+msgstr "DoÄrudan (varsayÄ±lan)"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:392
 msgid "Bridge & Proxy"
-msgstr ""
+msgstr "KÃ¶prÃ¼ ve Vekil Sunucu"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:398
 msgid "Offline"
-msgstr ""
+msgstr "ÃevrimdÄ±ÅÄ±"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:479
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:529
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
 msgid "Unlock"
-msgstr ""
+msgstr "Kilidi AÃ§"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:482
 msgid "Failed to relock persistent storage."
-msgstr ""
+msgstr "KalÄ±cÄ± depolama yeniden kilitlenemedi"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:500
 msgid "Unlockingâ¦"
-msgstr ""
+msgstr "Kilidi aÃ§Ä±lÄ±yor..."
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:533
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
 msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr ""
+msgstr "Bu parola ifadesi ile ÅifrelenmiÅ depolama kilidi aÃ§Ä±lamadÄ±."
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:595
 msgid "Additional Settings"
-msgstr ""
+msgstr "Ek Ayarlar"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:603
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
@@ -163,32 +163,32 @@ msgstr "Ä°ptal"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:609
 msgid "Add"
-msgstr ""
+msgstr "Ekle"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:617
 msgid "Back"
-msgstr ""
+msgstr "Geri"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:731
 msgid "Shutdown"
-msgstr ""
+msgstr "Kapat"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:736
 msgid "_Start Tails"
-msgstr ""
+msgstr "_Tails BaÅlat"
 
 #. Translators: please do not translate this string (it is read from
 #. Gtk translation)
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/language.py:139
 msgid "default:LTR"
-msgstr ""
+msgstr "default:LTR"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:91
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
-msgstr ""
+msgstr "live-persist {returncode} Åu hata kodu ile baÅarÄ±sÄ±z 
oldu:\n{stderr}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:124
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:141
@@ -197,7 +197,7 @@ msgid ""
 "cryptsetup failed with return code {returncode}:\n"
 "{stdout}\n"
 "{stderr}"
-msgstr ""
+msgstr "cryptsetup Åu hata kodu ile baÅarÄ±sÄ±z oldu 
{returncode}:\n{stdout}\n{stderr}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:158
 #, python-brace-format
@@ -205,7 +205,7 @@ msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stdout}\n"
 "{stderr}"
-msgstr ""
+msgstr "live-persist Åu hata kodu ile baÅarÄ±sÄ±z oldu 
{returncode}:\n{stdout}\n{stderr}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:172
 #, python-brace-format
@@ -213,13 +213,13 @@ msgid ""
 "umount failed with return code {returncode}:\n"
 "{stdout}\n"
 "{stderr}"
-msgstr ""
+msgstr "umount Åu hata kodu ile baÅarÄ±sÄ±z oldu 
{returncode}:\n{stdout}\n{stderr}"
 
 #:

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

2019-08-26 Thread translation

commit 89a75a33c89f25e865f25c2e150d1587dc7b115c
Author: Translation commit bot 
Date:   Tue Aug 27 04:49:56 2019 +

Update translations for tails-misc
---
 tr.po | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/tr.po b/tr.po
index ceebd14d1..893ca8e08 100644
--- a/tr.po
+++ b/tr.po
@@ -30,8 +30,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-08-14 14:11+0200\n"
-"PO-Revision-Date: 2019-08-24 02:11+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-08-27 04:45+\n"
+"Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -121,38 +121,38 @@ msgstr "ÃÄ±_kÄ±Å"
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:386
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
 msgid "Direct (default)"
-msgstr ""
+msgstr "DoÄrudan (varsayÄ±lan)"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:392
 msgid "Bridge & Proxy"
-msgstr ""
+msgstr "KÃ¶prÃ¼ ve Vekil Sunucu"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:398
 msgid "Offline"
-msgstr ""
+msgstr "ÃevrimdÄ±ÅÄ±"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:479
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:529
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
 msgid "Unlock"
-msgstr ""
+msgstr "Kilidi AÃ§"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:482
 msgid "Failed to relock persistent storage."
-msgstr ""
+msgstr "KalÄ±cÄ± depolama yeniden kilitlenemedi"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:500
 msgid "Unlockingâ¦"
-msgstr ""
+msgstr "Kilidi aÃ§Ä±lÄ±yor..."
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:533
 #: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
 msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr ""
+msgstr "Bu parola ifadesi ile ÅifrelenmiÅ depolama kilidi aÃ§Ä±lamadÄ±."
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:595
 msgid "Additional Settings"
-msgstr ""
+msgstr "Ek Ayarlar"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:603
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
@@ -163,32 +163,32 @@ msgstr "Ä°ptal"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:609
 msgid "Add"
-msgstr ""
+msgstr "Ekle"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:617
 msgid "Back"
-msgstr ""
+msgstr "Geri"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:731
 msgid "Shutdown"
-msgstr ""
+msgstr "Kapat"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/gui.py:736
 msgid "_Start Tails"
-msgstr ""
+msgstr "_Tails BaÅlat"
 
 #. Translators: please do not translate this string (it is read from
 #. Gtk translation)
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/language.py:139
 msgid "default:LTR"
-msgstr ""
+msgstr "default:LTR"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:91
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
-msgstr ""
+msgstr "live-persist {returncode} Åu hata kodu ile baÅarÄ±sÄ±z 
oldu:\n{stderr}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:124
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:141
@@ -197,7 +197,7 @@ msgid ""
 "cryptsetup failed with return code {returncode}:\n"
 "{stdout}\n"
 "{stderr}"
-msgstr ""
+msgstr "cryptsetup Åu hata kodu ile baÅarÄ±sÄ±z oldu 
{returncode}:\n{stdout}\n{stderr}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:158
 #, python-brace-format
@@ -205,7 +205,7 @@ msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stdout}\n"
 "{stderr}"
-msgstr ""
+msgstr "live-persist Åu hata kodu ile baÅarÄ±sÄ±z oldu 
{returncode}:\n{stdout}\n{stderr}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/tailsgreeter/persistence.py:172
 #, python-brace-format
@@ -213,13 +213,13 @@ msgid ""
 "umount failed with return code {returncode}:\n"
 "{stdout}\n"
 "{stderr}"
-msgstr ""
+msgstr "umount Åu hata kodu ile baÅarÄ±sÄ±z oldu 
{returncode}:\n{stdout}\n{stderr}"
 
 #:

[tor-commits] [community/master] Turn bullet point into paragraph.

2019-08-26 Thread phw

commit 3eb5e6f435b58ee43cd0afb921fc7605fd17cb52
Author: Philipp Winter 
Date:   Mon Aug 26 17:24:46 2019 -0700

Turn bullet point into paragraph.

The bullet point wants to be a paragraph because it's not related to the
other two bullet points.

Thanks to Roger for pointing this out.
---
 .../relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr 
b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
index 16037a4..8273f8f 100644
--- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
@@ -52,12 +52,12 @@ Don't forget to change the `ORPort`, 
`ServerTransportListenAddr`, `ContactInfo`,
 
   `sudo setcap cap_net_bind_service=+ep /usr/bin/obfs4proxy`
 
-* Under Debian, you will also need to set `NoNewPrivileges=no` in 
`/lib/systemd/system/tor@default.service` and 
`/lib/systemd/system/tor@.service` and then run `systemctl daemon-reload`. (see 
[bug #18356](https://trac.torproject.org/projects/tor/ticket/18356))
-
 * Note that both Tor's OR port and its obfs4 port must be reachable.
   If your bridge is behind a firewall or NAT, make sure to open both ports.
   You can use [our reachability test](https://bridges.torproject.org/scan/) to 
see if your obfs4 port is reachable from the Internet.
 
+Under Debian, you will also need to set `NoNewPrivileges=no` in 
`/lib/systemd/system/tor@default.service` and 
`/lib/systemd/system/tor@.service` and then run `systemctl daemon-reload`. (see 
[bug #18356](https://trac.torproject.org/projects/tor/ticket/18356))
+
 ### 4. Restart tor
 
 `systemctl restart tor`



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

[tor-commits] [community/master] Link to post-install notes at the end.

2019-08-26 Thread phw

commit c1ec459a95cbcd4d6362fa67014d3820dc9e3b4a
Author: Philipp Winter 
Date:   Mon Aug 26 18:02:53 2019 -0700

Link to post-install notes at the end.

Once somebody is done following the instructions, we should explicitly
point them to our post-install notes because they are otherwise easy to
miss.

Thanks to Roger for pointing this out.
---
 .../technical-setup/bridge/centos-rhel-opensuse/contents.lr   | 7 +++
 .../technical-setup/bridge/debian-ubuntu/contents.lr  | 8 
 .../relay-operations/technical-setup/bridge/docker/contents.lr| 7 ++-
 .../relay-operations/technical-setup/bridge/freebsd/contents.lr   | 7 +++
 .../relay-operations/technical-setup/bridge/openbsd/contents.lr   | 8 
 5 files changed, 36 insertions(+), 1 deletion(-)

diff --git 
a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr
 
b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr
index f142d56..5fba1a6 100644
--- 
a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr
+++ 
b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr
@@ -92,6 +92,13 @@ To confirm your bridge is running with no issues, you should 
see something like
 [notice] Self-testing indicates your ORPort is reachable from the outside. 
Excellent. Publishing server descriptor.
 ``` 
 
+### 6. Final notes
+
+If you are having troubles setting up your bridge, have a look at [our help
+section](https://community.torproject.org/relay/setup/bridge/getting-help/). If
+your bridge is now running, check out the [post-install
+notes](https://community.torproject.org/relay/setup/bridge/post-install/).
+
 ---
 html: two-columns-page.html
 ---
diff --git 
a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr 
b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
index 8273f8f..d1eeb17 100644
--- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
@@ -76,6 +76,14 @@ To confirm your bridge is running with no issues, you should 
see something like
 [notice] Now checking whether ORPort :3818 is reachable... (this may 
take up to 20 minutes -- look for log messages indicating success)
 [notice] Self-testing indicates your ORPort is reachable from the outside. 
Excellent. Publishing server descriptor.
 ```
+
+### 6. Final notes
+
+If you are having troubles setting up your bridge, have a look at [our help
+section](https://community.torproject.org/relay/setup/bridge/getting-help/). If
+your bridge is now running, check out the [post-install
+notes](https://community.torproject.org/relay/setup/bridge/post-install/).
+
 ---
 key: 1
 ---
diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr 
b/content/relay-operations/technical-setup/bridge/docker/contents.lr
index ca3d7f7..1c36012 100644
--- a/content/relay-operations/technical-setup/bridge/docker/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr
@@ -14,7 +14,12 @@ Now, it's time to run the container.  We maintain a script 
that automatically de
$ bash deploy-container.sh addr...@email.com
```
 
-That's it! Your container should now be bootstrapping your new obfs4 Tor 
bridge. 
+That's it! Your container should now be bootstrapping your new obfs4 Tor 
bridge.
+Make sure to check out the [post-install
+notes](https://community.torproject.org/relay/setup/bridge/post-install/).  If
+you are having troubles setting up your bridge, have a look at [our help
+section](https://community.torproject.org/relay/setup/bridge/getting-help/).
+
 ---
 html: two-columns-page.html
 ---
diff --git 
a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr 
b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr
index 78373df..0741c8c 100644
--- a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr
@@ -103,6 +103,13 @@ FreeBSDlatest: {
 }
 ```
 
+### 7. Final notes
+
+If you are having troubles setting up your bridge, have a look at [our help
+section](https://community.torproject.org/relay/setup/bridge/getting-help/). If
+your bridge is now running, check out the [post-install
+notes](https://community.torproject.org/relay/setup/bridge/post-install/).
+
 ---
 subtitle: How to deploy an obfs4 bridge on FreeBSD
 ---
diff --git 
a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr 
b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr
index 0a02f9e..1c95aaa 100644
--- a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr
@@ -72,6 +72,14 @@ To confirm your bridge is running with no issues, you should 
see something like

[tor-commits] [community/master] Remove 'RunAsDaemon 1'.

2019-08-26 Thread phw

commit 404d5cac9673b6b363414680521d1381aeb1944d
Author: Philipp Winter 
Date:   Mon Aug 26 17:10:51 2019 -0700

Remove 'RunAsDaemon 1'.

This is already set by default.

Thanks to Roger for pointing this out.
---
 .../technical-setup/bridge/centos-rhel-opensuse/contents.lr  | 1 -
 .../relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr| 1 -
 content/relay-operations/technical-setup/bridge/freebsd/contents.lr  | 1 -
 content/relay-operations/technical-setup/bridge/openbsd/contents.lr  | 1 -
 4 files changed, 4 deletions(-)

diff --git 
a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr
 
b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr
index 14d6e04..f142d56 100644
--- 
a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr
+++ 
b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr
@@ -43,7 +43,6 @@ sudo cp $GOPATH/bin/obfs4proxy /usr/local/bin/
 ### 3. Edit your Tor config file, usually located at `/etc/tor/torrc` and 
replace its content with:
 
 ```
-RunAsDaemon 1
 BridgeRelay 1
 
 # Replace "TODO" with a Tor port of your choice.  This port must be externally
diff --git 
a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr 
b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
index e68a4da..16037a4 100644
--- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
@@ -21,7 +21,6 @@ If not, you can [build it from 
source](https://gitlab.com/yawning/obfs4#installa
 ### 3. Edit your Tor config file, usually located at `/etc/tor/torrc` and 
replace its content with:
 
 ```
-RunAsDaemon 1
 BridgeRelay 1
 
 # Replace "TODO" with a Tor port of your choice.  This port must be externally
diff --git 
a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr 
b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr
index 2ec5c8e..78373df 100644
--- a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr
@@ -17,7 +17,6 @@ pkg install obfs4proxy-tor tor ca_root_nss
 ### 2. Edit your Tor config file, usually located at `/usr/local/etc/tor` and 
replace its content with:
 
 ```
-RunAsDaemon 1
 BridgeRelay 1
 
 # Replace "TODO" with a Tor port of your choice.  This port must be externally
diff --git 
a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr 
b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr
index bf7d98a..0a02f9e 100644
--- a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr
@@ -18,7 +18,6 @@ pkg_add tor obfs4proxy
 Usually located at `/etc/tor/torrc`, and replace its content with:
 
 ```
-RunAsDaemon 1
 BridgeRelay 1
 
 # Replace "TODO" with a Tor port of your choice.  This port must be externally



___
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-68.0esr-9.0-3] Bug 1572844 - Consistently check for MOZ_BITS_DOWNLOAD

2019-08-26 Thread gk

commit 39af5f2d4da655d6cb7bb5c411272634a4cdf039
Author: Adam Gashlin 
Date:   Mon Aug 19 15:44:42 2019 -0700

Bug 1572844 - Consistently check for MOZ_BITS_DOWNLOAD
---
 toolkit/components/bitsdownload/components.conf | 2 +-
 toolkit/components/bitsdownload/moz.build   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/bitsdownload/components.conf 
b/toolkit/components/bitsdownload/components.conf
index d8a7b5721e00..fe7090d366be 100644
--- a/toolkit/components/bitsdownload/components.conf
+++ b/toolkit/components/bitsdownload/components.conf
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 Classes = []
-if buildconfig.substs['OS_ARCH'] == 'WINNT' and defined('MOZ_BITS_DOWNLOAD'):
+if defined('MOZ_BITS_DOWNLOAD'):
 Classes += [
 {
 'cid': '{495d6f3d-9748-4d30-8ce5-0290c0001edf}',
diff --git a/toolkit/components/bitsdownload/moz.build 
b/toolkit/components/bitsdownload/moz.build
index 1d3f45937bdb..5f1dc96e9490 100644
--- a/toolkit/components/bitsdownload/moz.build
+++ b/toolkit/components/bitsdownload/moz.build
@@ -14,7 +14,7 @@ XPCOM_MANIFESTS += [
 'components.conf',
 ]
 
-if CONFIG['OS_ARCH'] == 'WINNT':
+if CONFIG['MOZ_BITS_DOWNLOAD']:
   EXPORTS += [
 'Bits.h'
   ]

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

[tor-commits] [bridgedb/develop] Merge branch 'fix/17626' into develop

2019-08-26 Thread phw

commit a65b843dd18d812996035b84952d46ac3dc388de
Merge: d67abc7 4a05867
Author: Philipp Winter 
Date:   Mon Aug 26 14:46:38 2019 -0700

Merge branch 'fix/17626' into develop

 CHANGELOG  |  9 +
 bridgedb/distributors/email/request.py | 21 +++--
 2 files changed, 24 insertions(+), 6 deletions(-)

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

[tor-commits] [bridgedb/develop] Don't interpret quoted text as commands.

2019-08-26 Thread phw

commit 4a0586767f08a3b4ee83b7805fd3cfcf531c245d
Author: Philipp Winter 
Date:   Mon Aug 19 17:05:52 2019 -0700

Don't interpret quoted text as commands.

BridgeDB gets confused when users reply to a "get help" email.  The
issue is that BridgeDB interprets commands anywhere in the email body,
even if it's in quoted text.

To fix this issue, we are ignoring commands whose email body line starts
with a '>' character, which is typically used for email quotes.

This fixes .
---
 CHANGELOG  |  9 +
 bridgedb/distributors/email/request.py | 21 +++--
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index aba6d19..c3073ef 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@
+Changes in version 0.8.1 -
+
+* FIXES https://bugs.torproject.org/17626
+BridgeDB gets confused when users reply to a "get help" email.  The
+issue is that BridgeDB interprets commands anywhere in the email body,
+even if it's in quoted text.  To fix this issue, we are ignoring
+commands whose email body line starts with a '>' character, which is
+typically used for email quotes.
+
 Changes in version 0.8.0 - 2019-08-20
 
 * FIXES https://bugs.torproject.org/9316
diff --git a/bridgedb/distributors/email/request.py 
b/bridgedb/distributors/email/request.py
index a490e56..83c203d 100644
--- a/bridgedb/distributors/email/request.py
+++ b/bridgedb/distributors/email/request.py
@@ -58,6 +58,15 @@ TRANSPORT_PATTERN = re.compile(TRANSPORT_REGEXP)
 UNBLOCKED_REGEXP = ".*unblocked ([a-z]{2,4})"
 UNBLOCKED_PATTERN = re.compile(UNBLOCKED_REGEXP)
 
+#: Regular expressions that we use to match for email commands.  Any command is
+#: valid as long as it wasn't quoted, i.e., the line didn't start with a '>'
+#: character.
+HELP_LINE  = re.compile("([^>].*)?h[ae]lp")
+GET_LINE   = re.compile("([^>].*)?get")
+KEY_LINE   = re.compile("([^>].*)?key")
+IPV6_LINE  = re.compile("([^>].*)?ipv6")
+TRANSPORT_LINE = re.compile("([^>].*)?transport")
+UNBLOCKED_LINE = re.compile("([^>].*)?unblocked")
 
 def determineBridgeRequestOptions(lines):
 """Figure out which :mod:`~bridgedb.filters` to apply, or offer help.
@@ -83,20 +92,20 @@ def determineBridgeRequestOptions(lines):
 if not line: skippedHeaders = True
 if not skippedHeaders: continue
 
-if ("help" in line) or ("halp" in line):
+if HELP_LINE.match(line) is not None:
 raise EmailRequestedHelp("Client requested help.")
 
-if "get" in line:
+if GET_LINE.match(line) is not None:
 request.isValid(True)
 logging.debug("Email request was valid.")
-if "key" in line:
+if KEY_LINE.match(line) is not None:
 request.wantsKey(True)
 raise EmailRequestedKey("Email requested a copy of our GnuPG key.")
-if "ipv6" in line:
+if IPV6_LINE.match(line) is not None:
 request.withIPv6()
-if "transport" in line:
+if TRANSPORT_LINE.match(line) is not None:
 request.withPluggableTransportType(line)
-if "unblocked" in line:
+if UNBLOCKED_LINE.match(line) is not None:
 request.withoutBlockInCountry(line)
 
 logging.debug("Generating hashring filters for request.")



___
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-08-26 Thread translation

commit dcde9f80a23410ca485c08ad415affdbe2784c3b
Author: Translation commit bot 
Date:   Mon Aug 26 21:29:47 2019 +

Update translations for support-portal
---
 contents+ka.po | 4 
 1 file changed, 4 insertions(+)

diff --git a/contents+ka.po b/contents+ka.po
index 7488a8602..6e0c035a1 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -619,6 +619,8 @@ msgid ""
 "gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-8.5.4_en-"
 "US.exe.asc Downloads\torbrowser-install-win64-8.5.4_en-US.exe"
 msgstr ""
+"gpgv --keyring .\tor.keyring Downloads\torbrowser-install-win64-8.5.4_en-"
+"US.exe.asc Downloads\torbrowser-install-win64-8.5.4_en-US.exe"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -6104,6 +6106,8 @@ msgid ""
 "For sharing files over Tor, https://onionshare.org/\;>OnionShare is a good option."
 msgstr ""
+"á¤ááááááá¡ Tor-áá ááá¡ááááá ááááá, 
https://onionshare.org/\;>OnionShare ááá áá 
á¡áá¨á£áááááá."
 
 #: https//support.torproject.org/misc/misc-14/
 #: (content/misc/misc-14/contents+en.lrquestion.title)

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

[tor-commits] [translation/snowflakeaddon-messages.json] Update translations for snowflakeaddon-messages.json

2019-08-26 Thread translation

commit b1a5fa85ea752ef556bf52fc841dd811c9beeb4a
Author: Translation commit bot 
Date:   Mon Aug 26 21:18:32 2019 +

Update translations for snowflakeaddon-messages.json
---
 ka/messages.json | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ka/messages.json b/ka/messages.json
index 31d529a0a..bac94d0b9 100644
--- a/ka/messages.json
+++ b/ka/messages.json
@@ -15,18 +15,18 @@
 "message": "Snowflake ááááá áá£ááá"
   },
   "popupStatusOn": {
-"message": "Number of users currently connected: $1"
+"message": "ááááááá áááááá¨áá ááá£áá 
áááá®ááá ááááááá¡ á áááááááá: $1"
   },
   "popupStatusReady": {
-"message": "Your Snowflake is ready to help users circumvent censorship!"
+"message": "áá¥áááá Snowflake áááááá 
áááá®ááá áá¡ áááá®ááá áááááá¡, 
áªáááá£á áá¡áááá¡ áááá ááá¡ ááááá¨á."
   },
   "popupWebRTCOff": {
 "message": "WebRTC-áá¡ á¨áá¡áá«ááááááá áá 
áá áá¦ááá©ááááá."
   },
   "popupDescOn": {
-"message": "Number of users your Snowflake has helped circumvent 
censorship in the last 24 hours: $1"
+"message": "áááá®ááá ááááááá¡ á 
áááááááá, á áááááááª áá¥áááá Snowflake 
áááá®ááá á áªáááá£á áá¡áááá¡ áááá 
ááá¡ ááááá¨á, áááá 24 á¡áááá¨á: $1"
   },
   "badgeCookiesOff": {
-"message": "Cookies are not enabled."
+"message": "á¤á£ááá£á¨ááá áá áá á©áá 
áá£áá."
   }
 }

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

[tor-commits] [translation/snowflakeaddon-messages.json_completed] Update translations for snowflakeaddon-messages.json_completed

2019-08-26 Thread translation

commit 7b04dc9aad87abb1acdf214a380ed47486284b7a
Author: Translation commit bot 
Date:   Mon Aug 26 21:18:39 2019 +

Update translations for snowflakeaddon-messages.json_completed
---
 ka/messages.json | 22 ++
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/ka/messages.json b/ka/messages.json
index f750e1888..f9de9d4cc 100644
--- a/ka/messages.json
+++ b/ka/messages.json
@@ -1,26 +1,32 @@
 {
   "appDesc": {
-"message": "Snowflake áá áá¡ WebRTC-á¡áá®áá¡ 
ááá¡ááá áááááá áááááá§áááá 
Tor-áá¡áááá¡."
+"message": "Snowflake is a WebRTC pluggable transport for Tor."
   },
   "popupTurnOn": {
-"message": "á©áá ááá"
+"message": "Turn On"
   },
   "popupTurnOff": {
-"message": "ááááá ááá"
+"message": "Turn Off"
   },
   "popupLearnMore": {
-"message": "áá®áááá áá áªááá"
+"message": "Learn more"
   },
   "popupStatusOff": {
-"message": "Snowflake ááááá áá£ááá"
+"message": "Snowflake is off"
   },
   "popupStatusOn": {
-"message": "$1 áááááá¢áá áááááá¨áá 
ááá£áá."
+"message": "Number of users currently connected: $1"
+  },
+  "popupStatusReady": {
+"message": "Your Snowflake is ready to help users circumvent censorship!"
   },
   "popupWebRTCOff": {
-"message": "WebRTC-áá¡ á¨áá¡áá«ááááááá áá 
áá áá¦ááá©ááááá."
+"message": "WebRTC feature is not detected."
   },
   "popupDescOn": {
-"message": "áá¥áááá Snowflake áááá®ááá á $1 
áááá®ááá ááááá¡ áªáááá£á áá¡áááá¡ 
áááá ááá¡ ááááá¨á, áááá 24 á¡áááá¨á."
+"message": "Number of users your Snowflake has helped circumvent 
censorship in the last 24 hours: $1"
+  },
+  "badgeCookiesOff": {
+"message": "Cookies are not enabled."
   }
 }

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

[tor-commits] [translation/orfox-stringsxml] Update translations for orfox-stringsxml

2019-08-26 Thread translation

commit c799b231e244b24cd4babd86a1370d7ca5298b72
Author: Translation commit bot 
Date:   Mon Aug 26 19:48:27 2019 +

Update translations for orfox-stringsxml
---
 ta/strings.xml | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ta/strings.xml b/ta/strings.xml
index cb5acbb4f..974388f62 100644
--- a/ta/strings.xml
+++ b/ta/strings.xml
@@ -1,2 +1,9 @@
 
-
+Orfoxà®µà®¾à®´à®¿
+Tor à®à®²à®¾à®µà®¿à®¯à¯ 
à®®à¯à®¯à®²à¯à®
+Orfox à®à®ªà¯à®ªà¯à®´à¯à®¤à¯ 
à®à®£à¯à®à¯à®°à®¾à®¯à¯à®à¯à®à¯à®à®¾à®© Tor 
à®à®²à®¾à®µà®¿à®¯à®¾à®à®¿à®¯à¯à®³à¯à®³à®¤à¯.
+à®à®à¯à®à®³à¯ à®µà®¿à®°à¯à®ªà¯à®ªà®®à®¾à®© 
à®®à¯à®²à®¤à¯à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®à®¤à¯à®ªà¯ 
à®ªà¯à®±à¯à®
+F-DROID à®à¯à®à¯à®à¯ 
à®à¯à®²à¯à®
+à®à¯à®à¯à®³à¯ 
à®ªà®¿à®³à¯à®µà¯à®à¯à®à¯à®à¯ à®à¯à®²à¯à®
+.APK à®µà¯ 
à®ªà®¤à®¿à®µà®¿à®±à®à¯à®à¯à®
+

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

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

2019-08-26 Thread translation

commit 0d516104e2ad4894e92fd41d78a0be30cc454cb4
Author: Translation commit bot 
Date:   Mon Aug 26 19:28:19 2019 +

Update translations for torcheck
---
 ta/torcheck.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ta/torcheck.po b/ta/torcheck.po
index a3bd9e43e..a2e447d2e 100644
--- a/ta/torcheck.po
+++ b/ta/torcheck.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2019-08-26 18:57+\n"
+"PO-Revision-Date: 2019-08-26 19:11+\n"
 "Last-Translator: Stymy RAT\n"
 "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n"
 "MIME-Version: 1.0\n"
@@ -45,7 +45,7 @@ msgid ""
 "href=\"https://www.torproject.org/\;>Tor website and specifically the https://support.torproject.org/#faq\;>frequently asked "
 "questions."
-msgstr ""
+msgstr " à®¨à¯à®à¯à®à®³à¯ Tor à®à®¿à®³à¯à®¯à®©à¯à®à¯à®ªà¯ 
à®ªà®¯à®©à¯à®ªà®à¯à®¤à¯à®¤ à®®à¯à®±à¯à®ªà®à¯à®à®¾à®²à¯, à®¤à®¯à®µà¯ 
à®à¯à®¯à¯à®¤à¯ https://www.torproject.org/\;>Tor 
à®µà®²à¯à®¤à®³à®¤à¯à®¤à¯à®¯à¯à®®à¯ à®à¯à®±à®¿à®ªà¯à®ªà®¾à® https://support.torproject.org/#faq\;>à®à®à®¿à®à¯à®à®à®¿ 
à®à¯à®à¯à®à®ªà¯à®ªà®à¯à®®à¯ à®à¯à®³à¯à®µà®¿à®à®³à¯ 
à®ªà®à¯à®¤à®¿à®¯à¯à®¯à¯à®®à¯ à®à®²à¯à®à®¿à®à¯à®à®µà¯à®®à¯."
 
 msgid "Sorry, your query failed or an unexpected response was received."
 msgstr "à®®à®©à¯à®©à®¿à®à¯à®à®µà¯à®®à¯, à®à®à¯à®à®³à¯ 
à®à¯à®³à¯à®µà®¿ à®¤à¯à®¾à®²à¯à®µà®¿à®¯à®à¯à®¨à¯à®¤à®¤à¯ à®
à®²à¯à®²à®¤à¯ à®à®¤à®¿à®°à¯à®ªà®¾à®°à®¾à®¤ à®ªà®¤à®¿à®²à¯ 
à®ªà¯à®±à®ªà¯à®ªà®à¯à®à®¤à¯."

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

[tor-commits] [translation/torbutton-securitylevelproperties] Update translations for torbutton-securitylevelproperties

2019-08-26 Thread translation

commit df8df5e4a37210b331a70e1704c2ce47d2c30575
Author: Translation commit bot 
Date:   Mon Aug 26 19:28:08 2019 +

Update translations for torbutton-securitylevelproperties
---
 ta/securitylevel.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ta/securitylevel.properties b/ta/securitylevel.properties
index c81c1c4c2..a2eefc5f7 100644
--- a/ta/securitylevel.properties
+++ b/ta/securitylevel.properties
@@ -1,17 +1,17 @@
 securityLevel.securityLevel = à®¤à®©à®¿à®à¯ à®¨à®¿à®²à¯
 securityLevel.customWarning = à®µà®¿à®°à¯à®ªà¯à®ª
-securityLevel.overview = Disable certain web features that can be used to 
attack your security and anonymity.
+securityLevel.overview = à®à®à¯à®à®³à¯ 
à®ªà®¾à®¤à¯à®à®¾à®ªà¯à®ªà¯à®¯à¯à®®à¯ 
à®ªà¯à®¯à®°à®¿à®²à¯à®²à®¾à®¨à®¿à®²à¯à®¯à¯à®¯à¯à®®à¯ à®¤à®¾à®à¯à®à®ªà¯ 
à®ªà®¯à®©à¯à®ªà®à®à¯à®à¯à®à®¿à®¯ à®à®¿à®² à®à®£à¯à®¯à®ªà¯ 
à®ªà®£à¯à®ªà¯à®à®³à¯à®à¯ à®à¯à®¯à®²à®¿à®´à®à¯à®à®à¯ 
à®à¯à®¯à¯à®.
 securityLevel.standard.level = à®µà®´à®à¯à®à®®à®¾à®©
-securityLevel.standard.tooltip = Security Level : Standard
+securityLevel.standard.tooltip = à®ªà®¾à®¤à¯à®à®¾à®ªà¯à®ªà¯ à®¨à®¿à®²à¯: 
à®à®¯à®²à¯à®¤à®°à®¨à®¿à®²à¯
 securityLevel.standard.summary = à®à®²à¯à®²à®¾ Tor à®à®²à®¾à®µà®¿ 
à®®à®±à¯à®±à¯à®®à¯ à®µà®²à¯à®¤à¯à®¤à®³ à®à®®à¯à®à®à¯à®à®³à¯à®®à¯ 
à®à¯à®¯à®²à¯à®ªà®à¯à®¤à¯à®¤à®ªà¯à®ªà®à¯à®à®¿à®©à¯à®±à®©.
 securityLevel.safer.level = à®ªà®¾à®¤à¯à®à®¾à®ªà¯à®ªà®¾à®©
-securityLevel.safer.tooltip = Security Level : Safer
+securityLevel.safer.tooltip = à®ªà®¾à®¤à¯à®à®¾à®ªà¯à®ªà¯ à®¨à®¿à®²à¯: 
à®ªà®¾à®¤à¯à®à®¾à®ªà¯à®ªà®¾à®© à®¨à®¿à®²à¯
 securityLevel.safer.summary = à®ªà¯à®°à¯à®®à¯à®ªà®¾à®²à¯à®®à¯ 
à®à®ªà®¤à¯à®¤à®¾à®à®à¯à®à¯à®à®¿à®¯ à®µà®²à¯à®¤à¯à®¤à®³ à®
à®®à¯à®à®à¯à®à®³à¯ à®à¯à®¯à®²à¯à®¨à¯à®à¯à®à¯à®à®¿à®±à®¤à¯, 
à®à®¤à®©à®¾à®²à¯ à®à®¿à®² à®¤à®³à®à¯à®à®³à¯ à®à¯à®¯à®²à¯à®ªà®¾à®à¯ 
à®à®´à®à¯à®à®²à®¾à®®à¯.
 securityLevel.safer.description1 = HTTPS à®à®²à¯à®²à®¾à®¤ 
à®¤à®³à®à¯à®à®³à®¿à®²à¯ à®¯à®¾à®µà®¾à®à®¿à®±à®¿à®à¯à®à¯ 
à®à¯à®¯à®²à¯à®¨à¯à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®¤à¯.
 securityLevel.safer.description2 = à®à®¿à®² à®à®´à¯à®¤à¯à®¤à¯à®à®³à¯ 
à®®à®±à¯à®±à¯à®®à¯ à®à®£à®¿à®¤ à®à®à¯à®¯à®¾à®³à®à¯à®à®³à¯ 
à®à¯à®¯à®²à¯à®¨à¯à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®©.
 securityLevel.safer.description3 = à®à¯à®µà¯à®µà®¿à®¯à®®à¯à®®à¯ 
à®µà®¿à®´à®¿à®¯à®®à¯à®®à¯ (HTML5 à®à®à®à®®à¯) WebGL-à®à®®à¯ 
à®à®¯à®à¯à®-à®à¯à®à¯à®à¯à® à®à®©à¯à®±à®µà®¾à®±à¯ à®à®³à¯à®³à®©
 securityLevel.safest.level = à®®à®¿à® à®ªà®¾à®¤à¯à®à®¾à®ªà¯à®ªà®¾à®©
-securityLevel.safest.tooltip = Security Level : Safest
+securityLevel.safest.tooltip = à®ªà®¾à®¤à¯à®à®¾à®ªà¯à®ªà¯ à®¨à®¿à®²à¯: 
à®®à®¿à®à®ªà¯à®ªà®¾à®¤à¯à®à®¾à®ªà¯à®ªà®¾à®© à®¨à®¿à®²à¯
 securityLevel.safest.summary = à®¨à®¿à®²à¯à®¯à®¾à®© à®¤à®³à®®à¯ 
à®®à®±à¯à®±à¯à®®à¯ à®à®à®¿à®ªà¯à®ªà®à¯ 
à®à¯à®µà¯à®à®³à¯à®à¯à®à¯à®¤à¯ à®¤à¯à®µà¯à®¯à®¾à®© 
à®µà®²à¯à®¤à¯à®¤à®³ à®à®®à¯à®à®à¯à®à®³à¯ à®®à®à¯à®à¯à®®à¯ à®
à®©à¯à®®à®¤à®¿à®à¯à®à®¿à®±à®¤à¯. à®à®¨à¯à®¤ 
à®®à®¾à®±à¯à®±à®à¯à®à®³à¯ à®ªà®à®à¯à®à®³à¯, à®à®à®à®®à¯, 
à®®à®±à¯à®±à¯à®®à¯ à®à®¿à®±à¯à®¨à®¿à®°à®²à¯à®à®³à¯à®ªà¯ 
à®ªà®¾à®¤à®¿à®à¯à®à®²à®¾à®®à¯.
 securityLevel.safest.description1 = à®¯à®¾à®µà®¾à®à®¿à®±à®¿à®à¯à®à¯ 
à®à®²à¯à®²à®¾ à®¤à®³à®à¯à®à®³à®¿à®²à¯à®®à¯ 
à®à®¯à®²à¯à®¨à®¿à®²à¯à®¯à®¾à® 
à®à¯à®¯à®²à¯à®¨à¯à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®¤à¯.
 securityLevel.safest.description2 = à®à®¿à®² à®à®´à¯à®¤à¯à®¤à¯à®à®³à¯, 
à®à®¿à®©à¯à®©à®à¯à®à®³à¯, à®à®£à®¿à®¤ à®à®à¯à®¯à®¾à®³à®à¯à®à®³à¯, 
à®®à®±à¯à®±à¯à®®à¯ à®ªà®à®à¯à®à®³à¯ 
à®à¯à®¯à®²à¯à®¨à¯à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®©.
@@ -19,4 +19,4 @@ securityLevel.safest.description3 = à®à®²à®¿ 
à®®à®±à¯à®±à¯à®®à¯ à®à®¾à®£à¯
 securityLevel.custom.summary = à®à®à¯à®à®³à¯ à®¤à®©à®¿à®ªà¯à®ªà®¯à®©à¯ 
à®à®²à®¾à®µà®¿ à®®à¯à®©à¯à®©à¯à®°à®¿à®®à¯à®à®³à¯ 
à®µà®´à®®à¯à®¯à®²à¯à®²à®¾à®¤ à®ªà®¾à®¤à¯à®à®¾à®ªà¯à®ªà¯ à®
à®®à¯à®ªà¯à®ªà¯à®à®³à¯à®à¯à®à¯ 
à®à®¾à®°à®£à®®à®¾à®à®¿à®µà®¿à®à¯à®à®¤à¯. à®ªà®¾à®¤à¯à®à®¾à®ªà¯à®ªà¯ 
à®®à®±à¯à®±à¯à®®à¯ à®¤à®©à®¿à®¯à¯à®°à®¿à®®à¯ 
à®à®¾à®°à®£à®à¯à®à®³à¯à®à¯à®à®¾à®, à®¨à¯à®à¯à®à®³à¯ 
à®à®¯à®²à¯à®ªà¯ à®ªà®¾à®¤à¯à®à®¾à®ªà¯à®ªà¯ à®¨à®¿à®²à¯à®à®³à®¿à®²à¯ 
à®à®©à¯à®±à¯à®¤à¯ à®¤à¯à®°à¯à®¨à¯à®¤à¯à®à¯à®à¯à®à¯à®®à®¾à®±à¯ 
à®ªà®°à®¿à®¨à¯à®¤à¯à®°à¯à®à¯à®à®¿à®±à¯à®®à¯.
 securityLevel.learnMore = à®®à¯à®²à¯à®®à¯ à®à®±à®¿à®¯
 securityLevel.restoreDefaults = Restore Defaults
-securityLevel.advancedSecuritySettings = Advanced Security Settingsâ¦
+securityLevel.advancedSecuritySettings = à®®à¯à®®à¯à®ªà®à¯à®à®ªà¯ 
à®ªà®¾à®¤à¯à®à®¾à®ªà¯à®ªà¯ à®à®®à¯à®ªà¯à®ªà¯à®à®³à¯...

[tor-commits] [snowflake/master] remove exclamation mark. ref https://grammar.yourdictionary.com/punctuation/when/when-to-use-exclamation-marks.html

2019-08-26 Thread arlo

commit ea442141db4cf1451870124d9f1cc8916a82853a
Author: emma peel 
Date:   Fri Aug 23 12:15:45 2019 +

remove exclamation mark. ref 
https://grammar.yourdictionary.com/punctuation/when/when-to-use-exclamation-marks.html
---
 proxy/static/_locales/en_US/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxy/static/_locales/en_US/messages.json 
b/proxy/static/_locales/en_US/messages.json
index f9de9d4..f6ed740 100644
--- a/proxy/static/_locales/en_US/messages.json
+++ b/proxy/static/_locales/en_US/messages.json
@@ -18,7 +18,7 @@
 "message": "Number of users currently connected: $1"
   },
   "popupStatusReady": {
-"message": "Your Snowflake is ready to help users circumvent censorship!"
+"message": "Your Snowflake is ready to help users circumvent censorship"
   },
   "popupWebRTCOff": {
 "message": "WebRTC feature is not detected."

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

[tor-commits] [snowflake/master] Add branch to .gitmodule + bump to bbf11bb

2019-08-26 Thread arlo

commit 131cf4f8ea0faaa41774e52f5d81878803f45dbc
Author: Arlo Breault 
Date:   Mon Aug 26 12:09:41 2019 -0400

Add branch to .gitmodule + bump to bbf11bb

This allows you to run `git submodule update --remote` to bump to the
latest commit on that branch.
---
 .gitmodules   | 1 +
 proxy/translation | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index c217344..5f79304 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "proxy/translation"]
path = proxy/translation
url = https://git.torproject.org/translation.git
+   branch = snowflakeaddon-messages.json_completed
diff --git a/proxy/translation b/proxy/translation
index 75d3b03..bbf11bb 16
--- a/proxy/translation
+++ b/proxy/translation
@@ -1 +1 @@
-Subproject commit 75d3b037adf2041b772265e7c1d4e7b3091bc5b8
+Subproject commit bbf11bb0c9f1aca4f6b18c6505645f85e2fa1986

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

[tor-commits] [snowflake/master] Get badge locale from navigator.language

2019-08-26 Thread arlo

commit 1e33ae830f739a7d61e03ea1626f5e71ba175cbc
Author: Arlo Breault 
Date:   Thu Aug 15 17:32:21 2019 -0400

Get badge locale from navigator.language
---
 proxy/init-badge.js | 23 +--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/proxy/init-badge.js b/proxy/init-badge.js
index b906f62..1acc923 100644
--- a/proxy/init-badge.js
+++ b/proxy/init-badge.js
@@ -82,6 +82,26 @@ function setSnowflakeCookie(val, expires) {
   document.cookie = `${COOKIE_NAME}=${val}; path=/; expires=${expires};`;
 }
 
+const defaultLang = 'en_US';
+const availableLangs = new Set([
+  'en_US',
+]);
+
+// Resolve as in,
+// 
https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Internationalization#Localized_string_selection
+function getLang() {
+  let lang = navigator.language || defaultLang;
+  lang = lang.replace(/-/g, '_');
+  if (availableLangs.has(lang)) {
+return lang;
+  }
+  lang = lang.split('_')[0];
+  if (availableLangs.has(lang)) {
+return lang;
+  }
+  return defaultLang;
+}
+
 var debug, snowflake, config, broker, ui, log, dbg, init, update, 
silenceNotifications, query;
 
 (function() {
@@ -171,8 +191,7 @@ var debug, snowflake, config, broker, ui, log, dbg, init, 
update, silenceNotific
   };
 
   window.onload = function() {
-const lang = 'en_US';
-fetch(`./_locales/${lang}/messages.json`)
+fetch(`./_locales/${getLang()}/messages.json`)
 .then((res) => {
   if (!res.ok) { return; }
   return res.json();



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

[tor-commits] [snowflake/master] Automate generating the list of available languages for the badge

2019-08-26 Thread arlo

commit 1c550599b8239161fe8ea2bb8bb2541225770453
Author: Arlo Breault 
Date:   Thu Aug 22 12:28:26 2019 -0400

Automate generating the list of available languages for the badge

Note that getMessage in the badge depends on having a complete set of
translations, unlike the webextension, which will fallback to the
default for a string.
---
 proxy/init-badge.js |  5 +
 proxy/make.js   | 27 ++-
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/proxy/init-badge.js b/proxy/init-badge.js
index 1acc923..ed6dee9 100644
--- a/proxy/init-badge.js
+++ b/proxy/init-badge.js
@@ -1,4 +1,4 @@
-/* global Util, Params, Config, UI, Broker, Snowflake, Popup, Parse */
+/* global Util, Params, Config, UI, Broker, Snowflake, Popup, Parse, 
availableLangs */
 
 /*
 UI
@@ -83,9 +83,6 @@ function setSnowflakeCookie(val, expires) {
 }
 
 const defaultLang = 'en_US';
-const availableLangs = new Set([
-  'en_US',
-]);
 
 // Resolve as in,
 // 
https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Internationalization#Localized_string_selection
diff --git a/proxy/make.js b/proxy/make.js
index 2aa0bf4..928c9ba 100755
--- a/proxy/make.js
+++ b/proxy/make.js
@@ -2,6 +2,7 @@
 
 /* global require, process */
 
+var { writeFileSync, readdirSync, statSync } = require('fs');
 var { execSync, spawn } = require('child_process');
 
 // All files required.
@@ -36,9 +37,11 @@ var SHARED_FILES = [
   '_locales',
 ];
 
-var concatJS = function(outDir, init, outFile) {
+var concatJS = function(outDir, init, outFile, pre) {
   var files = FILES.concat(`init-${init}.js`);
-  execSync(`cat ${files.join(' ')} > ${outDir}/${outFile}`);
+  var outPath = `${outDir}/${outFile}`;
+  writeFileSync(outPath, pre, 'utf8');
+  execSync(`cat ${files.join(' ')} >> ${outPath}`);
 };
 
 var copyTranslations = function(outDir) {
@@ -46,6 +49,20 @@ var copyTranslations = function(outDir) {
   execSync(`cp -rf translation/* ${outDir}/_locales/`);
 };
 
+var availableLangs = function() {
+  let out = "const availableLangs = new Set([\n";
+  let dirs = readdirSync('translation').filter((f) => {
+ const s = statSync(`translation/${f}`);
+ return s.isDirectory();
+  });
+  dirs.push('en_US');
+  dirs.sort();
+  dirs = dirs.map(d => `  '${d}',`);
+  out += dirs.join("\n");
+  out += "\n]);\n\n";
+  return out;
+};
+
 var tasks = new Map();
 
 var task = function(key, msg, func) {
@@ -76,7 +93,7 @@ task('build', 'build the snowflake proxy', function() {
   execSync(`rm -rf ${outDir}`);
   execSync(`cp -r ${STATIC}/ ${outDir}/`);
   copyTranslations(outDir);
-  concatJS(outDir, 'badge', 'embed.js');
+  concatJS(outDir, 'badge', 'embed.js', availableLangs());
   console.log('Snowflake prepared.');
 });
 
@@ -85,13 +102,13 @@ task('webext', 'build the webextension', function() {
   execSync(`git clean -f -x -d ${outDir}/`);
   execSync(`cp -r ${STATIC}/{${SHARED_FILES.join(',')}} ${outDir}/`, { shell: 
'/bin/bash' });
   copyTranslations(outDir);
-  concatJS(outDir, 'webext', 'snowflake.js');
+  concatJS(outDir, 'webext', 'snowflake.js', '');
   console.log('Webextension prepared.');
 });
 
 task('node', 'build the node binary', function() {
   execSync('mkdir -p build');
-  concatJS('build', 'node', 'snowflake.js');
+  concatJS('build', 'node', 'snowflake.js', '');
   console.log('Node prepared.');
 });
 



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

[tor-commits] [snowflake/master] Copy completed translations over when building

2019-08-26 Thread arlo

commit 9c20ab398484301a8eb2b45db2aa2320a0b44b40
Author: Arlo Breault 
Date:   Thu Aug 22 11:23:15 2019 -0400

Copy completed translations over when building
---
 proxy/make.js | 24 
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/proxy/make.js b/proxy/make.js
index 58b7fce..2aa0bf4 100755
--- a/proxy/make.js
+++ b/proxy/make.js
@@ -37,11 +37,15 @@ var SHARED_FILES = [
 ];
 
 var concatJS = function(outDir, init, outFile) {
-  var files;
-  files = FILES.concat(`init-${init}.js`);
+  var files = FILES.concat(`init-${init}.js`);
   execSync(`cat ${files.join(' ')} > ${outDir}/${outFile}`);
 };
 
+var copyTranslations = function(outDir) {
+  execSync('git submodule update --init -- translation')
+  execSync(`cp -rf translation/* ${outDir}/_locales/`);
+};
+
 var tasks = new Map();
 
 var task = function(key, msg, func) {
@@ -68,16 +72,20 @@ task('test', 'snowflake unit tests', function() {
 });
 
 task('build', 'build the snowflake proxy', function() {
-  execSync('rm -rf build');
-  execSync('cp -r ' + STATIC + '/ build/');
-  concatJS('build', 'badge', 'embed.js');
+  const outDir = 'build';
+  execSync(`rm -rf ${outDir}`);
+  execSync(`cp -r ${STATIC}/ ${outDir}/`);
+  copyTranslations(outDir);
+  concatJS(outDir, 'badge', 'embed.js');
   console.log('Snowflake prepared.');
 });
 
 task('webext', 'build the webextension', function() {
-  execSync('mkdir -p webext');
-  execSync(`cp -r ${STATIC}/{${SHARED_FILES.join(',')}} webext/`, { shell: 
'/bin/bash' });
-  concatJS('webext', 'webext', 'snowflake.js');
+  const outDir = 'webext';
+  execSync(`git clean -f -x -d ${outDir}/`);
+  execSync(`cp -r ${STATIC}/{${SHARED_FILES.join(',')}} ${outDir}/`, { shell: 
'/bin/bash' });
+  copyTranslations(outDir);
+  concatJS(outDir, 'webext', 'snowflake.js');
   console.log('Webextension prepared.');
 });
 



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

[tor-commits] [snowflake/master] Bump proxy/translation to HEAD of snowflakeaddon-messages.json_completed

2019-08-26 Thread arlo

commit 9faf8293e6614d559758fcd1fa4a76419f92dd55
Author: Arlo Breault 
Date:   Fri Aug 23 21:54:56 2019 -0400

Bump proxy/translation to HEAD of snowflakeaddon-messages.json_completed
---
 proxy/translation | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxy/translation b/proxy/translation
index b4ac40c..75d3b03 16
--- a/proxy/translation
+++ b/proxy/translation
@@ -1 +1 @@
-Subproject commit b4ac40c1c71c691864388257c82bdeb881501c9e
+Subproject commit 75d3b037adf2041b772265e7c1d4e7b3091bc5b8



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

[tor-commits] [snowflake/master] Add translation submodule

2019-08-26 Thread arlo

commit a0dd3d9edcd9421ac82f33960815e5fab7d00d53
Author: Arlo Breault 
Date:   Thu Aug 22 10:52:57 2019 -0400

Add translation submodule

At the head of the snowflakeaddon-messages.json_completed branch
---
 .gitmodules   | 3 +++
 proxy/translation | 1 +
 2 files changed, 4 insertions(+)

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000..c217344
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "proxy/translation"]
+   path = proxy/translation
+   url = https://git.torproject.org/translation.git
diff --git a/proxy/translation b/proxy/translation
new file mode 16
index 000..b4ac40c
--- /dev/null
+++ b/proxy/translation
@@ -0,0 +1 @@
+Subproject commit b4ac40c1c71c691864388257c82bdeb881501c9e



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

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

2019-08-26 Thread translation

commit 2ed4dd4338f2497f518584820acf7ec935a805eb
Author: Translation commit bot 
Date:   Mon Aug 26 18:58:25 2019 +

Update translations for torcheck
---
 ta/torcheck.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ta/torcheck.po b/ta/torcheck.po
index baa305ca9..a3bd9e43e 100644
--- a/ta/torcheck.po
+++ b/ta/torcheck.po
@@ -4,13 +4,14 @@
 # Translators:
 # Arun M S , 2015
 # git12a , 2015
+# Stymy RAT, 2019
 # Khaleel Jageer , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2019-04-09 01:51+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-08-26 18:57+\n"
+"Last-Translator: Stymy RAT\n"
 "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,7 +35,7 @@ msgstr "Tor à®à®²à®¾à®µà®¿à®à¯à®à¯ à®à®°à¯ 
à®ªà®¾à®¤à¯à®à®¾à®ªà¯à®ªà¯
 msgid ""
 "https://www.torproject.org/download/\;>Click here to go to the "
 "download page"
-msgstr ""
+msgstr "https://www.torproject.org/download/\;>à®ªà®¤à®¿à®µà®¿à®±à®à¯à®à¯ 
à®ªà®à¯à®à®¤à¯à®¤à®¿à®±à¯à®à¯à®à¯ à®à¯à®²à¯à®² à®à®à¯à®à¯ 
à®à®¿à®³à®¿à®à¯ à®à¯à®¯à¯à®"
 
 msgid "Sorry. You are not using Tor."
 msgstr "à®®à®©à¯à®©à®¿à®à¯à®à®µà¯à®®à¯. à®¨à¯à®à¯à®à®³à¯ Tor 
à®ªà®¯à®©à¯à®ªà®à¯à®¤à¯à®¤à®µà®¿à®²à¯à®²à¯."
@@ -91,7 +92,7 @@ msgid "Run a Relay"
 msgstr "à®à®°à¯ à®°à®¿à®²à¯ à®à®¯à®à¯à®à®µà¯à®®à¯"
 
 msgid "Stay Anonymous"
-msgstr "à®à®¨à®¾à®®à®¤à¯à®¯à®®à®¾à® à®à®°à¯à®©à¯à®à®²à¯"
+msgstr "à®à®¨à®¾à®®à®¤à¯à®¯à®®à®¾à® à®à®°à¯à®à¯à®à®³à¯"
 
 msgid "Relay Search"
-msgstr ""
+msgstr "à®à®à¯à®®à®¾à®±à¯à®±à¯à®¤à¯ à®¤à¯à®à®²à¯"

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

[tor-commits] [translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd

2019-08-26 Thread translation

commit 6afffebd013c9678e1aab40851c52e3a01f80cbe
Author: Translation commit bot 
Date:   Mon Aug 26 18:57:50 2019 +

Update translations for torbutton-abouttbupdatedtd
---
 ta/abouttbupdate.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ta/abouttbupdate.dtd b/ta/abouttbupdate.dtd
index 72252229b..6ad7d2828 100644
--- a/ta/abouttbupdate.dtd
+++ b/ta/abouttbupdate.dtd
@@ -1,8 +1,8 @@
-
+
 
 
 
 
 
-
-
+
+

___
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-08-26 Thread translation

commit 51b5b92eb53ea72d9339203b5f93409f5ab8c93c
Author: Translation commit bot 
Date:   Mon Aug 26 18:45:05 2019 +

Update translations for abouttor-homepage
---
 ta/aboutTor.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ta/aboutTor.dtd b/ta/aboutTor.dtd
index 630f3fb5c..7d4482424 100644
--- a/ta/aboutTor.dtd
+++ b/ta/aboutTor.dtd
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -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] Fix a memory-leak warning in test_circuitbuid.c

2019-08-26 Thread dgoulet

commit 0bf980705ec3e5a01197615619d62091d1e1f9c8
Author: Nick Mathewson 
Date:   Mon Aug 19 16:21:55 2019 -0400

Fix a memory-leak warning in test_circuitbuid.c

Coverity wants us to free everything that we are potentially
allocating, even stuff where allocating it would be a bug.  Adding
a smartlist_free() here will fix the warning.

Fixes bug 31452; bugfix on 16a0b7ed6779bf72a8a471c, which is not in
any released Tor.  This is CID 1447292.
---
 src/test/test_circuitbuild.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/test_circuitbuild.c b/src/test/test_circuitbuild.c
index 196d8cd35..7291e04d6 100644
--- a/src/test/test_circuitbuild.c
+++ b/src/test/test_circuitbuild.c
@@ -167,6 +167,7 @@ test_upgrade_from_guard_wait(void *arg)
   tt_assert(!list);
 
  done:
+  smartlist_free(list);
   circuit_free(circ);
   entry_guard_free_(guard);
 }



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

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1239'

2019-08-26 Thread dgoulet

commit d819dfbdede4aafe78b61c02ad8d712fc9e4fc72
Merge: 859514d47 0bf980705
Author: David Goulet 
Date:   Mon Aug 26 14:35:27 2019 -0400

Merge branch 'tor-github/pr/1239'

 src/test/test_circuitbuild.c | 1 +
 1 file changed, 1 insertion(+)

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

[tor-commits] [translation/torbutton-securitylevelproperties] Update translations for torbutton-securitylevelproperties

2019-08-26 Thread translation

commit 203ec434f325217e4782884c65fa1cc2fd38cfbb
Author: Translation commit bot 
Date:   Mon Aug 26 18:27:45 2019 +

Update translations for torbutton-securitylevelproperties
---
 ta/securitylevel.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ta/securitylevel.properties b/ta/securitylevel.properties
index 783fc3f75..c81c1c4c2 100644
--- a/ta/securitylevel.properties
+++ b/ta/securitylevel.properties
@@ -9,7 +9,7 @@ securityLevel.safer.tooltip = Security Level : Safer
 securityLevel.safer.summary = à®ªà¯à®°à¯à®®à¯à®ªà®¾à®²à¯à®®à¯ 
à®à®ªà®¤à¯à®¤à®¾à®à®à¯à®à¯à®à®¿à®¯ à®µà®²à¯à®¤à¯à®¤à®³ à®
à®®à¯à®à®à¯à®à®³à¯ à®à¯à®¯à®²à¯à®¨à¯à®à¯à®à¯à®à®¿à®±à®¤à¯, 
à®à®¤à®©à®¾à®²à¯ à®à®¿à®² à®¤à®³à®à¯à®à®³à¯ à®à¯à®¯à®²à¯à®ªà®¾à®à¯ 
à®à®´à®à¯à®à®²à®¾à®®à¯.
 securityLevel.safer.description1 = HTTPS à®à®²à¯à®²à®¾à®¤ 
à®¤à®³à®à¯à®à®³à®¿à®²à¯ à®¯à®¾à®µà®¾à®à®¿à®±à®¿à®à¯à®à¯ 
à®à¯à®¯à®²à¯à®¨à¯à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®¤à¯.
 securityLevel.safer.description2 = à®à®¿à®² à®à®´à¯à®¤à¯à®¤à¯à®à®³à¯ 
à®®à®±à¯à®±à¯à®®à¯ à®à®£à®¿à®¤ à®à®à¯à®¯à®¾à®³à®à¯à®à®³à¯ 
à®à¯à®¯à®²à¯à®¨à¯à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®©.
-securityLevel.safer.description3 = Audio and video (HTML5 media), and WebGL 
are click-to-play.
+securityLevel.safer.description3 = à®à¯à®µà¯à®µà®¿à®¯à®®à¯à®®à¯ 
à®µà®¿à®´à®¿à®¯à®®à¯à®®à¯ (HTML5 à®à®à®à®®à¯) WebGL-à®à®®à¯ 
à®à®¯à®à¯à®-à®à¯à®à¯à®à¯à® à®à®©à¯à®±à®µà®¾à®±à¯ à®à®³à¯à®³à®©
 securityLevel.safest.level = à®®à®¿à® à®ªà®¾à®¤à¯à®à®¾à®ªà¯à®ªà®¾à®©
 securityLevel.safest.tooltip = Security Level : Safest
 securityLevel.safest.summary = à®¨à®¿à®²à¯à®¯à®¾à®© à®¤à®³à®®à¯ 
à®®à®±à¯à®±à¯à®®à¯ à®à®à®¿à®ªà¯à®ªà®à¯ 
à®à¯à®µà¯à®à®³à¯à®à¯à®à¯à®¤à¯ à®¤à¯à®µà¯à®¯à®¾à®© 
à®µà®²à¯à®¤à¯à®¤à®³ à®à®®à¯à®à®à¯à®à®³à¯ à®®à®à¯à®à¯à®®à¯ à®
à®©à¯à®®à®¤à®¿à®à¯à®à®¿à®±à®¤à¯. à®à®¨à¯à®¤ 
à®®à®¾à®±à¯à®±à®à¯à®à®³à¯ à®ªà®à®à¯à®à®³à¯, à®à®à®à®®à¯, 
à®®à®±à¯à®±à¯à®®à¯ à®à®¿à®±à¯à®¨à®¿à®°à®²à¯à®à®³à¯à®ªà¯ 
à®ªà®¾à®¤à®¿à®à¯à®à®²à®¾à®®à¯.

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

[tor-commits] [translation/torbutton-torbuttondtd_completed] Update translations for torbutton-torbuttondtd_completed

2019-08-26 Thread translation

commit 92550e763e82507c2952874c2b02ba5c9092aab2
Author: Translation commit bot 
Date:   Mon Aug 26 18:27:12 2019 +

Update translations for torbutton-torbuttondtd_completed
---
 ta/torbutton.dtd | 82 
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/ta/torbutton.dtd b/ta/torbutton.dtd
index 12039c6de..4a80e6d6c 100644
--- a/ta/torbutton.dtd
+++ b/ta/torbutton.dtd
@@ -1,41 +1,41 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2019-08-26 Thread translation

commit 6b2d65390243852cca251cacaf158f6d1cc414f9
Author: Translation commit bot 
Date:   Mon Aug 26 18:27:06 2019 +

Update translations for torbutton-torbuttondtd
---
 ta/torbutton.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ta/torbutton.dtd b/ta/torbutton.dtd
index 12039c6de..6562fca83 100644
--- a/ta/torbutton.dtd
+++ b/ta/torbutton.dtd
@@ -36,6 +36,6 @@
 
 
 
-
+
 
 

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

[tor-commits] [gettor/master] Add script to fetch and update tor browser releases to gitlab and github

2019-08-26 Thread hiro

commit bf233f90d476f2da182687418ef69cebd8b46a87
Author: hiro 
Date:   Mon Aug 26 20:05:51 2019 +0200

Add script to fetch and update tor browser releases to gitlab and github
---
 scripts/update_files | 47 +++
 1 file changed, 47 insertions(+)

diff --git a/scripts/update_files b/scripts/update_files
new file mode 100644
index 000..ee9790b
--- /dev/null
+++ b/scripts/update_files
@@ -0,0 +1,47 @@
+#!/bin/bash
+#
+# This file is part of GetTor, a Tor Browser distribution system.
+#
+# :authors: hiro 
+#   see also AUTHORS file
+#
+# :copyright:   (c) 2008-2019, The Tor Project, Inc.
+#
+# :license: This is Free Software. See LICENSE for license information.
+
+cd ~/releases
+git checkout -B releases
+rm -f torbrowser-* TorBrowser-* tor-browser-*
+
+for row in $(
+curl -s 
'https://aus1.torproject.org/torbrowser/update_3/release/downloads.json' |
+jq -r '.downloads'
+  ); do
+r=$(
+  echo ${row} |
+  egrep -o 'https?://[^ ]+' |
+  tr -d '",'
+);
+if [[ $r = *[!\ ]* ]]; then
+  wget $r
+fi;
+done
+
+git add .
+git commit -m '[dist ci] commit from CI runner - update with new torbrowser 
downloads'
+diffs=$(git diff origin/releases)
+if [ -z "$diffs" ]; then
+echo "No new releases"
+else
+git push -f --follow-tags origin releases
+fi
+
+git fetch --all
+git checkout -b torbrowser-releases
+
+diffs=$(git diff github/torbrowser-releases)
+if [ -z "$diffs" ]; then
+echo "No new releases"
+else
+git push -f --follow-tags github torbrowser-releases
+fi

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

[tor-commits] [translation/snowflakeaddon-messages.json] Update translations for snowflakeaddon-messages.json

2019-08-26 Thread translation

commit 66bf15d6ff2568404cf08586660a89864960d820
Author: Translation commit bot 
Date:   Mon Aug 26 17:48:42 2019 +

Update translations for snowflakeaddon-messages.json
---
 pt_BR/messages.json | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pt_BR/messages.json b/pt_BR/messages.json
index fc1e90b75..619a71fbf 100644
--- a/pt_BR/messages.json
+++ b/pt_BR/messages.json
@@ -15,18 +15,18 @@
 "message": "Snowflake estÃ¡ desligado"
   },
   "popupStatusOn": {
-"message": "Number of users currently connected: $1"
+"message": "NÃºmero de usuÃ¡rios conectados no momento: $1"
   },
   "popupStatusReady": {
-"message": "Your Snowflake is ready to help users circumvent censorship!"
+"message": "Seu Snowflake estÃ¡ pronto para ajudar os usuÃ¡rios a 
contornar a censura!"
   },
   "popupWebRTCOff": {
 "message": "O recurso WebRTC nÃ£o Ã© detectado."
   },
   "popupDescOn": {
-"message": "Number of users your Snowflake has helped circumvent 
censorship in the last 24 hours: $1"
+"message": "NÃºmero de usuÃ¡rios que seu Snowflake ajudou a contornar a 
censura nas Ãºltimas 24 horas: $1"
   },
   "badgeCookiesOff": {
-"message": "Cookies are not enabled."
+"message": "Os cookies nÃ£o estÃ£o ativados."
   }
 }

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

[tor-commits] [translation/snowflakeaddon-messages.json_completed] Update translations for snowflakeaddon-messages.json_completed

2019-08-26 Thread translation

commit c9861c82f51316ddd49b04dee96c7178ab8d84a8
Author: Translation commit bot 
Date:   Mon Aug 26 17:48:47 2019 +

Update translations for snowflakeaddon-messages.json_completed
---
 pt_BR/messages.json | 22 ++
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pt_BR/messages.json b/pt_BR/messages.json
index 7808c9f6b..f9de9d4cc 100644
--- a/pt_BR/messages.json
+++ b/pt_BR/messages.json
@@ -1,26 +1,32 @@
 {
   "appDesc": {
-"message": "O Snowflake Ã© um transporte conectÃ¡vel WebRTC para o Tor."
+"message": "Snowflake is a WebRTC pluggable transport for Tor."
   },
   "popupTurnOn": {
-"message": "Ligar"
+"message": "Turn On"
   },
   "popupTurnOff": {
-"message": "Desligar"
+"message": "Turn Off"
   },
   "popupLearnMore": {
-"message": "Saber mais"
+"message": "Learn more"
   },
   "popupStatusOff": {
-"message": "Snowflake estÃ¡ desligado"
+"message": "Snowflake is off"
   },
   "popupStatusOn": {
-"message": "$1 clientes conectados."
+"message": "Number of users currently connected: $1"
+  },
+  "popupStatusReady": {
+"message": "Your Snowflake is ready to help users circumvent censorship!"
   },
   "popupWebRTCOff": {
-"message": "O recurso WebRTC nÃ£o Ã© detectado."
+"message": "WebRTC feature is not detected."
   },
   "popupDescOn": {
-"message": "Seu snowflake ajudou $1 os usuÃ¡rios contornam a censura nas 
Ãºltimas 24 horas."
+"message": "Number of users your Snowflake has helped circumvent 
censorship in the last 24 hours: $1"
+  },
+  "badgeCookiesOff": {
+"message": "Cookies are not enabled."
   }
 }

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

[tor-commits] [translation/snowflakeaddon-messages.json_completed] Update translations for snowflakeaddon-messages.json_completed

2019-08-26 Thread translation

commit d180e0ce3384517ae8f2916057e7fa600e7b50aa
Author: Translation commit bot 
Date:   Mon Aug 26 17:18:41 2019 +

Update translations for snowflakeaddon-messages.json_completed
---
 he/messages.json | 22 ++
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/he/messages.json b/he/messages.json
index ffb9d4632..f9de9d4cc 100644
--- a/he/messages.json
+++ b/he/messages.json
@@ -1,26 +1,32 @@
 {
   "appDesc": {
-"message": "Snowflake ××× ×ª×¢×××¨× × ×ª××§× ×©× WebRTC ×¢×××¨ 
Tor."
+"message": "Snowflake is a WebRTC pluggable transport for Tor."
   },
   "popupTurnOn": {
-"message": "××¤×¢×"
+"message": "Turn On"
   },
   "popupTurnOff": {
-"message": "×××"
+"message": "Turn Off"
   },
   "popupLearnMore": {
-"message": "××× ×¢××"
+"message": "Learn more"
   },
   "popupStatusOff": {
-"message": "Snowflake ×××××"
+"message": "Snowflake is off"
   },
   "popupStatusOn": {
-"message": "$1 ××§××××ª ×××××¨××."
+"message": "Number of users currently connected: $1"
+  },
+  "popupStatusReady": {
+"message": "Your Snowflake is ready to help users circumvent censorship!"
   },
   "popupWebRTCOff": {
-"message": "×××¤××× WebRTC ×× ××ª×××."
+"message": "WebRTC feature is not detected."
   },
   "popupDescOn": {
-"message": "Snowflake ×©×× ×¢××¨ ×× $1 ××©×ª××©×× ××¢×§××£ ×¦× 
×××¨× ××××× 24 ××©×¢××ª ××××¨×× ××ª."
+"message": "Number of users your Snowflake has helped circumvent 
censorship in the last 24 hours: $1"
+  },
+  "badgeCookiesOff": {
+"message": "Cookies are not enabled."
   }
 }

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

[tor-commits] [translation/snowflakeaddon-messages.json] Update translations for snowflakeaddon-messages.json

2019-08-26 Thread translation

commit 20983046bc2160cc1729c5cccd1f06feccbc57d5
Author: Translation commit bot 
Date:   Mon Aug 26 17:18:36 2019 +

Update translations for snowflakeaddon-messages.json
---
 he/messages.json | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/he/messages.json b/he/messages.json
index e67c4a081..7a29a46fb 100644
--- a/he/messages.json
+++ b/he/messages.json
@@ -15,18 +15,18 @@
 "message": "Snowflake ×××××"
   },
   "popupStatusOn": {
-"message": "Number of users currently connected: $1"
+"message": "××¡×¤×¨ ×©× ××©×ª××©×× ××××××¨×× ××¨××¢: $1"
   },
   "popupStatusReady": {
-"message": "Your Snowflake is ready to help users circumvent censorship!"
+"message": "Snowflake ×©×× ×××× ××¢×××¨ ×××©×ª××©×× 
××¢×§××£ ×¦× ×××¨×!"
   },
   "popupWebRTCOff": {
 "message": "×××¤××× WebRTC ×× ××ª×××."
   },
   "popupDescOn": {
-"message": "Number of users your Snowflake has helped circumvent 
censorship in the last 24 hours: $1"
+"message": "××¡×¤×¨ ×©× ××©×ª××©×× ××©×¨ Snowflake ×©×× ×¢××¨ 
××× ××¢×§××£ ×¦× ×××¨× ××××× 24 ××©×¢××ª ××××¨×× ××ª: $1"
   },
   "badgeCookiesOff": {
-"message": "Cookies are not enabled."
+"message": "×¢×××××ª ××× × ××××¤×©×¨××ª."
   }
 }

___
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-08-26 Thread translation

commit cd733e9c2a8f5358837bb7d9d6b27004a042d35f
Author: Translation commit bot 
Date:   Mon Aug 26 16:55:30 2019 +

Update translations for support-portal_completed
---
 contents+fr.po | 25 +++--
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 7add65009..396690e38 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -511,21 +511,23 @@ msgid ""
 "gpg: key 4E2C6E8793298290: public key \"Tor Browser Developers (signing key)"
 " \" imported"
 msgstr ""
+"gpg: clef 4E2C6E8793298290Â : clef publique Â«Â Tor Browser Developers 
(signing"
+" key) Â Â» importÃ©e"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "gpg: Total number processed: 1"
-msgstr ""
+msgstr "gpg: QuantitÃ© totale traitÃ©eÂ : 1"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "gpg:   imported: 1"
-msgstr ""
+msgstr "gpg:   importÃ©esÂ : 1"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "pub   rsa4096 2014-12-15 [C] [expires: 2020-08-24]"
-msgstr ""
+msgstr "pub  rsa4096 2014-12-15 [C] [expireÂ : 2020-08-24]"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -538,11 +540,13 @@ msgid ""
 "uid   [ unknown] Tor Browser Developers (signing key) "
 ""
 msgstr ""
+"uid   [ inconnue] Tor Browser Developers (signing key) "
+""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "sub   rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
-msgstr ""
+msgstr "sub   rsa4096 2018-05-26 [S] [expireÂ : 2020-09-12]"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -559,6 +563,8 @@ msgid ""
 "gpg --output ./tor.keyring --export "
 "0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290"
 msgstr ""
+"gpg --output ./tor.keyring --export "
+"0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -597,12 +603,12 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "gpgv: Signature made 07/08/19 04:03:49 Pacific Daylight Time"
-msgstr ""
+msgstr "gpgv: Signature faite le lun 08 jui 2019 07:06:17 EDT"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "gpgv:using RSA key EB774491D9FF06E2"
-msgstr ""
+msgstr "gpgv:avec la clef RSA EB774491D9FF06E2"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -610,6 +616,8 @@ msgid ""
 "gpgv: Good signature from \"Tor Browser Developers (signing key) "
 "\""
 msgstr ""
+"gpgv: Bonne signature de Â«Â Tor Browser Developers (signing key) "
+"Â Â»"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -624,6 +632,8 @@ msgid ""
 "gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-8.5.4-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
+"gpgv --keyring ./tor.keyring "
+"~/TÃ©lÃ©chargements/TorBrowser-8.5.4-osx64_fr.dmg{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -638,6 +648,7 @@ msgstr ""
 msgid ""
 "gpgv --keyring ./tor.keyring tor-browser-linux64-8.5.4_en-US.tar.xz{.asc,}"
 msgstr ""
+"gpgv --keyring ./tor.keyring tor-browser-linux64-8.5.4_fr.tar.xz{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -6189,6 +6200,8 @@ msgid ""
 "For sharing files over Tor, https://onionshare.org/\;>OnionShare is a good option."
 msgstr ""
+"https://onionshare.org/\;>OnionShare est une "
+"bonne option pour partager des fichiers avec Tor."
 
 #: https//support.torproject.org/misc/misc-14/
 #: (content/misc/misc-14/contents+en.lrquestion.title)

___
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-08-26 Thread translation

commit 9bf1fede3b9f5b75339b5e475cdce05b319e8001
Author: Translation commit bot 
Date:   Mon Aug 26 16:55:12 2019 +

Update translations for support-portal
---
 contents+fr.po | 25 +++--
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 7add65009..396690e38 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -511,21 +511,23 @@ msgid ""
 "gpg: key 4E2C6E8793298290: public key \"Tor Browser Developers (signing key)"
 " \" imported"
 msgstr ""
+"gpg: clef 4E2C6E8793298290Â : clef publique Â«Â Tor Browser Developers 
(signing"
+" key) Â Â» importÃ©e"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "gpg: Total number processed: 1"
-msgstr ""
+msgstr "gpg: QuantitÃ© totale traitÃ©eÂ : 1"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "gpg:   imported: 1"
-msgstr ""
+msgstr "gpg:   importÃ©esÂ : 1"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "pub   rsa4096 2014-12-15 [C] [expires: 2020-08-24]"
-msgstr ""
+msgstr "pub  rsa4096 2014-12-15 [C] [expireÂ : 2020-08-24]"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -538,11 +540,13 @@ msgid ""
 "uid   [ unknown] Tor Browser Developers (signing key) "
 ""
 msgstr ""
+"uid   [ inconnue] Tor Browser Developers (signing key) "
+""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "sub   rsa4096 2018-05-26 [S] [expires: 2020-09-12]"
-msgstr ""
+msgstr "sub   rsa4096 2018-05-26 [S] [expireÂ : 2020-09-12]"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -559,6 +563,8 @@ msgid ""
 "gpg --output ./tor.keyring --export "
 "0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290"
 msgstr ""
+"gpg --output ./tor.keyring --export "
+"0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -597,12 +603,12 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "gpgv: Signature made 07/08/19 04:03:49 Pacific Daylight Time"
-msgstr ""
+msgstr "gpgv: Signature faite le lun 08 jui 2019 07:06:17 EDT"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "gpgv:using RSA key EB774491D9FF06E2"
-msgstr ""
+msgstr "gpgv:avec la clef RSA EB774491D9FF06E2"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -610,6 +616,8 @@ msgid ""
 "gpgv: Good signature from \"Tor Browser Developers (signing key) "
 "\""
 msgstr ""
+"gpgv: Bonne signature de Â«Â Tor Browser Developers (signing key) "
+"Â Â»"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -624,6 +632,8 @@ msgid ""
 "gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-8.5.4-osx64_en-"
 "US.dmg{.asc,}"
 msgstr ""
+"gpgv --keyring ./tor.keyring "
+"~/TÃ©lÃ©chargements/TorBrowser-8.5.4-osx64_fr.dmg{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -638,6 +648,7 @@ msgstr ""
 msgid ""
 "gpgv --keyring ./tor.keyring tor-browser-linux64-8.5.4_en-US.tar.xz{.asc,}"
 msgstr ""
+"gpgv --keyring ./tor.keyring tor-browser-linux64-8.5.4_fr.tar.xz{.asc,}"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -6189,6 +6200,8 @@ msgid ""
 "For sharing files over Tor, https://onionshare.org/\;>OnionShare is a good option."
 msgstr ""
+"https://onionshare.org/\;>OnionShare est une "
+"bonne option pour partager des fichiers avec Tor."
 
 #: https//support.torproject.org/misc/misc-14/
 #: (content/misc/misc-14/contents+en.lrquestion.title)

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

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2019-08-26 Thread translation

commit d22d8e069d2c8cf725d4d40bc52abe85e8a04f60
Author: Translation commit bot 
Date:   Mon Aug 26 16:50:05 2019 +

Update translations for tails-persistence-setup
---
 hi/hi.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hi/hi.po b/hi/hi.po
index a6060016e..5ab699d8e 100644
--- a/hi/hi.po
+++ b/hi/hi.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2019-03-17 09:03+0100\n"
-"PO-Revision-Date: 2019-01-15 12:21+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-08-26 12:31+\n"
+"Last-Translator: Vinod Kumar Kashyap \n"
 "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2

2019-08-26 Thread translation

commit 6ae625d0c7210e33bf8d25403ee278e73ce736b1
Author: Translation commit bot 
Date:   Mon Aug 26 16:48:39 2019 +

Update translations for tails-greeter-2
---
 hi/hi.po | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hi/hi.po b/hi/hi.po
index a55c65e2a..b2cc12c11 100644
--- a/hi/hi.po
+++ b/hi/hi.po
@@ -10,6 +10,7 @@
 # Ashish Deshmukh , 2017
 # Kalyan Dikshit , 2018
 # Bala Subramaniyan , 2018
+# Vinod Kumar Kashyap , 2019
 # 
 #, fuzzy
 msgid ""
@@ -18,7 +19,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-11 00:25+0200\n"
 "PO-Revision-Date: 2016-11-18 21:29+\n"
-"Last-Translator: Bala Subramaniyan , 2018\n"
+"Last-Translator: Vinod Kumar Kashyap , 2019\n"
 "Language-Team: Hindi (https://www.transifex.com/otf/teams/1519/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2019-08-26 Thread translation

commit ea4665388111a193ee7932bc3749c398aab3f9fc
Author: Translation commit bot 
Date:   Mon Aug 26 16:45:32 2019 +

Update translations for tails-misc_release
---
 hi.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hi.po b/hi.po
index c31e1a5e3..e990a108c 100644
--- a/hi.po
+++ b/hi.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Gyanendra Giri , 2014
+# Vinod Kumar Kashyap , 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-08-14 14:11+0200\n"
-"PO-Revision-Date: 2019-08-24 02:11+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-08-26 13:01+\n"
+"Last-Translator: Vinod Kumar Kashyap \n"
 "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2019-08-26 Thread translation

commit 2d5d2074941899dffbda57f0cd38be163ea7d15c
Author: Translation commit bot 
Date:   Mon Aug 26 16:44:31 2019 +

Update translations for tails-misc
---
 hi.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hi.po b/hi.po
index c31e1a5e3..e990a108c 100644
--- a/hi.po
+++ b/hi.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Gyanendra Giri , 2014
+# Vinod Kumar Kashyap , 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-08-14 14:11+0200\n"
-"PO-Revision-Date: 2019-08-24 02:11+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-08-26 13:01+\n"
+"Last-Translator: Vinod Kumar Kashyap \n"
 "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [gettor/master] Harmonise indentation.

2019-08-26 Thread hiro

commit cfe2a5188155531bf105f64ec7fb4aeb0a33f1e0
Author: Philipp Winter 
Date:   Thu Aug 1 21:55:27 2019 -0700

Harmonise indentation.

Parts of the code was indented with two spaces while the rest was
indented with four spaces.  Let's use four spaces everywhere.
---
 scripts/add_links_to_db | 126 
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/scripts/add_links_to_db b/scripts/add_links_to_db
index fb121be..9891d43 100755
--- a/scripts/add_links_to_db
+++ b/scripts/add_links_to_db
@@ -41,69 +41,69 @@ def print_footer():
 print("")
 
 def main():
-  parser = argparse.ArgumentParser(
-description="Tool to create the gettor SQLite database."
-  )
-
-  parser.add_argument(
-"-f", "--filename", default="gettor.db", metavar="gettor.db",
-help="Database filename."
-  )
-
-  args = parser.parse_args()
-  abs_filename = os.path.abspath(args.filename)
-
-  webFile = 
request.urlopen("https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions/;)
-  versions = webFile.read().decode('utf-8').translate({ord(c): None for c in 
'[]\n" '})
-  version = versions.split(",")[-12]
-
-  providers = {
-"gitlab": "https://gitlab.com/thetorproject/gettorbrowser/raw/releases/;,
-"github": 
"https://github.com/TheTorProject/gettorbrowser/raw/torbrowser-releases/;
-  }
-
-
-  prefixes = {
-"osx": "TorBrowser-",
-"windows": "torbrowser-install-",
-"linux": "tor-browser-linux64-"
-  }
-
-  versions = {"windows": version, 'linux': version, 'osx': version}
-
-  suffixes = {
-"osx": "-osx64_en-US.dmg",
-"windows": "_en-US.exe",
-"linux": "_en-US.tar.xz"
-  }
-
-  keys = ['osx', 'windows', 'linux']
-
-  languages = ['en-US', 'es-ES', 'pt-BR']
-
-  releases = {k: "".join(dic.get(k, version) for dic in (prefixes, versions, 
suffixes))  for k in keys}
-
-  if not abs_filename:
-  print("Missing database filename.")
-  else:
-  conn = sqlite3.connect(abs_filename)
-  with conn:
-  c = conn.cursor()
-  """
-  Here we drop previous links TABLE but probably it would be better to 
just update old links to INACTIVE
-  """
-  c.execute("DROP TABLE IF EXISTS links")
-  c.execute(
-  "CREATE TABLE links(link TEXT, platform TEXT, language TEXT, 
arch TEXT,"
-  " version TEXT, provider TEXT, status TEXT)"
-  )
-  for k in keys:
-  for p in providers:
-  for l in languages:
-  release_link = releases.get(k).replace("en-US", l)
-  c.execute(
-"INSERT INTO links(link, platform, language, arch, 
version, provider, status)"
-"VALUES ('%s', '%s', '%s', '64', '%s', '%s', 
'ACTIVE')" %(providers.get(p) + release_link, k, l, version, p))
+parser = argparse.ArgumentParser(
+description="Tool to create the gettor SQLite database."
+)
+
+parser.add_argument(
+"-f", "--filename", default="gettor.db", metavar="gettor.db",
+help="Database filename."
+)
+
+args = parser.parse_args()
+abs_filename = os.path.abspath(args.filename)
+
+webFile = 
request.urlopen("https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions/;)
+versions = webFile.read().decode('utf-8').translate({ord(c): None for c in 
'[]\n" '})
+version = versions.split(",")[-12]
+
+providers = {
+"gitlab": 
"https://gitlab.com/thetorproject/gettorbrowser/raw/releases/;,
+"github": 
"https://github.com/TheTorProject/gettorbrowser/raw/torbrowser-releases/;
+}
+
+
+prefixes = {
+"osx": "TorBrowser-",
+"windows": "torbrowser-install-",
+"linux": "tor-browser-linux64-"
+}
+
+versions = {"windows": version, 'linux': version, 'osx': version}
+
+suffixes = {
+"osx": "-osx64_en-US.dmg",
+"windows": "_en-US.exe",
+"linux": "_en-US.tar.xz"
+}
+
+keys = ['osx', 'windows', 'linux']
+
+languages = ['en-US', 'es-ES', 'pt-BR']
+
+releases = {k: "".join(dic.get(k, version) for dic in (prefixes, versions, 
suffixes))  for k in keys}
+
+if not abs_filename:
+print("Missing database filename.")
+else:
+conn = sqlite3.connect(abs_filename)
+with conn:
+c = conn.cursor()
+"""
+Here we drop previous links TABLE but probably it would be better 
to just update old links to INACTIVE
+"""
+c.execute("DROP TABLE IF EXISTS links")
+c.execute(
+"CREATE TABLE links(link TEXT, platform TEXT, language TEXT, 
arch TEXT,"
+" version TEXT, provider TEXT, status TEXT)"
+)
+for k in keys:
+for p in providers:
+for l in languages:
+release_link = releases.get(k).replace("en-US", l)
+

[tor-commits] [gettor/master] Fix typo in file name.

2019-08-26 Thread hiro

commit ef60822a1f9804e0a4f966b04352ad91aa3cdbe6
Author: Philipp Winter 
Date:   Thu Aug 1 21:50:49 2019 -0700

Fix typo in file name.
---
 scripts/{add_lins_to_db => add_links_to_db} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/scripts/add_lins_to_db b/scripts/add_links_to_db
similarity index 100%
rename from scripts/add_lins_to_db
rename to scripts/add_links_to_db



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

[tor-commits] [gettor/master] Fix a number of flake8 issues.

2019-08-26 Thread hiro

commit 83d7b1fd154f70eab00d142a356813d1e2cbf393
Author: Philipp Winter 
Date:   Thu Aug 1 22:22:11 2019 -0700

Fix a number of flake8 issues.

Most importantly, fix our precious ASCII art.
---
 scripts/add_links_to_db | 17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/scripts/add_links_to_db b/scripts/add_links_to_db
index fce7025..f303691 100755
--- a/scripts/add_links_to_db
+++ b/scripts/add_links_to_db
@@ -17,15 +17,16 @@ from urllib import request
 
 TOR_BROWSER_DOWNLOADS = 
"https://aus1.torproject.org/torbrowser/update_3/release/downloads.json;
 
+
 def print_header():
-header = """
+header = r"""
  __ __
 /\ \__ /\ \__
-  __  __\ \ ,_\\\ \ ,_\      _  __
+  __  __\ \ ,_\\\ \ ,_\     _  __
 /'_ `\  /'__`\ \ \/ \ \ \/  / __ `\/\`'__\
/\ \L\ \/\  __/\ \ \_ \ \ \ /\ \L\  \ \ \/
-   \ \ \ \\\\__\ \ \ \__\ \_/\ \_\
-\/___L\ \// \/__/  \/__/\/___/  \/_/
+   \ \ \ \\\ \__\ \ \__\ \_/\ \_\
+\/___L\ \// \/__/  \/__/\//  \/_/
  /\_/
  \_/___/
 
@@ -37,12 +38,14 @@ def print_header():
 print("@"*100)
 print("")
 
+
 def print_footer():
 print("")
 print("@"*100)
 print("@"*100)
 print("")
 
+
 def main():
 parser = argparse.ArgumentParser(
 description="Tool to create the gettor SQLite database."
@@ -69,7 +72,6 @@ def main():
 "github": 
"https://github.com/TheTorProject/gettorbrowser/raw/torbrowser-releases/;
 }
 
-
 prefixes = {
 "osx": "TorBrowser-",
 "windows": "torbrowser-install-",
@@ -94,7 +96,8 @@ def main():
 with conn:
 c = conn.cursor()
 """
-Here we drop previous links TABLE but probably it would be better to 
just update old links to INACTIVE
+Here we drop previous links TABLE but probably it would be better to
+just update old links to INACTIVE
 """
 c.execute("DROP TABLE IF EXISTS links")
 c.execute(
@@ -107,7 +110,7 @@ def main():
 release_link = releases.get(k).replace("en-US", l)
 c.execute(
 "INSERT INTO links(link, platform, language, arch, 
version, provider, status)"
-"VALUES ('%s', '%s', '%s', '64', '%s', '%s', 
'ACTIVE')" %(providers.get(p) + release_link, k, l, version, p))
+"VALUES ('%s', '%s', '%s', '64', '%s', '%s', 
'ACTIVE')" % (providers.get(p) + release_link, k, l, version, p))
 
 
 if __name__ == "__main__":

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

[tor-commits] [gettor/master] Fetch latest Tor Browser version from JSON.

2019-08-26 Thread hiro

commit 7ca38d2f38f4bb904d7483c21d1ce5b4bf62f4c3
Author: Philipp Winter 
Date:   Thu Aug 1 22:04:32 2019 -0700

Fetch latest Tor Browser version from JSON.

This fixes .
---
 scripts/add_links_to_db | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/scripts/add_links_to_db b/scripts/add_links_to_db
index 9891d43..c272e4e 100755
--- a/scripts/add_links_to_db
+++ b/scripts/add_links_to_db
@@ -10,10 +10,13 @@
 
 import os
 import sys
+import json
 import sqlite3
 import argparse
 from urllib import request
 
+TOR_BROWSER_DOWNLOADS = 
"https://aus1.torproject.org/torbrowser/update_3/release/downloads.json;
+
 def print_header():
 header = """
  __ __
@@ -53,9 +56,13 @@ def main():
 args = parser.parse_args()
 abs_filename = os.path.abspath(args.filename)
 
-webFile = 
request.urlopen("https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions/;)
-versions = webFile.read().decode('utf-8').translate({ord(c): None for c in 
'[]\n" '})
-version = versions.split(",")[-12]
+webFile = request.urlopen(TOR_BROWSER_DOWNLOADS)
+content = webFile.read()
+jsonObj = json.loads(content)
+version = jsonObj.get("version", None)
+if version is None:
+print("Could not fetch version from {}.".format(TOR_BROWSER_DOWNLOADS))
+sys.exit(1)
 
 providers = {
 "gitlab": 
"https://gitlab.com/thetorproject/gettorbrowser/raw/releases/;,



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

[tor-commits] [gettor/master] Remove useless if condition.

2019-08-26 Thread hiro

commit a289673e8d2db71d664e4e0fa96fb09b058f35ba
Author: Philipp Winter 
Date:   Thu Aug 1 22:06:33 2019 -0700

Remove useless if condition.

abs_filename will always be set because it has a default value.
---
 scripts/add_links_to_db | 39 ++-
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/scripts/add_links_to_db b/scripts/add_links_to_db
index c272e4e..fce7025 100755
--- a/scripts/add_links_to_db
+++ b/scripts/add_links_to_db
@@ -90,27 +90,24 @@ def main():
 
 releases = {k: "".join(dic.get(k, version) for dic in (prefixes, versions, 
suffixes))  for k in keys}
 
-if not abs_filename:
-print("Missing database filename.")
-else:
-conn = sqlite3.connect(abs_filename)
-with conn:
-c = conn.cursor()
-"""
-Here we drop previous links TABLE but probably it would be better 
to just update old links to INACTIVE
-"""
-c.execute("DROP TABLE IF EXISTS links")
-c.execute(
-"CREATE TABLE links(link TEXT, platform TEXT, language TEXT, 
arch TEXT,"
-" version TEXT, provider TEXT, status TEXT)"
-)
-for k in keys:
-for p in providers:
-for l in languages:
-release_link = releases.get(k).replace("en-US", l)
-c.execute(
-  "INSERT INTO links(link, platform, language, arch, 
version, provider, status)"
-  "VALUES ('%s', '%s', '%s', '64', '%s', '%s', 
'ACTIVE')" %(providers.get(p) + release_link, k, l, version, p))
+conn = sqlite3.connect(abs_filename)
+with conn:
+c = conn.cursor()
+"""
+Here we drop previous links TABLE but probably it would be better to 
just update old links to INACTIVE
+"""
+c.execute("DROP TABLE IF EXISTS links")
+c.execute(
+"CREATE TABLE links(link TEXT, platform TEXT, language TEXT, arch 
TEXT,"
+" version TEXT, provider TEXT, status TEXT)"
+)
+for k in keys:
+for p in providers:
+for l in languages:
+release_link = releases.get(k).replace("en-US", l)
+c.execute(
+"INSERT INTO links(link, platform, language, arch, 
version, provider, status)"
+"VALUES ('%s', '%s', '%s', '64', '%s', '%s', 
'ACTIVE')" %(providers.get(p) + release_link, k, l, version, p))
 
 
 if __name__ == "__main__":



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

[tor-commits] [tor/master] Fix/suppress shellcheck warnings in git-push-all.sh

2019-08-26 Thread asn

commit ca667b9a8a654703b26e666d197e1f093eff2e89
Author: Nick Mathewson 
Date:   Mon Aug 26 09:58:38 2019 -0400

Fix/suppress shellcheck warnings in git-push-all.sh

(I've chosen to suppress some instances rather than 'fix' them,
since the fix would require arrays or major refactoring.)

Fixes bug 31519; bug not in any released Tor.
---
 scripts/git/git-push-all.sh | 23 +++
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh
index 1ae310eca..469d6fe57 100755
--- a/scripts/git/git-push-all.sh
+++ b/scripts/git/git-push-all.sh
@@ -15,30 +15,37 @@ UPSTREAM_REMOTE=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"}
 # Add a delay between pushes, so CI runs on the most important branches first
 PUSH_DELAY=${TOR_PUSH_DELAY:-0}
 
-PUSH_BRANCHES=`echo \
+PUSH_BRANCHES=$(echo \
   master \
   {release,maint}-0.4.1 \
   {release,maint}-0.4.0 \
   {release,maint}-0.3.5 \
   {release,maint}-0.2.9 \
-  `
+  )
 
 if [ "$PUSH_DELAY" -le 0 ]; then
   echo "Pushing $PUSH_BRANCHES"
+  # We know that there are no spaces in any branch within $PUSH_BRANCHES, so
+  # it is safe to use it unquoted.  (This also applies to the other shellcheck
+  # exceptions below.)
+  #
+  # shellcheck disable=SC2086
   git push --atomic "$@" "$UPSTREAM_REMOTE" $PUSH_BRANCHES
 else
-  PUSH_BRANCHES=`echo "$PUSH_BRANCHES" | tr " " "\n" | sort -V`
-  MASTER_BRANCH=`echo "$PUSH_BRANCHES" | tr " " "\n" | grep master`
-  MAINT_BRANCHES=`echo "$PUSH_BRANCHES" | tr " " "\n" | grep maint`
-  RELEASE_BRANCHES=`echo "$PUSH_BRANCHES" | tr " " "\n" | grep release | \
-tr "\n" " "`
+  PUSH_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | sort -V)
+  MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep master)
+  MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep maint)
+  RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep release | \
+tr "\n" " ")
   printf "Pushing with %ss delays, so CI runs in this order:\n%s\n%s\n%s\n" \
 "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" "$RELEASE_BRANCHES"
-  git push "$@" "$UPSTREAM_REMOTE" $MASTER_BRANCH
+  git push "$@" "$UPSTREAM_REMOTE" "$MASTER_BRANCH"
   sleep "$PUSH_DELAY"
+  # shellcheck disable=SC2086
   for b in $MAINT_BRANCHES; do
 git push "$@" "$UPSTREAM_REMOTE" $b
 sleep "$PUSH_DELAY"
   done
+  # shellcheck disable=SC2086
   git push --atomic "$@" "$UPSTREAM_REMOTE" $RELEASE_BRANCHES
 fi



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

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1263'

2019-08-26 Thread asn

commit 859514d47753aa951730ae8c0dfbbdb4c2e63710
Merge: eff95429f ca667b9a8
Author: George Kadianakis 
Date:   Mon Aug 26 17:35:34 2019 +0300

Merge branch 'tor-github/pr/1263'

 scripts/git/git-push-all.sh | 23 +++
 1 file changed, 15 insertions(+), 8 deletions(-)

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

[tor-commits] [tor/master] scripts/git: Remove a duplicate practracker call from the pre-push hook

2019-08-26 Thread nickm

commit bdcccb97769b2247e22cb8e1dc05b8274d46fafd
Author: teor 
Date:   Tue Aug 20 12:21:02 2019 +1000

scripts/git: Remove a duplicate practracker call from the pre-push hook

The pre-push hook already calls the pre-commit hook, which calls
practracker.

Also update the script comments to avoid similar issues in future.

Fixes bug 31462; bugfix on 0.4.1.1-alpha.
---
 changes/bug31462|  4 
 changes/ticket30979 |  8 +---
 scripts/git/pre-commit.git-hook | 16 +---
 scripts/git/pre-push.git-hook   | 18 +++---
 4 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/changes/bug31462 b/changes/bug31462
new file mode 100644
index 0..54ab990bb
--- /dev/null
+++ b/changes/bug31462
@@ -0,0 +1,4 @@
+  o Minor bugfixes (git hooks):
+- Remove a duplicate call to practracker from the pre-push hook.
+  The pre-push hook already calls the pre-commit hook, which calls
+  practracker. Fixes bug 31462; bugfix on 0.4.1.1-alpha.
diff --git a/changes/ticket30979 b/changes/ticket30979
index 8ae9b3c41..ffe1bfb4a 100644
--- a/changes/ticket30979
+++ b/changes/ticket30979
@@ -1,5 +1,7 @@
   o Minor features (git hooks):
-- Our pre-push git hook now checks for a special file
-  before running practracker, so that it only runs on branches
-  that are based on master.
+- Our pre-commit git hook now checks for a special file
+  before running practracker, so that practracker only runs on branches
+  that are based on master. Since the pre-push hook calls the pre-commit
+  hook, practracker will also only run before pushes of branches based
+  on master.
   Closes ticket 30979.
diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook
index 2a2983719..37060fdbe 100755
--- a/scripts/git/pre-commit.git-hook
+++ b/scripts/git/pre-commit.git-hook
@@ -4,7 +4,8 @@
 # tor git repo and make sure it has permission to execute.
 #
 # This is pre-commit git hook script that prevents commiting your changeset if
-# it fails our code formatting or changelog entry formatting checkers.
+# it fails our code formatting, changelog entry formatting, module include
+# rules, or best practices tracker.
 
 workdir=$(git rev-parse --show-toplevel)
 
@@ -40,6 +41,15 @@ if test -e scripts/maint/checkIncludes.py; then
 python scripts/maint/checkIncludes.py
 fi
 
-if [ -e scripts/maint/practracker/practracker.py ]; then
-  python3 ./scripts/maint/practracker/practracker.py "$workdir"
+# Only call practracker if ${PT_DIR}/.enable_practracker_in_hooks exists
+# We do this check so that we can enable practracker in hooks in master, and
+# disable it on maint branches
+PT_DIR=scripts/maint/practracker
+
+if [ -e "${PT_DIR}/practracker.py" ]; then
+if [ -e "${PT_DIR}/.enable_practracker_in_hooks" ]; then
+if ! python3 "${PT_DIR}/practracker.py" "$workdir"; then
+exit 1
+fi
+fi
 fi
diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook
index 40a3bffa7..f4504c421 100755
--- a/scripts/git/pre-push.git-hook
+++ b/scripts/git/pre-push.git-hook
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
 
 # git pre-push hook script to:
+# 0) Call the pre-commit hook, if it is available
 # 1) prevent "fixup!" and "squash!" commit from ending up in master, release-*
 #or maint-*
 # 2) Disallow pushing branches other than master, release-*
-#and maint-* to origin (e.g. gitweb.torproject.org).
+#and maint-* to origin (e.g. gitweb.torproject.org)
 #
 # To install this script, copy it into .git/hooks/pre-push path in your
 # local copy of git repository. Make sure it has permission to execute.
@@ -21,6 +22,11 @@ z40=
 
 upstream_name=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"}
 
+# Are you adding a new check to the git hooks?
+#  - Common checks belong in the pre-commit hook
+#  - Push-only checks belong in the pre-push hook
+#
+# Call the pre-commit hook for the common checks, if it is executable.
 workdir=$(git rev-parse --show-toplevel)
 if [ -x "$workdir/.git/hooks/pre-commit" ]; then
   if ! "$workdir"/.git/hooks/pre-commit; then
@@ -28,16 +34,6 @@ if [ -x "$workdir/.git/hooks/pre-commit" ]; then
   fi
 fi
 
-PT_DIR=scripts/maint/practracker
-
-if [ -e "${PT_DIR}/practracker.py" ]; then
-if [ -e "${PT_DIR}/.enable_practracker_in_hooks" ]; then
-if ! python3 "${PT_DIR}/practracker.py" "$workdir"; then
-exit 1
-fi
-fi
-fi
-
 remote="$1"
 
 remote_name=$(git remote --verbose | grep "$2" | awk '{print $1}' | head -n 1)



___
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/1241'

2019-08-26 Thread nickm

commit eff95429fd5fd1e7a9431c7ccdbe89310c4b9704
Merge: 24bc2cd7b bdcccb977
Author: Nick Mathewson 
Date:   Mon Aug 26 10:15:25 2019 -0400

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

 changes/bug31462|  4 
 changes/ticket30979 |  8 +---
 scripts/git/pre-commit.git-hook | 16 +---
 scripts/git/pre-push.git-hook   | 18 +++---
 4 files changed, 29 insertions(+), 17 deletions(-)

diff --cc scripts/git/pre-commit.git-hook
index 7c7cf8857,37060fdbe..b2a1847a2
--- a/scripts/git/pre-commit.git-hook
+++ b/scripts/git/pre-commit.git-hook
@@@ -36,10 -37,19 +37,19 @@@ elif [ -d src/common ]; the
   src/tools/*.[ch]
  fi
  
 -if test -e scripts/maint/checkIncludes.py; then
 -python scripts/maint/checkIncludes.py
 +if test -e scripts/maint/practracker/includes.py; then
 +python scripts/maint/practracker/includes.py
  fi
  
- if [ -e scripts/maint/practracker/practracker.py ]; then
-   python3 ./scripts/maint/practracker/practracker.py "$workdir"
+ # Only call practracker if ${PT_DIR}/.enable_practracker_in_hooks exists
+ # We do this check so that we can enable practracker in hooks in master, and
+ # disable it on maint branches
+ PT_DIR=scripts/maint/practracker
+ 
+ if [ -e "${PT_DIR}/practracker.py" ]; then
+ if [ -e "${PT_DIR}/.enable_practracker_in_hooks" ]; then
+ if ! python3 "${PT_DIR}/practracker.py" "$workdir"; then
+ exit 1
+ fi
+ fi
  fi

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

[tor-commits] [tor/master] changes file for ticket30935

2019-08-26 Thread dgoulet

commit 38c4e1426c2964f4c27d2486b81867bff6d55b8a
Author: Nick Mathewson 
Date:   Mon Aug 26 09:33:29 2019 -0400

changes file for ticket30935
---
 changes/ticket30935 | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/changes/ticket30935 b/changes/ticket30935
new file mode 100644
index 0..5a7e91889
--- /dev/null
+++ b/changes/ticket30935
@@ -0,0 +1,6 @@
+  o Code simplification and refactoring:
+- Numerous simplifications in configuration-handling logic:
+  remove duplicated macro definitions, replace magical names
+  with flags, and refactor "TestingTorNetwork" to use the
+  same default-option logic as the rest of Tor.
+  Closes ticket 30935.



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

[tor-commits] [tor/master] Make a function for NODUMP.

2019-08-26 Thread dgoulet

commit 078ba326a1255dbfbb442219c599e7961f4f85e2
Author: Nick Mathewson 
Date:   Sat Aug 24 17:40:38 2019 -0400

Make a function for NODUMP.
---
 src/app/config/confparse.c | 7 ++-
 src/app/config/confparse.h | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c
index 7127e62cd..6e2624466 100644
--- a/src/app/config/confparse.c
+++ b/src/app/config/confparse.c
@@ -169,6 +169,11 @@ config_var_is_invisible(const config_var_t *var)
 {
   return (var->flags & CVFLAG_INVISIBLE) != 0;
 }
+bool
+config_var_is_dumpable(const config_var_t *var)
+{
+  return (var->flags & CVFLAG_NODUMP) == 0;
+}
 
 /*
  * Functions to assign config options.
@@ -646,7 +651,7 @@ config_dump(const config_format_t *fmt, const void 
*default_options,
   continue;
 }
 /* Don't save 'hidden' control variables. */
-if (fmt->vars[i].flags & CVFLAG_NODUMP)
+if (! config_var_is_dumpable(>vars[i]))
   continue;
 if (minimal && config_is_same(fmt, options, defaults,
   fmt->vars[i].member.name))
diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h
index 0ae675bcd..d6571692f 100644
--- a/src/app/config/confparse.h
+++ b/src/app/config/confparse.h
@@ -108,6 +108,7 @@ bool config_var_is_cumulative(const config_var_t *var);
 bool config_var_is_settable(const config_var_t *var);
 bool config_var_is_contained(const config_var_t *var);
 bool config_var_is_invisible(const config_var_t *var);
+bool config_var_is_dumpable(const config_var_t *var);
 
 /* Helper macros to compare an option across two configuration objects */
 #define CFG_EQ_BOOL(a,b,opt) ((a)->opt == (b)->opt)



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

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1254'

2019-08-26 Thread dgoulet

commit 24bc2cd7b5ab32d6a34dee3a27d5d383a383b270
Merge: 6ba05eea8 38c4e1426
Author: David Goulet 
Date:   Mon Aug 26 09:38:24 2019 -0400

Merge branch 'tor-github/pr/1254'

 changes/ticket30935   |   6 +
 scripts/maint/practracker/exceptions.txt  |   2 +-
 src/app/config/config.c   | 260 --
 src/app/config/config.h   |   2 +-
 src/app/config/confparse.c|  90 ++-
 src/app/config/confparse.h|  72 ++---
 src/app/config/statefile.c|  11 +-
 src/app/config/testnet.inc|  33 
 src/core/include.am   |   7 +-
 src/feature/dirauth/shared_random_state.c |  16 +-
 src/lib/conf/.may_include |   1 +
 src/lib/conf/confmacros.h |  67 
 src/lib/conf/conftesting.h|  86 ++
 src/lib/conf/conftypes.h  |  65 
 src/lib/conf/include.am   |   4 +-
 src/lib/confmgt/structvar.c   |  37 +
 src/lib/confmgt/structvar.h   |   5 +
 src/lib/confmgt/type_defs.c   |  65 +---
 src/lib/confmgt/typedvar.c|  45 ++
 src/lib/confmgt/typedvar.h|   6 +
 src/lib/confmgt/var_type_def_st.h |  20 +++
 src/test/test_confparse.c |  30 ++--
 22 files changed, 582 insertions(+), 348 deletions(-)

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

[tor-commits] [tor/master] Make config_var_is_invisible a function.

2019-08-26 Thread dgoulet

commit eb54fe8f97701a11e30009a94f11b7e3e5d69b4f
Author: Nick Mathewson 
Date:   Sat Aug 24 17:32:46 2019 -0400

Make config_var_is_invisible a function.
---
 src/app/config/config.c| 2 +-
 src/app/config/confparse.c | 5 +
 src/app/config/confparse.h | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index f2e8ec820..740315f3e 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -8137,7 +8137,7 @@ getinfo_helper_config(control_connection_t *conn,
 for (i = 0; option_vars_[i].member.name; ++i) {
   const config_var_t *var = _vars_[i];
   /* don't tell controller about invisible options */
-  if (option_vars_[i].flags & CVFLAG_INVISIBLE)
+  if (config_var_is_invisible(var))
 continue;
   const char *type = struct_var_get_typename(>member);
   if (!type)
diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c
index 699fc0e3d..7127e62cd 100644
--- a/src/app/config/confparse.c
+++ b/src/app/config/confparse.c
@@ -164,6 +164,11 @@ config_var_is_contained(const config_var_t *var)
 {
   return struct_var_is_contained(>member);
 }
+bool
+config_var_is_invisible(const config_var_t *var)
+{
+  return (var->flags & CVFLAG_INVISIBLE) != 0;
+}
 
 /*
  * Functions to assign config options.
diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h
index 3633c2a80..0ae675bcd 100644
--- a/src/app/config/confparse.h
+++ b/src/app/config/confparse.h
@@ -107,6 +107,7 @@ void warn_deprecated_option(const char *what, const char 
*why);
 bool config_var_is_cumulative(const config_var_t *var);
 bool config_var_is_settable(const config_var_t *var);
 bool config_var_is_contained(const config_var_t *var);
+bool config_var_is_invisible(const config_var_t *var);
 
 /* Helper macros to compare an option across two configuration objects */
 #define CFG_EQ_BOOL(a,b,opt) ((a)->opt == (b)->opt)



___
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 'ticket30935' into ticket30935_merged

2019-08-26 Thread dgoulet

commit 2780cbb9cb9905a7194364d791da4d94ac419998
Merge: d475d7c2f c32d48594
Author: Nick Mathewson 
Date:   Thu Aug 22 17:25:35 2019 -0400

Merge branch 'ticket30935' into ticket30935_merged

 scripts/maint/practracker/exceptions.txt  |   2 +-
 src/app/config/config.c   | 258 --
 src/app/config/config.h   |   2 +-
 src/app/config/confparse.c|  80 -
 src/app/config/confparse.h|  70 ++--
 src/app/config/statefile.c|  11 +-
 src/app/config/testnet.inc|  33 
 src/core/include.am   |   7 +-
 src/feature/dirauth/shared_random_state.c |  16 +-
 src/lib/conf/.may_include |   1 +
 src/lib/conf/confmacros.h |  67 
 src/lib/conf/conftesting.h|  86 ++
 src/lib/conf/conftypes.h  |  63 
 src/lib/conf/include.am   |   4 +-
 src/lib/confmgt/structvar.c   |  37 +
 src/lib/confmgt/structvar.h   |   5 +
 src/lib/confmgt/type_defs.c   |  65 +---
 src/lib/confmgt/typedvar.c|  45 ++
 src/lib/confmgt/typedvar.h|   6 +
 src/lib/confmgt/var_type_def_st.h |  20 +++
 src/test/test_confparse.c |  30 ++--
 21 files changed, 561 insertions(+), 347 deletions(-)

diff --cc scripts/maint/practracker/exceptions.txt
index 6bc023665,1e1ccda78..0acb6fb7f
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@@ -30,23 -30,24 +30,23 @@@
  # Remember: It is better to fix the problem than to add a new exception!
  
  problem file-size /src/app/config/config.c 8518
- problem include-count /src/app/config/config.c 88
+ problem include-count /src/app/config/config.c 89
  problem function-size /src/app/config/config.c:options_act_reversible() 296
  problem function-size /src/app/config/config.c:options_act() 589
 -problem function-size /src/app/config/config.c:resolve_my_address() 192
 -problem function-size /src/app/config/config.c:options_validate() 1217
 +problem function-size /src/app/config/config.c:resolve_my_address() 190
 +problem function-size /src/app/config/config.c:options_validate() 1209
  problem function-size /src/app/config/config.c:options_init_from_torrc() 207
 -problem function-size /src/app/config/config.c:options_init_from_string() 173
 -problem function-size /src/app/config/config.c:options_init_logs() 146
 +problem function-size /src/app/config/config.c:options_init_from_string() 171
 +problem function-size /src/app/config/config.c:options_init_logs() 145
  problem function-size /src/app/config/config.c:parse_bridge_line() 104
 -problem function-size /src/app/config/config.c:parse_transport_line() 191
 -problem function-size /src/app/config/config.c:parse_dir_authority_line() 151
 -problem function-size /src/app/config/config.c:parse_dir_fallback_line() 102
 -problem function-size /src/app/config/config.c:parse_port_config() 452
 -problem function-size /src/app/config/config.c:parse_ports() 170
 -problem function-size /src/app/config/config.c:getinfo_helper_config() 116
 -problem function-size /src/app/config/confparse.c:config_assign_value() 205
 -problem function-size 
/src/app/config/confparse.c:config_get_assigned_option() 129
 -problem include-count /src/app/main/main.c 67
 +problem function-size /src/app/config/config.c:parse_transport_line() 189
 +problem function-size /src/app/config/config.c:parse_dir_authority_line() 150
 +problem function-size /src/app/config/config.c:parse_dir_fallback_line() 101
 +problem function-size /src/app/config/config.c:parse_port_config() 446
 +problem function-size /src/app/config/config.c:parse_ports() 168
 +problem function-size /src/app/config/config.c:getinfo_helper_config() 113
 +problem file-size /src/app/config/or_options_st.h 1112
 +problem include-count /src/app/main/main.c 68
  problem function-size /src/app/main/main.c:dumpstats() 102
  problem function-size /src/app/main/main.c:tor_init() 137
  problem function-size /src/app/main/main.c:sandbox_init_filter() 291



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

[tor-commits] [tor/master] whitespace fix

2019-08-26 Thread dgoulet

commit 03247c8eaa305fc527ecda075a7b0a7145014c98
Author: Nick Mathewson 
Date:   Sat Aug 24 17:11:41 2019 -0400

whitespace fix
---
 src/lib/conf/confmacros.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/conf/confmacros.h b/src/lib/conf/confmacros.h
index aa89965e6..2a15f09aa 100644
--- a/src/lib/conf/confmacros.h
+++ b/src/lib/conf/confmacros.h
@@ -49,7 +49,7 @@
 #define CONFIG_VAR_DEFN(structtype, varname, vartype, membername,   \
 varflags, initval)  \
   { .member =   \
-  { .name = varname,\
+{ .name = varname,\
   .type = CONFIG_TYPE_EXTENDED, \
   .type_def =  ## _type_defn,   \
   .offset = offsetof(structtype, membername),   \



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

[tor-commits] [tor/master] Fix comment: ___ options are now that way because of the INVISIBLE flag.

2019-08-26 Thread dgoulet

commit 65511a45adfeff258e71329b3ff98d5159f09f88
Author: Nick Mathewson 
Date:   Sat Aug 24 17:26:02 2019 -0400

Fix comment: ___ options are now that way because of the INVISIBLE flag.
---
 src/app/config/config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 4bc807a6f..f2e8ec820 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -8136,7 +8136,7 @@ getinfo_helper_config(control_connection_t *conn,
 int i;
 for (i = 0; option_vars_[i].member.name; ++i) {
   const config_var_t *var = _vars_[i];
-  /* don't tell controller about triple-underscore options */
+  /* don't tell controller about invisible options */
   if (option_vars_[i].flags & CVFLAG_INVISIBLE)
 continue;
   const char *type = struct_var_get_typename(>member);



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

[tor-commits] [tor/master] clarify usage of and _ prefixes on config options

2019-08-26 Thread dgoulet

commit cde662e259005887b897b5108e8a4b63f99abb59
Author: Nick Mathewson 
Date:   Sat Aug 24 17:46:08 2019 -0400

clarify usage of __ and ___ prefixes on config options
---
 src/lib/conf/conftypes.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h
index 3b754e07b..fabad97d0 100644
--- a/src/lib/conf/conftypes.h
+++ b/src/lib/conf/conftypes.h
@@ -112,12 +112,14 @@ typedef struct struct_magic_decl_t {
 #define CVFLAG_OBSOLETE  (1u<<0)
 /**
  * Flag to indicate that an option is undumpable. An undumpable option is
- * never saved to disk, and is prefixed with __.
+ * never saved to disk. For historical reasons it is prefixed with __ but
+ * not with ___.
  **/
 #define CVFLAG_NODUMP(1u<<1)
 /**
  * Flag to indicate that an option is "invisible". An invisible option
  * is always undumpable, and we don't tell the controller about it.
+ * For historical reasons it is prefixed with ___.
  **/
 #define CVFLAG_INVISIBLE (1u<<2)
 



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

[tor-commits] [tor/master] Make "invisibility" and "undumpability" properties of variables.

2019-08-26 Thread dgoulet

commit f3330d2be3de287d4b15bd4d9b0e86fab3ffb9fd
Author: Nick Mathewson 
Date:   Fri Jun 21 10:17:59 2019 -0400

Make "invisibility" and "undumpability" properties of variables.

Previously, these were magical things that we detected by checking
whether a variable's name was prefixed with two or three underscores.
---
 src/app/config/config.c| 35 +++
 src/app/config/confparse.c |  2 +-
 src/lib/conf/conftypes.h   | 10 ++
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index d240a73fe..5667702a6 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -265,6 +265,13 @@ DUMMY_TYPECHECK_INSTANCE(or_options_t);
 #define VAR_D(varname,conftype,member,initvalue)\
   CONFIG_VAR_DEFN(or_options_t, varname, conftype, member, 0, initvalue)
 
+#define VAR_NODUMP(varname,conftype,member,initvalue) \
+  CONFIG_VAR_ETYPE(or_options_t, varname, conftype, member,   \
+   CVFLAG_NODUMP, initvalue)
+#define VAR_INVIS(varname,conftype,member,initvalue)  \
+  CONFIG_VAR_ETYPE(or_options_t, varname, conftype, member,   \
+   CVFLAG_NODUMP|CVFLAG_INVISIBLE, initvalue)
+
 #define V(member,conftype,initvalue)\
   VAR(#member, conftype, member, initvalue)
 
@@ -285,7 +292,7 @@ DUMMY_TYPECHECK_INSTANCE(or_options_t);
 #define VPORT(member)   \
   VAR(#member "Lines", LINELIST_V, member ## _lines, NULL), \
   VAR(#member, LINELIST_S, member ## _lines, NULL), \
-  VAR("__" #member, LINELIST_S, member ## _lines, NULL)
+  VAR_NODUMP("__" #member, LINELIST_S, member ## _lines, NULL)
 
 /** UINT64_MAX as a decimal string */
 #define UINT64_MAX_STRING "18446744073709551615"
@@ -682,15 +689,17 @@ static config_var_t option_vars_[] = {
   V(WarnPlaintextPorts,  CSV,  "23,109,110,143"),
   OBSOLETE("UseFilteringSSLBufferevents"),
   OBSOLETE("__UseFilteringSSLBufferevents"),
-  VAR("__ReloadTorrcOnSIGHUP",   BOOL,  ReloadTorrcOnSIGHUP,  "1"),
-  VAR("__AllDirActionsPrivate",  BOOL,  AllDirActionsPrivate, "0"),
-  VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits, "0"),
-  VAR("__DisableSignalHandlers", BOOL,  DisableSignalHandlers,"0"),
-  VAR("__LeaveStreamsUnattached",BOOL,  LeaveStreamsUnattached,   "0"),
-  VAR("__HashedControlSessionPassword", LINELIST, HashedControlSessionPassword,
+  VAR_NODUMP("__ReloadTorrcOnSIGHUP",   BOOL,  ReloadTorrcOnSIGHUP,  "1"),
+  VAR_NODUMP("__AllDirActionsPrivate",  BOOL,  AllDirActionsPrivate, "0"),
+  VAR_NODUMP("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits, "0"),
+  VAR_NODUMP("__DisableSignalHandlers", BOOL,  DisableSignalHandlers,"0"),
+  VAR_NODUMP("__LeaveStreamsUnattached",BOOL,  LeaveStreamsUnattached,   "0"),
+  VAR_NODUMP("__HashedControlSessionPassword", LINELIST,
+ HashedControlSessionPassword,
   NULL),
-  VAR("__OwningControllerProcess",STRING,OwningControllerProcess, NULL),
-  VAR("__OwningControllerFD", UINT64, OwningControllerFD, UINT64_MAX_STRING),
+  VAR_NODUMP("__OwningControllerProcess",STRING,OwningControllerProcess, NULL),
+  VAR_NODUMP("__OwningControllerFD", UINT64, OwningControllerFD,
+ UINT64_MAX_STRING),
   V(MinUptimeHidServDirectoryV2, INTERVAL, "96 hours"),
   V(TestingServerDownloadInitialDelay, CSV_INTERVAL, "0"),
   V(TestingClientDownloadInitialDelay, CSV_INTERVAL, "0"),
@@ -743,7 +752,8 @@ static config_var_t option_vars_[] = {
   V(TestingDirAuthVoteGuardIsStrict,  BOOL, "0"),
   V_D(TestingDirAuthVoteHSDir, ROUTERSET, NULL),
   V(TestingDirAuthVoteHSDirIsStrict,  BOOL, "0"),
-  VAR("___UsingTestNetworkDefaults", BOOL, UsingTestNetworkDefaults_, "0"),
+  VAR_INVIS("___UsingTestNetworkDefaults", BOOL, UsingTestNetworkDefaults_,
+"0"),
 
   END_OF_CONFIG_VARS
 };
@@ -783,7 +793,8 @@ static const config_var_t testing_tor_network_defaults[] = {
   V(TestingDirConnectionMaxStall, INTERVAL, "30 seconds"),
   V(TestingEnableConnBwEvent,BOOL, "1"),
   V(TestingEnableCellStatsEvent, BOOL, "1"),
-  VAR("___UsingTestNetworkDefaults", BOOL, UsingTestNetworkDefaults_, "1"),
+  VAR_INVIS("___UsingTestNetworkDefaults", BOOL, UsingTestNetworkDefaults_,
+ "1"),
   V(RendPostPeriod,  INTERVAL, "2 minutes"),
 
   END_OF_CONFIG_VARS
@@ -8180,7 +8191,7 @@ getinfo_helper_config(control_connection_t *conn,
 for (i = 0; option_vars_[i].member.name; ++i) {
   const config_var_t *var = _vars_[i];
   /* don't tell controller about triple-underscore options */
-  if (!strncmp(option_vars_[i].member.name, "___", 3))
+  if (option_vars_[i].flags & CVFLAG_INVISIBLE)
 continue;
   const char *type = struct_var_get_typename(>member);
   if (!type)
diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c
index

[tor-commits] [tor/master] Make config_var and config_fmt const.

2019-08-26 Thread dgoulet

commit f8b193a74a3967d23bf55c8dcfb5bb2a16692c97
Author: Nick Mathewson 
Date:   Fri Jun 21 11:20:21 2019 -0400

Make config_var and config_fmt const.

Now that we have a reasonable implementation for overriding the
default options for TestingTorNetwork, we don't need to modify
config_var_t structs any more.  And therefore, we can have constant
format options, like reasonable people.
---
 src/app/config/config.c   |  6 +++---
 src/app/config/config.h   |  2 +-
 src/app/config/confparse.c| 21 +++--
 src/app/config/confparse.h| 13 ++---
 src/app/config/statefile.c|  2 +-
 src/feature/dirauth/shared_random_state.c |  4 ++--
 src/test/test_confparse.c |  4 ++--
 7 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 5ea6c2d40..4bc807a6f 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -191,7 +191,7 @@ static const char unix_q_socket_prefix[] = "unix:\"";
 
 /** A list of abbreviations and aliases to map command-line options, obsolete
  * option names, or alternative option names, to their current values. */
-static config_abbrev_t option_abbrevs_[] = {
+static const config_abbrev_t option_abbrevs_[] = {
   PLURAL(AuthDirBadDirCC),
   PLURAL(AuthDirBadExitCC),
   PLURAL(AuthDirInvalidCC),
@@ -301,7 +301,7 @@ DUMMY_TYPECHECK_INSTANCE(or_options_t);
  * abbreviations, order is significant, since the first matching option will
  * be chosen first.
  */
-static config_var_t option_vars_[] = {
+static const config_var_t option_vars_[] = {
   V(AccountingMax,   MEMUNIT,  "0 bytes"),
   VAR("AccountingRule",  STRING,   AccountingRule_option,  "max"),
   V(AccountingStart, STRING,   NULL),
@@ -851,7 +851,7 @@ static void set_protocol_warning_severity_level(int 
warning_severity);
 #define OR_OPTIONS_MAGIC 9090909
 
 /** Configuration format for or_options_t. */
-STATIC config_format_t options_format = {
+STATIC const config_format_t options_format = {
   sizeof(or_options_t),
   {
"or_options_t",
diff --git a/src/app/config/config.h b/src/app/config/config.h
index 46db02f94..c6feb89fe 100644
--- a/src/app/config/config.h
+++ b/src/app/config/config.h
@@ -248,7 +248,7 @@ int options_any_client_port_set(const or_options_t 
*options);
 
 STATIC int options_act(const or_options_t *old_options);
 #ifdef TOR_UNIT_TESTS
-extern struct config_format_t options_format;
+extern const struct config_format_t options_format;
 #endif
 
 STATIC port_cfg_t *port_cfg_new(size_t namelen);
diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c
index 450ff5e08..9bc0b1dc7 100644
--- a/src/app/config/confparse.c
+++ b/src/app/config/confparse.c
@@ -100,9 +100,13 @@ config_find_deprecation(const config_format_t *fmt, const 
char *key)
   return NULL;
 }
 
-/** As config_find_option, but return a non-const pointer. */
-config_var_t *
-config_find_option_mutable(config_format_t *fmt, const char *key)
+/** If key is a configuration option, return the corresponding const
+ * config_var_t.  Otherwise, if key is a non-standard abbreviation,
+ * warn, and return the corresponding const config_var_t.  Otherwise return
+ * NULL.
+ */
+const config_var_t *
+config_find_option(const config_format_t *fmt, const char *key)
 {
   int i;
   size_t keylen = strlen(key);
@@ -127,17 +131,6 @@ config_find_option_mutable(config_format_t *fmt, const 
char *key)
   return NULL;
 }
 
-/** If key is a configuration option, return the corresponding const
- * config_var_t.  Otherwise, if key is a non-standard abbreviation,
- * warn, and return the corresponding const config_var_t.  Otherwise return
- * NULL.
- */
-const config_var_t *
-config_find_option(const config_format_t *fmt, const char *key)
-{
-  return config_find_option_mutable((config_format_t*)fmt, key);
-}
-
 /** Return the number of option entries in fmt. */
 static int
 config_count_options(const config_format_t *fmt)
diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h
index c53e3224d..65972d6fc 100644
--- a/src/app/config/confparse.h
+++ b/src/app/config/confparse.h
@@ -47,16 +47,17 @@ typedef void (*free_cfg_fn_t)(void*);
 typedef struct config_format_t {
   size_t size; /**< Size of the struct that everything gets parsed into. */
   struct_magic_decl_t magic; /**< Magic number info for this struct. */
-  config_abbrev_t *abbrevs; /**< List of abbreviations that we expand when
- * parsing this format. */
+  const config_abbrev_t *abbrevs; /**< List of abbreviations that we expand
+ * when parsing this format. */
   const config_deprecation_t *deprecations; /** List of deprecated options */
-  config_var_t *vars; /**< List of variables we recognize, their default
-   * values, and where we stick them in the structure. */
+  const

[tor-commits] [tor/master] Refactor handling of TestingTorNetwork

2019-08-26 Thread dgoulet

commit f306d12b58a9447076b961da072061f65830692c
Author: Nick Mathewson 
Date:   Fri Jun 21 11:11:48 2019 -0400

Refactor handling of TestingTorNetwork

Previously, when TestingTorNetwork was set, we would manually adjust
the initvalue members of a bunch of other config_var_t, and then
re-run the early parts or parsing the options.

Now we treat the initvalue fields as immutable, but instead assign
to them in options_init(), as early as possible.  Rather than
re-running the early parts of options, we just re-call the
options_init_from_string() function.

This patch de-kludges some of our code pretty handily.  I think it
could later handle authorities and fallbacks, but for now I think we
should leave those alone.
---
 scripts/maint/practracker/exceptions.txt |   2 +-
 src/app/config/config.c  | 186 +++
 src/app/config/testnet.inc   |  33 ++
 src/core/include.am  |   7 +-
 4 files changed, 104 insertions(+), 124 deletions(-)

diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index 2190fb1ca..1e1ccda78 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -30,7 +30,7 @@
 # Remember: It is better to fix the problem than to add a new exception!
 
 problem file-size /src/app/config/config.c 8518
-problem include-count /src/app/config/config.c 88
+problem include-count /src/app/config/config.c 89
 problem function-size /src/app/config/config.c:options_act_reversible() 296
 problem function-size /src/app/config/config.c:options_act() 589
 problem function-size /src/app/config/config.c:resolve_my_address() 192
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 5667702a6..5ea6c2d40 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -758,46 +758,28 @@ static config_var_t option_vars_[] = {
   END_OF_CONFIG_VARS
 };
 
+/** List of default directory authorities */
+static const char *default_authorities[] = {
+#include "auth_dirs.inc"
+  NULL
+};
+
+/** List of fallback directory authorities. The list is generated by opt-in of
+ * relays that meet certain stability criteria.
+ */
+static const char *default_fallbacks[] = {
+#include "fallback_dirs.inc"
+  NULL
+};
+
 /** Override default values with these if the user sets the TestingTorNetwork
  * option. */
-static const config_var_t testing_tor_network_defaults[] = {
-  V(DirAllowPrivateAddresses,BOOL, "1"),
-  V(EnforceDistinctSubnets,  BOOL, "0"),
-  V(AssumeReachable, BOOL, "1"),
-  V(AuthDirMaxServersPerAddr,POSINT, "0"),
-  V(ClientBootstrapConsensusAuthorityDownloadInitialDelay, CSV_INTERVAL, "0"),
-  V(ClientBootstrapConsensusFallbackDownloadInitialDelay, CSV_INTERVAL, "0"),
-  V(ClientBootstrapConsensusAuthorityOnlyDownloadInitialDelay, CSV_INTERVAL,
-"0"),
-  V(ClientDNSRejectInternalAddresses, BOOL,"0"),
-  V(ClientRejectInternalAddresses, BOOL,   "0"),
-  V(CountPrivateBandwidth,   BOOL, "1"),
-  V(ExitPolicyRejectPrivate, BOOL, "0"),
-  V(ExtendAllowPrivateAddresses, BOOL, "1"),
-  V(V3AuthVotingInterval,INTERVAL, "5 minutes"),
-  V(V3AuthVoteDelay, INTERVAL, "20 seconds"),
-  V(V3AuthDistDelay, INTERVAL, "20 seconds"),
-  V(TestingV3AuthInitialVotingInterval, INTERVAL, "150 seconds"),
-  V(TestingV3AuthInitialVoteDelay, INTERVAL, "20 seconds"),
-  V(TestingV3AuthInitialDistDelay, INTERVAL, "20 seconds"),
-  V(TestingAuthDirTimeToLearnReachability, INTERVAL, "0 minutes"),
-  V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "0 minutes"),
-  V(MinUptimeHidServDirectoryV2, INTERVAL, "0 minutes"),
-  V(TestingServerDownloadInitialDelay, CSV_INTERVAL, "0"),
-  V(TestingClientDownloadInitialDelay, CSV_INTERVAL, "0"),
-  V(TestingServerConsensusDownloadInitialDelay, CSV_INTERVAL, "0"),
-  V(TestingClientConsensusDownloadInitialDelay, CSV_INTERVAL, "0"),
-  V(TestingBridgeDownloadInitialDelay, CSV_INTERVAL, "10"),
-  V(TestingBridgeBootstrapDownloadInitialDelay, CSV_INTERVAL, "0"),
-  V(TestingClientMaxIntervalWithoutRequest, INTERVAL, "5 seconds"),
-  V(TestingDirConnectionMaxStall, INTERVAL, "30 seconds"),
-  V(TestingEnableConnBwEvent,BOOL, "1"),
-  V(TestingEnableCellStatsEvent, BOOL, "1"),
-  VAR_INVIS("___UsingTestNetworkDefaults", BOOL, UsingTestNetworkDefaults_,
- "1"),
-  V(RendPostPeriod,  INTERVAL, "2 minutes"),
-
-  END_OF_CONFIG_VARS
+static const struct {
+  const char *k;
+  const char *v;
+} testing_tor_network_defaults[] = {
+#include "testnet.inc"
+  { NULL, NULL }
 };
 
 #undef VAR
@@ -936,6 +918,32 @@ get_options,(void))
   return get_options_mutable();
 }
 
+/**
+ * True iff we have noticed that this is a testing tor network, and we
+ * should use the corresponding defaults.
+ **/
+static bool testing_network_configured = false;
+
+/**

[tor-commits] [tor/master] Remove src/core/ and src/feature dependencies from confparse.c

2019-08-26 Thread dgoulet

commit c32d485942e766eeea70cab468cc7c727a5be270
Author: Nick Mathewson 
Date:   Wed Jun 26 11:02:23 2019 -0400

Remove src/core/ and src/feature dependencies from confparse.c

This C file will eventually belong in lib/confmgt, so it needs to
have only low-level dependencies.  Now that it no longers needs
routerset.c, we can adjust its includes accordingly.

I'm not moving the file yet, since it would make fixup commits on
earlier branches here really hard to do.
---
 src/app/config/confparse.c | 12 +---
 src/app/config/confparse.h |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c
index 9bc0b1dc7..699fc0e3d 100644
--- a/src/app/config/confparse.c
+++ b/src/app/config/confparse.c
@@ -22,14 +22,20 @@
  */
 
 #define CONFPARSE_PRIVATE
-#include "core/or/or.h"
+#include "orconfig.h"
 #include "app/config/confparse.h"
-#include "feature/nodelist/routerset.h"
 
+#include "lib/confmgt/structvar.h"
 #include "lib/confmgt/unitparse.h"
 #include "lib/container/bitarray.h"
+#include "lib/container/smartlist.h"
 #include "lib/encoding/confline.h"
-#include "lib/confmgt/structvar.h"
+#include "lib/log/escape.h"
+#include "lib/log/log.h"
+#include "lib/log/util_bug.h"
+#include "lib/string/compat_ctype.h"
+#include "lib/string/printf.h"
+#include "lib/string/util_string.h"
 
 static void config_reset(const config_format_t *fmt, void *options,
  const config_var_t *var, int use_defaults);
diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h
index 65972d6fc..3633c2a80 100644
--- a/src/app/config/confparse.h
+++ b/src/app/config/confparse.h
@@ -15,6 +15,7 @@
 
 #include "lib/conf/conftypes.h"
 #include "lib/conf/confmacros.h"
+#include "lib/testsupport/testsupport.h"
 
 /** An abbreviation for a configuration option allowed on the command line. */
 typedef struct config_abbrev_t {



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

[tor-commits] [tor/master] Move config_var_t info conftypes.h

2019-08-26 Thread dgoulet

commit 4d101b39d74fb467d7fb4ad8ddb27e07c3074a69
Author: Nick Mathewson 
Date:   Thu Jun 20 15:21:21 2019 -0400

Move config_var_t info conftypes.h
---
 src/app/config/confparse.h | 13 -
 src/lib/conf/conftypes.h   | 13 +
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h
index b91ea1c13..f89ff3c21 100644
--- a/src/app/config/confparse.h
+++ b/src/app/config/confparse.h
@@ -32,19 +32,6 @@ typedef struct config_deprecation_t {
  * you can abbreviate toks as tok". */
 #define PLURAL(tok) { #tok, #tok "s", 0, 0 }
 
-/** A variable allowed in the configuration file or on the command line. */
-typedef struct config_var_t {
-  struct_member_t member; /** A struct member corresponding to this
-   * variable. */
-  const char *initvalue; /**< String (or null) describing initial value. */
-
-#ifdef TOR_UNIT_TESTS
-  /** Used for compiler-magic to typecheck the corresponding field in the
-   * corresponding struct. Only used in unit test mode, at compile-time. */
-  confparse_dummy_values_t var_ptr_dummy;
-#endif
-} config_var_t;
-
 /* Macros to define extra members inside config_var_t fields, and at the
  * end of a list of them.
  */
diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h
index cddfeff2f..5f13ec3de 100644
--- a/src/lib/conf/conftypes.h
+++ b/src/lib/conf/conftypes.h
@@ -136,4 +136,17 @@ typedef union {
 } confparse_dummy_values_t;
 #endif /* defined(TOR_UNIT_TESTS) */
 
+/** A variable allowed in the configuration file or on the command line. */
+typedef struct config_var_t {
+  struct_member_t member; /** A struct member corresponding to this
+   * variable. */
+  const char *initvalue; /**< String (or null) describing initial value. */
+
+#ifdef TOR_UNIT_TESTS
+  /** Used for compiler-magic to typecheck the corresponding field in the
+   * corresponding struct. Only used in unit test mode, at compile-time. */
+  confparse_dummy_values_t var_ptr_dummy;
+#endif
+} config_var_t;
+
 #endif /* !defined(TOR_SRC_LIB_CONF_CONFTYPES_H) */



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

[tor-commits] [tor/master] Add a "flags" member to config_var_t

2019-08-26 Thread dgoulet

commit 5b252d31ede521bea53c690693a2ab3d74c8fef4
Author: Nick Mathewson 
Date:   Thu Jun 20 16:07:00 2019 -0400

Add a "flags" member to config_var_t

Additionally, adjust the macros so that we can add new members like
this more easily.
---
 src/lib/conf/confmacros.h  |  2 +-
 src/lib/conf/conftesting.h |  4 ++--
 src/lib/conf/conftypes.h   |  3 ++-
 src/test/test_confparse.c  | 16 +++-
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/lib/conf/confmacros.h b/src/lib/conf/confmacros.h
index 29040e1f5..4242137c5 100644
--- a/src/lib/conf/confmacros.h
+++ b/src/lib/conf/confmacros.h
@@ -19,7 +19,7 @@
  * Used to indicate the end of an array of configuration variables.
  **/
 #define END_OF_CONFIG_VARS  \
-  { { .name = NULL }, NULL DUMMY_CONF_TEST_MEMBERS }
+  { .member = { .name = NULL } DUMMY_CONF_TEST_MEMBERS }
 
 /**
  * Declare a config_var_t as a member named membername of the structure
diff --git a/src/lib/conf/conftesting.h b/src/lib/conf/conftesting.h
index f4aca442a..a40c9bc97 100644
--- a/src/lib/conf/conftesting.h
+++ b/src/lib/conf/conftesting.h
@@ -68,8 +68,8 @@ typedef union {
 #define CONF_CHECK_VAR_TYPE(tp, conftype, member)   \
   { . conftype =  ## _dummy . member }
 #define CONF_TEST_MEMBERS(tp, conftype, member) \
-  , CONF_CHECK_VAR_TYPE(tp, conftype, member)
-#define DUMMY_CONF_TEST_MEMBERS , { .INT=NULL }
+  , .var_ptr_dummy=CONF_CHECK_VAR_TYPE(tp, conftype, member)
+#define DUMMY_CONF_TEST_MEMBERS , .var_ptr_dummy={ .INT=NULL }
 #define DUMMY_TYPECHECK_INSTANCE(tp)\
   static tp tp ## _dummy
 
diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h
index 72697e8ee..028a88991 100644
--- a/src/lib/conf/conftypes.h
+++ b/src/lib/conf/conftypes.h
@@ -110,7 +110,8 @@ typedef struct config_var_t {
   struct_member_t member; /** A struct member corresponding to this
* variable. */
   const char *initvalue; /**< String (or null) describing initial value. */
-
+  uint32_t flags; /**< One or more flags describing special handling for this
+   * variable */
 #ifdef TOR_UNIT_TESTS
   /** Used for compiler-magic to typecheck the corresponding field in the
* corresponding struct. Only used in unit test mode, at compile-time. */
diff --git a/src/test/test_confparse.c b/src/test/test_confparse.c
index 2f408b5b6..4bf66f323 100644
--- a/src/test/test_confparse.c
+++ b/src/test/test_confparse.c
@@ -52,9 +52,8 @@ static test_struct_t test_struct_t_dummy;
   CONFIG_VAR_ETYPE(test_struct_t, varname, conftype, member, initvalue)
 #define V(member,conftype,initvalue)\
   VAR(#member, conftype, member, initvalue)
-
-#define OBSOLETE(varname)   \
-  { { .name=varname, .type=CONFIG_TYPE_OBSOLETE }, NULL, {.INT=NULL} }
+#define OBSOLETE(varname)   \
+  CONFIG_VAR_OBSOLETE(varname)
 
 static config_var_t test_vars[] = {
   V(s, STRING, "hello"),
@@ -78,12 +77,11 @@ static config_var_t test_vars[] = {
   VAR("LineTypeB", LINELIST_S, mixed_lines, NULL),
   OBSOLETE("obsolete"),
   {
-   { .name = "routerset",
- .type = CONFIG_TYPE_EXTENDED,
- .type_def = _type_defn,
- .offset = offsetof(test_struct_t, routerset),
-   },
-   NULL, {.INT=NULL}
+   .member = { .name = "routerset",
+   .type = CONFIG_TYPE_EXTENDED,
+   .type_def = _type_defn,
+   .offset = offsetof(test_struct_t, routerset),
+ },
   },
   VAR("__HiddenInt", POSINT, hidden_int, "0"),
   VAR("MixedHiddenLines", LINELIST_V, mixed_hidden_lines, NULL),



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

[tor-commits] [tor/master] Move responsibility for config var macros

2019-08-26 Thread dgoulet

commit c553750e32d1bf669a3e8308fa44319954a627ca
Author: Nick Mathewson 
Date:   Thu Jun 20 15:55:59 2019 -0400

Move responsibility for config var macros

The testing-only parts now live in a conftesting.h; the shared parts
of the macros live in confmacros.h
---
 src/app/config/config.c   | 26 ++
 src/app/config/confparse.h| 39 +-
 src/app/config/statefile.c|  9 +---
 src/feature/dirauth/shared_random_state.c | 12 ++---
 src/lib/conf/.may_include |  1 +
 src/lib/conf/confmacros.h | 61 ++
 src/lib/conf/conftesting.h| 86 +++
 src/lib/conf/conftypes.h  | 37 ++---
 src/lib/conf/include.am   |  4 +-
 src/test/test_confparse.c | 12 ++---
 10 files changed, 169 insertions(+), 118 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 8da1e2acd..c15236b0e 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -259,28 +259,12 @@ DUMMY_TYPECHECK_INSTANCE(or_options_t);
  * or_options_t.member"
  */
 #define VAR(varname,conftype,member,initvalue)  \
-  { { .name = varname,  \
-.type = CONFIG_TYPE_ ## conftype,   \
-.offset = offsetof(or_options_t, member),   \
-},  \
-  initvalue CONF_TEST_MEMBERS(or_options_t, conftype, member) }
-
-#ifdef TOR_UNIT_TESTS
-#define DUMMY_TEST_MEMBERS , {.INT=NULL}
-#else
-#define DUMMY_TEST_MEMBERS
-#endif
+  CONFIG_VAR_ETYPE(or_options_t, varname, conftype, member, initvalue)
 
 /* As VAR, but uses a type definition in addition to a type enum. */
 #define VAR_D(varname,conftype,member,initvalue)\
-  { { .name = varname,  \
-.type = CONFIG_TYPE_ ## conftype,   \
-.type_def =  ## _type_defn,\
-.offset = offsetof(or_options_t, member),   \
-},  \
-  initvalue DUMMY_TEST_MEMBERS }
-
-/** As VAR, but the option name and member name are the same. */
+  CONFIG_VAR_DEFN(or_options_t, varname, conftype, member, initvalue)
+
 #define V(member,conftype,initvalue)\
   VAR(#member, conftype, member, initvalue)
 
@@ -289,9 +273,7 @@ DUMMY_TYPECHECK_INSTANCE(or_options_t);
   VAR_D(#member, type, member, initvalue)
 
 /** An entry for config_vars: "The option varname is obsolete." */
-#define OBSOLETE(varname) \
-  { { .name = varname, .type = CONFIG_TYPE_OBSOLETE, }, NULL   \
-DUMMY_TEST_MEMBERS }
+#define OBSOLETE(varname) CONFIG_VAR_OBSOLETE(varname)
 
 /**
  * Macro to declare *Port options.  Each one comes in three entries.
diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h
index f89ff3c21..6d63ba3e0 100644
--- a/src/app/config/confparse.h
+++ b/src/app/config/confparse.h
@@ -14,6 +14,7 @@
 #define TOR_CONFPARSE_H
 
 #include "lib/conf/conftypes.h"
+#include "lib/conf/confmacros.h"
 
 /** An abbreviation for a configuration option allowed on the command line. */
 typedef struct config_abbrev_t {
@@ -32,44 +33,6 @@ typedef struct config_deprecation_t {
  * you can abbreviate toks as tok". */
 #define PLURAL(tok) { #tok, #tok "s", 0, 0 }
 
-/* Macros to define extra members inside config_var_t fields, and at the
- * end of a list of them.
- */
-#ifdef TOR_UNIT_TESTS
-/* This is a somewhat magic type-checking macro for users of confparse.c.
- * It initializes a union member "confparse_dummy_values_t.conftype" with
- * the address of a static member "tp_dummy.member".   This
- * will give a compiler warning unless the member field is of the correct
- * type.
- *
- * (This warning is mandatory, because a type mismatch here violates the type
- * compatibility constraint for simple assignment, and requires a diagnostic,
- * according to the C spec.)
- *
- * For example, suppose you say:
- * "CONF_CHECK_VAR_TYPE(or_options_t, STRING, Address)".
- * Then this macro will evaluate to:
- * { .STRING = _options_t_dummy.Address }
- * And since confparse_dummy_values_t.STRING has type "char **", that
- * expression will create a warning unless or_options_t.Address also
- * has type "char *".
- */
-#define CONF_CHECK_VAR_TYPE(tp, conftype, member)   \
-  { . conftype =  ## _dummy . member }
-#define CONF_TEST_MEMBERS(tp, conftype, member) \
-  , CONF_CHECK_VAR_TYPE(tp, conftype, member)
-#define END_OF_CONFIG_VARS  \
-  { { .name = NULL }, NULL, { .INT=NULL } }
-#define DUMMY_TYPECHECK_INSTANCE(tp)\
-  static tp tp ## _dummy
-#else /* !(defined(TOR_UNIT_TESTS)) */
-#define CONF_TEST_MEMBERS(tp,

[tor-commits] [tor/master] Extend macros to allow flag arguments.

2019-08-26 Thread dgoulet

commit b6457d4c08f601c4e42e64aad47ac9c30c36306e
Author: Nick Mathewson 
Date:   Thu Jun 20 16:26:05 2019 -0400

Extend macros to allow flag arguments.
---
 src/app/config/config.c   |  4 ++--
 src/app/config/statefile.c|  2 +-
 src/feature/dirauth/shared_random_state.c |  2 +-
 src/lib/conf/confmacros.h | 10 +++---
 src/test/test_confparse.c |  2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index c15236b0e..5f7a82d15 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -259,11 +259,11 @@ DUMMY_TYPECHECK_INSTANCE(or_options_t);
  * or_options_t.member"
  */
 #define VAR(varname,conftype,member,initvalue)  \
-  CONFIG_VAR_ETYPE(or_options_t, varname, conftype, member, initvalue)
+  CONFIG_VAR_ETYPE(or_options_t, varname, conftype, member, 0, initvalue)
 
 /* As VAR, but uses a type definition in addition to a type enum. */
 #define VAR_D(varname,conftype,member,initvalue)\
-  CONFIG_VAR_DEFN(or_options_t, varname, conftype, member, initvalue)
+  CONFIG_VAR_DEFN(or_options_t, varname, conftype, member, 0, initvalue)
 
 #define V(member,conftype,initvalue)\
   VAR(#member, conftype, member, initvalue)
diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c
index e0584c62a..4fe415b8c 100644
--- a/src/app/config/statefile.c
+++ b/src/app/config/statefile.c
@@ -71,7 +71,7 @@ static config_abbrev_t state_abbrevs_[] = {
 DUMMY_TYPECHECK_INSTANCE(or_state_t);
 
 #define VAR(varname,conftype,member,initvalue)  \
-  CONFIG_VAR_ETYPE(or_state_t, varname, conftype, member, initvalue)
+  CONFIG_VAR_ETYPE(or_state_t, varname, conftype, member, 0, initvalue)
 #define V(member,conftype,initvalue)\
   VAR(#member, conftype, member, initvalue)
 
diff --git a/src/feature/dirauth/shared_random_state.c 
b/src/feature/dirauth/shared_random_state.c
index 3cdb223d2..d89f249a7 100644
--- a/src/feature/dirauth/shared_random_state.c
+++ b/src/feature/dirauth/shared_random_state.c
@@ -52,7 +52,7 @@ static const char dstate_cur_srv_key[] = 
"SharedRandCurrentValue";
 DUMMY_TYPECHECK_INSTANCE(sr_disk_state_t);
 
 #define VAR(varname,conftype,member,initvalue)  \
-  CONFIG_VAR_ETYPE(sr_disk_state_t, varname, conftype, member, initvalue)
+  CONFIG_VAR_ETYPE(sr_disk_state_t, varname, conftype, member, 0, initvalue)
 #define V(member,conftype,initvalue)\
   VAR(#member, conftype, member, initvalue)
 
diff --git a/src/lib/conf/confmacros.h b/src/lib/conf/confmacros.h
index 4242137c5..ff284e681 100644
--- a/src/lib/conf/confmacros.h
+++ b/src/lib/conf/confmacros.h
@@ -30,12 +30,14 @@
  * Most modules that use this macro should wrap it in a local macro that
  * sets structtype to the local configuration type.
  **/
-#define CONFIG_VAR_ETYPE(structtype, varname, vartype, membername, initval) \
+#define CONFIG_VAR_ETYPE(structtype, varname, vartype, membername,  \
+ varflags, initval) \
   { .member =   \
 { .name = varname,  \
   .type = CONFIG_TYPE_ ## vartype,  \
   .offset = offsetof(structtype, membername),   \
 },  \
+.flags = varflags,  \
 .initvalue = initval\
 CONF_TEST_MEMBERS(structtype, vartype, membername)  \
   }
@@ -44,13 +46,15 @@
  * As CONFIG_VAR_XTYPE, but declares a value using an extension type whose
  * type definition is vartype_type_defn.
  **/
-#define CONFIG_VAR_DEFN(structtype, varname, vartype, membername, initval) \
+#define CONFIG_VAR_DEFN(structtype, varname, vartype, membername,   \
+varflags, initval)  \
   { .member =   \
-{ .name = varname,  \
+  { .name = varname,\
   .type = CONFIG_TYPE_EXTENDED, \
   .type_def =  ## _type_defn,   \
   .offset = offsetof(structtype, membername),   \
 },  \
+.flags = varflags,  \
 .initvalue = initval\
 CONF_TEST_MEMBERS(structtype, vartype, membername)  \
   }
diff --git a/src/test/test_confparse.c b/src/test/test_confparse.c
index 4bf66f323..4612419df 100644
---

[tor-commits] [tor/master] Turn several properties of types or variables into flags.

2019-08-26 Thread dgoulet

commit a7835202cf871f68854494df904058a6e644c0b0
Author: Nick Mathewson 
Date:   Fri Jun 21 09:58:40 2019 -0400

Turn several properties of types or variables into flags.

"unsettable" is a property of types.  LINELIST_V and OBSOLETE are
unsettable, meaning that they cannot be set by name.

"contained" is a property of types.  I'm hoping to find a better
name here.  LINELIST_S is "contained" because it always appears
within a LINELIST_V, and as such doesn't need to be dumped ore
copied independently.

"cumulative" is a property of types. Cumulative types can appear
more than once in a torrc without causing a warning, because they
add to each other rather than replacing each other.

"obsolete" is a property of variables.

"marking fragile" is now a command that struct members can accept.

With these changes, confparse and config no longer ever need to
mention CONFIG_TYPE_XYZ values by name.
---
 src/app/config/config.c   |  9 +++---
 src/app/config/confparse.c| 45 ---
 src/app/config/confparse.h|  4 +++
 src/lib/conf/confmacros.h |  4 ++-
 src/lib/conf/conftypes.h  |  6 
 src/lib/confmgt/structvar.c   | 37 ++
 src/lib/confmgt/structvar.h   |  5 +++
 src/lib/confmgt/type_defs.c   | 65 +++
 src/lib/confmgt/typedvar.c| 45 +++
 src/lib/confmgt/typedvar.h|  6 
 src/lib/confmgt/var_type_def_st.h | 20 
 11 files changed, 203 insertions(+), 43 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 5f7a82d15..d240a73fe 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -960,8 +960,8 @@ set_options(or_options_t *new_val, char **msg)
 for (i=0; options_format.vars[i].member.name; ++i) {
   const config_var_t *var = _format.vars[i];
   const char *var_name = var->member.name;
-  if (var->member.type == CONFIG_TYPE_LINELIST_S ||
-  var->member.type == CONFIG_TYPE_OBSOLETE) {
+  if (config_var_is_contained(var)) {
+/* something else will check this var, or it doesn't need checking */
 continue;
   }
   if (!config_is_same(_format, new_val, old_options, var_name)) {
@@ -2663,9 +2663,10 @@ list_torrc_options(void)
   int i;
   for (i = 0; option_vars_[i].member.name; ++i) {
 const config_var_t *var = _vars_[i];
-if (var->member.type == CONFIG_TYPE_OBSOLETE ||
-var->member.type == CONFIG_TYPE_LINELIST_V)
+if (! config_var_is_settable(var)) {
+  /* This variable cannot be set, or cannot be set by this name. */
   continue;
+}
 printf("%s\n", var->member.name);
   }
 }
diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c
index 2890d8c81..0d19974d7 100644
--- a/src/app/config/confparse.c
+++ b/src/app/config/confparse.c
@@ -148,6 +148,24 @@ config_count_options(const config_format_t *fmt)
   return i;
 }
 
+bool
+config_var_is_cumulative(const config_var_t *var)
+{
+  return struct_var_is_cumulative(>member);
+}
+bool
+config_var_is_settable(const config_var_t *var)
+{
+  if (var->flags & CVFLAG_OBSOLETE)
+return false;
+  return struct_var_is_settable(>member);
+}
+bool
+config_var_is_contained(const config_var_t *var)
+{
+  return struct_var_is_contained(>member);
+}
+
 /*
  * Functions to assign config options.
  */
@@ -183,14 +201,7 @@ config_mark_lists_fragile(const config_format_t *fmt, void 
*options)
 
   for (i = 0; fmt->vars[i].member.name; ++i) {
 const config_var_t *var = >vars[i];
-config_line_t *list;
-if (var->member.type != CONFIG_TYPE_LINELIST &&
-var->member.type != CONFIG_TYPE_LINELIST_V)
-  continue;
-
-list = *(config_line_t **)STRUCT_VAR_P(options, var->member.offset);
-if (list)
-  list->fragile = 1;
+struct_var_mark_fragile(options, >member);
   }
 }
 
@@ -255,9 +266,7 @@ config_assign_line(const config_format_t *fmt, void 
*options,
   if (!strlen(c->value)) {
 /* reset or clear it, then return */
 if (!clear_first) {
-  if ((var->member.type == CONFIG_TYPE_LINELIST ||
-   var->member.type == CONFIG_TYPE_LINELIST_S) &&
-  c->command != CONFIG_LINE_CLEAR) {
+  if (config_var_is_cumulative(var) && c->command != CONFIG_LINE_CLEAR) {
 /* We got an empty linelist from the torrc or command line.
As a special case, call this an error. Warn and ignore. */
 log_warn(LD_CONFIG,
@@ -273,8 +282,7 @@ config_assign_line(const config_format_t *fmt, void 
*options,
 config_reset(fmt, options, var, use_defaults); // LCOV_EXCL_LINE
   }
 
-  if (options_seen && (var->member.type != CONFIG_TYPE_LINELIST &&
-   var->member.type != CONFIG_TYPE_LINELIST_S)) {
+  if (options_seen && ! config_var_is_cumulative(var)) {
 /* We're tracking which options we've seen, and this option is

[tor-commits] [snowflake/master] Version bump for bug #31385

2019-08-26 Thread cohosh

commit 4b6871a24e857201357e614657a6df223639e2c8
Author: Cecylia Bocovich 
Date:   Mon Aug 26 09:16:47 2019 -0400

Version bump for bug #31385
---
 proxy/webext/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxy/webext/manifest.json b/proxy/webext/manifest.json
index af15e93..bc93608 100644
--- a/proxy/webext/manifest.json
+++ b/proxy/webext/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Snowflake",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "__MSG_appDesc__",
   "default_locale": "en_US",
   "background": {

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

[tor-commits] [snowflake/master] Added check for active pair in onopen

2019-08-26 Thread cohosh

commit 16a1b69823fd1b699a273c54dfe359d794d60220
Author: Cecylia Bocovich 
Date:   Sat Aug 24 19:02:54 2019 -0400

Added check for active pair in onopen

Because the timeout makes the pair inactive, we should check for this
state in onopen before connecting to the client. Updated tests to set
the proxy pair to active before testing onopen. Also removed a
redundant statement.
---
 proxy/proxypair.js   | 3 +++
 proxy/snowflake.js   | 2 --
 proxy/spec/proxypair.spec.js | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/proxy/proxypair.js b/proxy/proxypair.js
index 703ac27..fd5a39a 100644
--- a/proxy/proxypair.js
+++ b/proxy/proxypair.js
@@ -85,6 +85,9 @@ class ProxyPair {
   prepareDataChannel(channel) {
 channel.onopen = () => {
   log('WebRTC DataChannel opened!');
+  if (!this.active) {
+  return
+  }
   this.running = true;
   snowflake.state = Snowflake.MODE.WEBRTC_READY;
   snowflake.ui.setActive(true);
diff --git a/proxy/snowflake.js b/proxy/snowflake.js
index 0edb42c..cdc59fb 100644
--- a/proxy/snowflake.js
+++ b/proxy/snowflake.js
@@ -86,8 +86,6 @@ class Snowflake {
 return pair.active = false;
   }
 }), 2); // 20 second timeout
-  } else {
-return pair.active = false;
   }
 }, function() {
   return pair.active = false;
diff --git a/proxy/spec/proxypair.spec.js b/proxy/spec/proxypair.spec.js
index 3716f2d..f15d6d2 100644
--- a/proxy/spec/proxypair.spec.js
+++ b/proxy/spec/proxypair.spec.js
@@ -100,6 +100,7 @@ describe('ProxyPair', function() {
 
   it('connects to the relay once datachannel opens', function() {
 spyOn(pp, 'connectRelay');
+pp.active = true;
 pp.client.onopen();
 expect(pp.connectRelay).toHaveBeenCalled();
   });

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

[tor-commits] [snowflake/master] Fix to check running status before closing proxy

2019-08-26 Thread cohosh

commit 8a5941daab398cd7595c5fdfdae4afb2acc271a9
Author: Cecylia Bocovich 
Date:   Fri Aug 23 15:45:18 2019 -0400

Fix to check running status before closing proxy

This fixes a bug reported in #31385. There was an error with the proxy
deadlock fix in #31100 where we close proxies regardless of connection
status.
---
 proxy/snowflake.js | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/proxy/snowflake.js b/proxy/snowflake.js
index 7a242db..0edb42c 100644
--- a/proxy/snowflake.js
+++ b/proxy/snowflake.js
@@ -78,11 +78,13 @@ class Snowflake {
 if (!this.receiveOffer(pair, desc)) {
   return pair.active = false;
 }
-//set a timeout for channel creation 
+//set a timeout for channel creation
 return setTimeout((() => {
-  log('proxypair datachannel timed out waiting for open');
-  pair.close();
-  return pair.active = false;
+  if (!pair.running) {
+log('proxypair datachannel timed out waiting for open');
+pair.close();
+return pair.active = false;
+  }
 }), 2); // 20 second timeout
   } else {
 return pair.active = false;



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

[tor-commits] [translation-tools/master] remove discontinued lektor project

2019-08-26 Thread emmapeel

commit 5c3858540f0dee86b586b600ba0570716169c267
Author: emma peel 
Date:   Mon Aug 26 13:08:39 2019 +

remove discontinued lektor project
---
 config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config b/config
index 02f45b5..f2ac4f8 100644
--- a/config
+++ b/config
@@ -18,7 +18,6 @@ https_everywhere https_everywhere_completed
 liveusb-creator liveusb-creator_completed
 mat-gui mat-gui_completed
 orfox-stringsxml orfox-stringsxml_completed
-researchtpo-contentspot researchtpo-contentspot_completed
 snowflakeaddon-messages.json snowflakeaddon-messages.json_completed
 snowflake-website-indexhtml snowflake-website-indexhtml_completed
 tails-misc tails-misc_completed tails-misc_release

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

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

2019-08-26 Thread translation

commit 670c4b870918a87dd0d02b42d8121517b627e01a
Author: Translation commit bot 
Date:   Mon Aug 26 08:20:59 2019 +

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

diff --git a/zh_TW.po b/zh_TW.po
index 6968e6b8d..d6dace9c3 100644
--- a/zh_TW.po
+++ b/zh_TW.po
@@ -6,7 +6,7 @@
 # AgustÃn Wu , 2016
 # Hsiu-Ming Chang , 2014
 # Hsiu-Ming Chang , 2014
-# Chi-Hsun Tsai, 2017-2018
+# Chi-Hsun Tsai, 2017-2019
 # danfong , 2014
 # danfong , 2014
 # Hsiu-Ming Chang , 2019
@@ -21,8 +21,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-08-14 14:11+0200\n"
-"PO-Revision-Date: 2019-08-24 02:11+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-08-26 08:11+\n"
+"Last-Translator: Chi-Hsun Tsai\n"
 "Language-Team: Chinese (Taiwan) 
(http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2019-08-26 Thread translation

commit 37ddd9b38b1faec3eaa3bbd008e754c362a34654
Author: Translation commit bot 
Date:   Mon Aug 26 08:19:56 2019 +

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

diff --git a/zh_TW.po b/zh_TW.po
index 6968e6b8d..d6dace9c3 100644
--- a/zh_TW.po
+++ b/zh_TW.po
@@ -6,7 +6,7 @@
 # AgustÃn Wu , 2016
 # Hsiu-Ming Chang , 2014
 # Hsiu-Ming Chang , 2014
-# Chi-Hsun Tsai, 2017-2018
+# Chi-Hsun Tsai, 2017-2019
 # danfong , 2014
 # danfong , 2014
 # Hsiu-Ming Chang , 2019
@@ -21,8 +21,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-08-14 14:11+0200\n"
-"PO-Revision-Date: 2019-08-24 02:11+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-08-26 08:11+\n"
+"Last-Translator: Chi-Hsun Tsai\n"
 "Language-Team: Chinese (Taiwan) 
(http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

75 matches

Mail list logo