date:20181119

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

2018-11-19 Thread translation

commit 0a9270120d97afda318242a64f35287b7e8f7a4a
Author: Translation commit bot 
Date:   Tue Nov 20 07:45:12 2018 +

Update translations for bridgedb
---
 es/LC_MESSAGES/bridgedb.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po
index 4f313d9d9..e42e3c4e7 100644
--- a/es/LC_MESSAGES/bridgedb.po
+++ b/es/LC_MESSAGES/bridgedb.po
@@ -25,7 +25,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-11-10 10:55+\n"
+"PO-Revision-Date: 2018-11-20 07:45+\n"
 "Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr "Oh oh, Â¡la liamos!  "
 
 #: bridgedb/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
-msgstr "Parece que hubo un error al obtener su cÃ³digo QR. "
+msgstr "Parece que hubo un error al obtener tu cÃ³digo QR. "
 
 #: bridgedb/https/templates/bridges.html:73
 msgid ""

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

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

2018-11-19 Thread translation

commit 77208baf2e13887870bec600f185c89d52215db1
Author: Translation commit bot 
Date:   Tue Nov 20 07:45:19 2018 +

Update translations for bridgedb_completed
---
 es/LC_MESSAGES/bridgedb.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po
index 4f313d9d9..f908f8979 100644
--- a/es/LC_MESSAGES/bridgedb.po
+++ b/es/LC_MESSAGES/bridgedb.po
@@ -25,7 +25,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-11-10 10:55+\n"
+"PO-Revision-Date: 2018-11-20 07:45+\n"
 "Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -89,13 +89,13 @@ msgstr "Oh oh, Â¡la liamos!  "
 
 #: bridgedb/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
-msgstr "Parece que hubo un error al obtener su cÃ³digo QR. "
+msgstr "Parece que hubo un error al obtener tu cÃ³digo QR. "
 
 #: bridgedb/https/templates/bridges.html:73
 msgid ""
 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
 " your bridge lines onto mobile and other devices."
-msgstr "Este cÃ³digo QR contiene sus lÃneas de puente. EscanÃ©elo con un 
lector de cÃ³digos QR para copiar sus lÃneas de puente a dispositivos mÃ³viles 
y otros dispositivos."
+msgstr "Este cÃ³digo QR contiene sus lÃneas de puente. EscanÃ©alo con un 
lector de cÃ³digos QR para copiar tus lÃneas de puente a dispositivos mÃ³viles 
y otros dispositivos."
 
 #: bridgedb/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."

___
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

2018-11-19 Thread translation

commit 58c4811d6be2db54403b0a1d6b2b91060df1ff44
Author: Translation commit bot 
Date:   Tue Nov 20 07:16:02 2018 +

Update translations for tails-misc
---
 mk.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk.po b/mk.po
index df7c4fe38..7b3aacf92 100644
--- a/mk.po
+++ b/mk.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-31 16:04+0100\n"
-"PO-Revision-Date: 2018-11-18 04:17+\n"
+"PO-Revision-Date: 2018-11-20 07:11+\n"
 "Last-Translator: Liljana Ackovska \n"
 "Language-Team: Macedonian 
(http://www.transifex.com/otf/torproject/language/mk/)\n"
 "MIME-Version: 1.0\n"

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

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

2018-11-19 Thread translation

commit 104618623937d8181329150ff9873122f4989ded
Author: Translation commit bot 
Date:   Tue Nov 20 05:19:25 2018 +

Update translations for torbutton-browseronboardingproperties_completed
---
 sv/browserOnboarding.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sv/browserOnboarding.properties b/sv/browserOnboarding.properties
index 779564dbb..8cc7e3f11 100644
--- a/sv/browserOnboarding.properties
+++ b/sv/browserOnboarding.properties
@@ -4,17 +4,17 @@
 
 onboarding.tour-tor-welcome=VÃ¤lkommen
 onboarding.tour-tor-welcome.title=Du Ã¤r redo.
-onboarding.tour-tor-welcome.description=Tor-webblÃ¤saren erbjuder hÃ¶gsta 
standard fÃ¶r integritet och sÃ¤kerhet nÃ¤r du surfar pÃ¥ webben. Du Ã¤r nu 
skyddad mot spÃ¥rning, Ã¶vervakning och censur. Denna snabba introduktion 
kommer att visa dig hur.
+onboarding.tour-tor-welcome.description=Tor Browser erbjuder hÃ¶gsta standard 
fÃ¶r integritet och sÃ¤kerhet nÃ¤r du surfar pÃ¥ webben. Du Ã¤r nu skyddad mot 
spÃ¥rning, Ã¶vervakning och censur. Denna snabba introduktion kommer att visa 
dig hur.
 onboarding.tour-tor-welcome.button=BÃ¶rja nu
 
 onboarding.tour-tor-privacy=Sekretess
 onboarding.tour-tor-privacy.title=Avvisa bevakare och snokare.
-onboarding.tour-tor-privacy.description=Tor-webblÃ¤saren isolerar kakor och 
tar bort din webblÃ¤sarhistorik efter din session. Dessa Ã¤ndringar 
sÃ¤kerstÃ¤lla din integritet och sÃ¤kerhet skyddas i webblÃ¤saren. Klicka pÃ¥ 
"Tor-nÃ¤tverk" fÃ¶r att lÃ¤ra dig hur vi skyddar dig pÃ¥ nÃ¤tverksnivÃ¥.
+onboarding.tour-tor-privacy.description=Tor Browser isolerar kakor och tar 
bort din webblÃ¤sarhistorik efter din session. Dessa Ã¤ndringar sÃ¤kerstÃ¤lla 
din integritet och sÃ¤kerhet skyddas i webblÃ¤saren. Klicka pÃ¥ "Tor-nÃ¤tverk" 
fÃ¶r att lÃ¤ra dig hur vi skyddar dig pÃ¥ nÃ¤tverksnivÃ¥.
 onboarding.tour-tor-privacy.button=GÃ¥ till Tor-nÃ¤tverket
 
 onboarding.tour-tor-network=Tor-nÃ¤tverk
 onboarding.tour-tor-network.title=Res ett decentraliserat nÃ¤tverk.
-onboarding.tour-tor-network.description=Tor-webblÃ¤saren ansluter dig till 
Tor-nÃ¤tverket som drivs av tusentals volontÃ¤rer runt om i vÃ¤rlden. Till 
skillnad frÃ¥n en VPN, det finns ingen punkt av misslyckande eller 
centraliserad enhet du behÃ¶ver lita pÃ¥ fÃ¶r att njuta av internet privat.
+onboarding.tour-tor-network.description=Tor Browser ansluter dig till 
Tor-nÃ¤tverket som drivs av tusentals volontÃ¤rer runt om i vÃ¤rlden. Till 
skillnad frÃ¥n en VPN, det finns ingen punkt av misslyckande eller 
centraliserad enhet du behÃ¶ver lita pÃ¥ fÃ¶r att njuta av internet privat.
 onboarding.tour-tor-network.button=GÃ¥ till kretsvisning
 
 onboarding.tour-tor-circuit-display=Kretsvisning

___
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

2018-11-19 Thread translation

commit f8f09d7b3e3c4a156d9dff3bb8b58a1ed6ee4279
Author: Translation commit bot 
Date:   Tue Nov 20 05:19:31 2018 +

Update translations for torcheck
---
 sv/torcheck.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sv/torcheck.po b/sv/torcheck.po
index ae8f9..27ec75a3a 100644
--- a/sv/torcheck.po
+++ b/sv/torcheck.po
@@ -5,6 +5,7 @@
 # Emil Johansson , 2015
 # Jacob Andersson , 2017
 # Jonatan Nyberg, 2017
+# Jonatan Nyberg, 2018
 # mathiasfriman4896b3d1564846bb , 2012
 # Petomatick , 2011
 # ph AA, 2015
@@ -14,10 +15,10 @@
 # WinterFairy , 2013-2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2017-12-24 10:48+\n"
-"Last-Translator: Jacob Andersson \n"
+"PO-Revision-Date: 2018-11-20 04:56+\n"
+"Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +37,7 @@ msgid ""
 msgstr "BesÃ¶k https://www.torproject.org/\;>Tor webbplatsen 
fÃ¶r mer information om hur du anvÃ¤nder Tor sÃ¤kert.  Du kan nu surfa pÃ¥ 
nÃ¤tet anonymt."
 
 msgid "There is a security update available for Tor Browser."
-msgstr "Det finns en tillgÃ¤nglig sÃ¤kerhets uppdatering fÃ¶r Tor-webblÃ¤sare."
+msgstr "Det finns en tillgÃ¤nglig sÃ¤kerhets uppdatering fÃ¶r Tor Browser."
 
 msgid ""
 "https://www.torproject.org/download/download-easy.html\;>Click "

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

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2018-11-19 Thread translation

commit eba538b3d8d13f87d8b292620bddda1d2541a541
Author: Translation commit bot 
Date:   Tue Nov 20 05:19:50 2018 +

Update translations for tor-launcher-network-settings
---
 sv/network-settings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv/network-settings.dtd b/sv/network-settings.dtd
index 415a03f00..47473dfd5 100644
--- a/sv/network-settings.dtd
+++ b/sv/network-settings.dtd
@@ -4,7 +4,7 @@
 
 
 
-
+
 
 
 

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

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

2018-11-19 Thread translation

commit 3593239e10faddfa1f5d162663146504e20ce5cc
Author: Translation commit bot 
Date:   Tue Nov 20 05:19:37 2018 +

Update translations for torcheck_completed
---
 sv/torcheck.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sv/torcheck.po b/sv/torcheck.po
index ae8f9..27ec75a3a 100644
--- a/sv/torcheck.po
+++ b/sv/torcheck.po
@@ -5,6 +5,7 @@
 # Emil Johansson , 2015
 # Jacob Andersson , 2017
 # Jonatan Nyberg, 2017
+# Jonatan Nyberg, 2018
 # mathiasfriman4896b3d1564846bb , 2012
 # Petomatick , 2011
 # ph AA, 2015
@@ -14,10 +15,10 @@
 # WinterFairy , 2013-2014
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2017-12-24 10:48+\n"
-"Last-Translator: Jacob Andersson \n"
+"PO-Revision-Date: 2018-11-20 04:56+\n"
+"Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +37,7 @@ msgid ""
 msgstr "BesÃ¶k https://www.torproject.org/\;>Tor webbplatsen 
fÃ¶r mer information om hur du anvÃ¤nder Tor sÃ¤kert.  Du kan nu surfa pÃ¥ 
nÃ¤tet anonymt."
 
 msgid "There is a security update available for Tor Browser."
-msgstr "Det finns en tillgÃ¤nglig sÃ¤kerhets uppdatering fÃ¶r Tor-webblÃ¤sare."
+msgstr "Det finns en tillgÃ¤nglig sÃ¤kerhets uppdatering fÃ¶r Tor Browser."
 
 msgid ""
 "https://www.torproject.org/download/download-easy.html\;>Click "

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

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

2018-11-19 Thread translation

commit 330604b32678162ac57d2ffca55f7361559ceabb
Author: Translation commit bot 
Date:   Tue Nov 20 05:19:14 2018 +

Update translations for torbutton-abouttbupdatedtd_completed
---
 sv/abouttbupdate.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv/abouttbupdate.dtd b/sv/abouttbupdate.dtd
index 7b7572800..781f545a0 100644
--- a/sv/abouttbupdate.dtd
+++ b/sv/abouttbupdate.dtd
@@ -1,5 +1,5 @@
 
-
+
 
 
 

___
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

2018-11-19 Thread translation

commit 3fe47948d4278c24e220f9de697901bd7e915f10
Author: Translation commit bot 
Date:   Tue Nov 20 05:19:07 2018 +

Update translations for torbutton-abouttbupdatedtd
---
 sv/abouttbupdate.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv/abouttbupdate.dtd b/sv/abouttbupdate.dtd
index 7b7572800..781f545a0 100644
--- a/sv/abouttbupdate.dtd
+++ b/sv/abouttbupdate.dtd
@@ -1,5 +1,5 @@
 
-
+
 
 
 

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

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

2018-11-19 Thread translation

commit 01b0da782fffaf94364668381b90fddc3cc2049a
Author: Translation commit bot 
Date:   Tue Nov 20 05:19:20 2018 +

Update translations for torbutton-browseronboardingproperties
---
 sv/browserOnboarding.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sv/browserOnboarding.properties b/sv/browserOnboarding.properties
index 779564dbb..8cc7e3f11 100644
--- a/sv/browserOnboarding.properties
+++ b/sv/browserOnboarding.properties
@@ -4,17 +4,17 @@
 
 onboarding.tour-tor-welcome=VÃ¤lkommen
 onboarding.tour-tor-welcome.title=Du Ã¤r redo.
-onboarding.tour-tor-welcome.description=Tor-webblÃ¤saren erbjuder hÃ¶gsta 
standard fÃ¶r integritet och sÃ¤kerhet nÃ¤r du surfar pÃ¥ webben. Du Ã¤r nu 
skyddad mot spÃ¥rning, Ã¶vervakning och censur. Denna snabba introduktion 
kommer att visa dig hur.
+onboarding.tour-tor-welcome.description=Tor Browser erbjuder hÃ¶gsta standard 
fÃ¶r integritet och sÃ¤kerhet nÃ¤r du surfar pÃ¥ webben. Du Ã¤r nu skyddad mot 
spÃ¥rning, Ã¶vervakning och censur. Denna snabba introduktion kommer att visa 
dig hur.
 onboarding.tour-tor-welcome.button=BÃ¶rja nu
 
 onboarding.tour-tor-privacy=Sekretess
 onboarding.tour-tor-privacy.title=Avvisa bevakare och snokare.
-onboarding.tour-tor-privacy.description=Tor-webblÃ¤saren isolerar kakor och 
tar bort din webblÃ¤sarhistorik efter din session. Dessa Ã¤ndringar 
sÃ¤kerstÃ¤lla din integritet och sÃ¤kerhet skyddas i webblÃ¤saren. Klicka pÃ¥ 
"Tor-nÃ¤tverk" fÃ¶r att lÃ¤ra dig hur vi skyddar dig pÃ¥ nÃ¤tverksnivÃ¥.
+onboarding.tour-tor-privacy.description=Tor Browser isolerar kakor och tar 
bort din webblÃ¤sarhistorik efter din session. Dessa Ã¤ndringar sÃ¤kerstÃ¤lla 
din integritet och sÃ¤kerhet skyddas i webblÃ¤saren. Klicka pÃ¥ "Tor-nÃ¤tverk" 
fÃ¶r att lÃ¤ra dig hur vi skyddar dig pÃ¥ nÃ¤tverksnivÃ¥.
 onboarding.tour-tor-privacy.button=GÃ¥ till Tor-nÃ¤tverket
 
 onboarding.tour-tor-network=Tor-nÃ¤tverk
 onboarding.tour-tor-network.title=Res ett decentraliserat nÃ¤tverk.
-onboarding.tour-tor-network.description=Tor-webblÃ¤saren ansluter dig till 
Tor-nÃ¤tverket som drivs av tusentals volontÃ¤rer runt om i vÃ¤rlden. Till 
skillnad frÃ¥n en VPN, det finns ingen punkt av misslyckande eller 
centraliserad enhet du behÃ¶ver lita pÃ¥ fÃ¶r att njuta av internet privat.
+onboarding.tour-tor-network.description=Tor Browser ansluter dig till 
Tor-nÃ¤tverket som drivs av tusentals volontÃ¤rer runt om i vÃ¤rlden. Till 
skillnad frÃ¥n en VPN, det finns ingen punkt av misslyckande eller 
centraliserad enhet du behÃ¶ver lita pÃ¥ fÃ¶r att njuta av internet privat.
 onboarding.tour-tor-network.button=GÃ¥ till kretsvisning
 
 onboarding.tour-tor-circuit-display=Kretsvisning

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

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

2018-11-19 Thread translation

commit ebaad06f1f0e59592f04ae5788b5021385340869
Author: Translation commit bot 
Date:   Tue Nov 20 05:18:32 2018 +

Update translations for torbutton-branddtd_completed
---
 sv/brand.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sv/brand.dtd b/sv/brand.dtd
index 43a95e121..797bdb92d 100644
--- a/sv/brand.dtd
+++ b/sv/brand.dtd
@@ -2,9 +2,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-
-
-
+
+
+
 
 
 

___
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

2018-11-19 Thread translation

commit 99f009aa1d6a0aadcfecdecc68040ce8473f461b
Author: Translation commit bot 
Date:   Tue Nov 20 05:18:53 2018 +

Update translations for torbutton-torbuttondtd_completed
---
 sv/torbutton.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv/torbutton.dtd b/sv/torbutton.dtd
index 4bbc35a8c..067b45b31 100644
--- a/sv/torbutton.dtd
+++ b/sv/torbutton.dtd
@@ -6,12 +6,12 @@
 
 
 
-
+
 
 
 
 
-
+
 
 
 

___
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

2018-11-19 Thread translation

commit 014b35cd68f356c44f7524b6b00be6f1f9856738
Author: Translation commit bot 
Date:   Tue Nov 20 05:18:47 2018 +

Update translations for torbutton-torbuttondtd
---
 sv/torbutton.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv/torbutton.dtd b/sv/torbutton.dtd
index 4bbc35a8c..067b45b31 100644
--- a/sv/torbutton.dtd
+++ b/sv/torbutton.dtd
@@ -6,12 +6,12 @@
 
 
 
-
+
 
 
 
 
-
+
 
 
 

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

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

2018-11-19 Thread translation

commit 618b41f026f7dd2ea9a226d8eda5004508dea03d
Author: Translation commit bot 
Date:   Tue Nov 20 05:18:26 2018 +

Update translations for torbutton-branddtd
---
 sv/brand.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sv/brand.dtd b/sv/brand.dtd
index 43a95e121..797bdb92d 100644
--- a/sv/brand.dtd
+++ b/sv/brand.dtd
@@ -2,9 +2,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-
-
-
+
+
+
 
 
 

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

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

2018-11-19 Thread translation

commit e05acbb483d05446f55daa1b6c95fb5660dd0f28
Author: Translation commit bot 
Date:   Tue Nov 20 05:18:20 2018 +

Update translations for torbutton-brandproperties_completed
---
 sv/brand.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sv/brand.properties b/sv/brand.properties
index 7c215e548..555e01e65 100644
--- a/sv/brand.properties
+++ b/sv/brand.properties
@@ -2,9 +2,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShorterName=Tor webblÃ¤saren
-brandShortName=Tor webblÃ¤saren
-brandFullName=Tor webblÃ¤saren
+brandShorterName=Tor Browser
+brandShortName=Tor Browser
+brandFullName=Tor Browser
 vendorShortName=Tor-projektet
 
 homePageSingleStartMain=Firefox Start, en snabb hemsida med inbyggd 
sÃ¶kfunktion

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

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2018-11-19 Thread translation

commit 5c7a056d52ddedf1ad02d13826f763a9fb18f22b
Author: Translation commit bot 
Date:   Tue Nov 20 05:18:02 2018 +

Update translations for tor-browser-manual
---
 sv/sv.po | 56 
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index ad39bb47a..755cbe221 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -31,19 +31,19 @@ msgstr "Lista med Ã¶versÃ¤ttare"
 #: about-tor-browser.page:7
 msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
-"Ta reda pÃ¥ vad Tor-webblÃ¤saren kan gÃ¶ra fÃ¶r att skydda din integritet och 
"
+"Ta reda pÃ¥ vad Tor Browser kan gÃ¶ra fÃ¶r att skydda din integritet och "
 "anonymitet"
 
 #: about-tor-browser.page:10
 msgid "About Tor Browser"
-msgstr "Om Tor-webblÃ¤sare"
+msgstr "Om Tor Browser"
 
 #: about-tor-browser.page:12
 msgid ""
 "Tor Browser uses the Tor network to protect your privacy and anonymity. "
 "Using the Tor network has two main properties:"
 msgstr ""
-"Tor webblÃ¤sare anvÃ¤nder Tor nÃ¤tverket fÃ¶r att skydda din integritet och 
din "
+"Tor Browser anvÃ¤nder Tor nÃ¤tverket fÃ¶r att skydda din integritet och din "
 "anonymitet. Tor nÃ¤tverk har tvÃ¥ huvudsakliga egenskaper:"
 
 #: about-tor-browser.page:18
@@ -406,8 +406,8 @@ msgid ""
 " Dropbox, Google Drive and GitHub."
 msgstr ""
 "GetTor Ã¤r en tjÃ¤nst som automatiskt svarar pÃ¥ meddelanden med lÃ¤nkar till 
"
-"den senaste versionen av Tor-webblÃ¤saren, som finns pÃ¥ en mÃ¤ngd olika "
-"platser, som Dropbox, Google Drive och GitHub."
+"den senaste versionen av Tor Browser, som finns pÃ¥ en mÃ¤ngd olika platser, "
+"som Dropbox, Google Drive och GitHub."
 
 #: downloading.page:33
 msgid "To use GetTor via email:"
@@ -1059,8 +1059,8 @@ msgid ""
 "Browser from being able to reach the site."
 msgstr ""
 "Om du inte kan nÃ¥ den onion-tjÃ¤nst du behÃ¶ver, se till att du har angett "
-"onion-adressen korrekt: Ã¤ven ett litet misstag hindrar Tor-webblÃ¤saren 
frÃ¥n "
-"att kunna nÃ¥ webbplatsen."
+"onion-adressen korrekt: Ã¤ven ett litet misstag hindrar Tor Browser frÃ¥n att 
"
+"kunna nÃ¥ webbplatsen."
 
 #: onionsites.page:64
 msgid ""
@@ -1105,11 +1105,11 @@ msgid ""
 msgstr ""
 "Video webbplatser, som Vimeo, anvÃ¤nder sig av Flash Player fÃ¶r att kunna "
 "spela upp video innehÃ¥llet. TyvÃ¤rr verkar detta programmet utanfÃ¶r Tor "
-"webblÃ¤saren och det gÃ¥r inte att fÃ¥ det att lÃ¤tt uppnÃ¥ Tor webblÃ¤sarens 
"
-"proxy instÃ¤llningar. Flash player kan dÃ¤rfÃ¶r visa din riktiga position och 
"
-"IP-adress till webbplatsens operatÃ¶r eller andra observatÃ¶rer. PÃ¥ grund av 
"
-"detta Ã¤r Flash avstÃ¤ngt frÃ¥n bÃ¶rjan i Tor webblÃ¤saren, men det gÃ¥r att 
slÃ¥ "
-"pÃ¥ den fast det rekomenderas inte."
+"Browser och det gÃ¥r inte att fÃ¥ det att lÃ¤tt uppnÃ¥ Tor webblÃ¤sarens 
proxy "
+"instÃ¤llningar. Flash player kan dÃ¤rfÃ¶r visa din riktiga position och IP-"
+"adress till webbplatsens operatÃ¶r eller andra observatÃ¶rer. PÃ¥ grund av "
+"detta Ã¤r Flash avstÃ¤ngt frÃ¥n bÃ¶rjan i Tor Browser, men det gÃ¥r att slÃ¥ 
pÃ¥ "
+"den fast det rekomenderas inte."
 
 #: plugins.page:23
 msgid ""
@@ -1119,7 +1119,7 @@ msgid ""
 msgstr ""
 "En del video webbplatser (som Youtube) erbjuder andra alternativ fÃ¶r att "
 "kunna spela upp video innehÃ¥llet som inte anvÃ¤nder sig av Flash. Dessa "
-"alternativen kan vara kompatibla med Tor webblÃ¤saren."
+"alternativen kan vara kompatibla med Tor Browser."
 
 #: plugins.page:31
 msgid "JavaScript"
@@ -1144,7 +1144,7 @@ msgid ""
 "JavaScript (and other scripts) that runs on individual web pages, or block "
 "it entirely."
 msgstr ""
-"Tor-webblÃ¤saren innehÃ¥ller ett tillÃ¤gg kallat NoScript, tillgÃ¤ngligt via "
+"Tor Browser innehÃ¥ller ett tillÃ¤gg kallat NoScript, tillgÃ¤ngligt via "
 "\"S\"-ikonen lÃ¤ngst upp till vÃ¤nster i fÃ¶nstret. NoScript lÃ¥ter dig styra 
"
 "JavaScript (och andra skript) som kÃ¶rs pÃ¥ enskilda webbplatser, eller "
 "blockera det helt."
@@ -1175,9 +1175,9 @@ msgstr ""
 "webblÃ¤sarens SÃ¤kerhetsreglage till "
 "\"SÃ¤krare\" (som inaktiverar JavaScript fÃ¶r icke-HTTPS-webbplatser) eller "
 "\"sÃ¤kraste\" (vilket gÃ¶r det fÃ¶r alla webbplatser). Att inaktivera "
-"JavaScript fÃ¶rhindrar dock att mÃ¥nga webbplatser visas korrekt, sÃ¥ Tor-"
-"webblÃ¤sare-standardinstÃ¤llning Ã¤r att alla webbplatser ska kunna kÃ¶ra 
skript"
-" i \"Standard\"-lÃ¤ge."
+"JavaScript fÃ¶rhindrar dock att mÃ¥nga webbplatser visas korrekt, sÃ¥ Tor "
+"Browser-standardinstÃ¤llning Ã¤r att alla webbplatser ska kunna kÃ¶ra skript 
i "
+"\"Standard\"-lÃ¤ge."
 
 #: plugins.page:59
 msgid "Browser Add-ons"
@@ -1454,10 +1454,10 @@ msgid ""
 " sign up and begin."
 msgstr ""
 "Om du Ã¤r intresserad av att hjÃ¤lpa till med projektet genom att Ã¶versÃ¤tta 
"
-"bruksanvisningen eller Tor-webblÃ¤saren till ditt sprÃ¥k, skulle din hjÃ¤lp "
-"vara mycket uppskattad! FÃ¶r att kunna bÃ¶rja bidra mÃ¥ste du registrera dig "
-"hos Transifex, den tredjepart som underlÃ¤ttar vÃ¥ra

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

2018-11-19 Thread translation

commit 9906bedca11accb6da0a0aa5d572ed4146a73eec
Author: Translation commit bot 
Date:   Tue Nov 20 05:18:13 2018 +

Update translations for torbutton-brandproperties
---
 sv/brand.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sv/brand.properties b/sv/brand.properties
index 7c215e548..555e01e65 100644
--- a/sv/brand.properties
+++ b/sv/brand.properties
@@ -2,9 +2,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShorterName=Tor webblÃ¤saren
-brandShortName=Tor webblÃ¤saren
-brandFullName=Tor webblÃ¤saren
+brandShorterName=Tor Browser
+brandShortName=Tor Browser
+brandFullName=Tor Browser
 vendorShortName=Tor-projektet
 
 homePageSingleStartMain=Firefox Start, en snabb hemsida med inbyggd 
sÃ¶kfunktion

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

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

2018-11-19 Thread translation

commit 3048193a6895cd0402e619f22b8ad6bf5f988342
Author: Translation commit bot 
Date:   Tue Nov 20 05:17:46 2018 +

Update translations for tor_animation_completed
---
 sv.srt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv.srt b/sv.srt
index e5ce72dd7..47590e034 100644
--- a/sv.srt
+++ b/sv.srt
@@ -55,7 +55,7 @@ Men inte om du anvÃ¤nder Tor!
 
 13
 00:00:37,140 --> 00:00:40,840
-Tor-webblÃ¤saren skyddar ditt privatliv
+Tor Browser skyddar ditt privatliv
 och din identitet pÃ¥ internet.
 
 14

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

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

2018-11-19 Thread translation

commit 93cf036475a25348df8d7e54e233d81c138dd1cc
Author: Translation commit bot 
Date:   Tue Nov 20 05:17:40 2018 +

Update translations for tor_animation
---
 sv.srt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv.srt b/sv.srt
index e5ce72dd7..47590e034 100644
--- a/sv.srt
+++ b/sv.srt
@@ -55,7 +55,7 @@ Men inte om du anvÃ¤nder Tor!
 
 13
 00:00:37,140 --> 00:00:40,840
-Tor-webblÃ¤saren skyddar ditt privatliv
+Tor Browser skyddar ditt privatliv
 och din identitet pÃ¥ internet.
 
 14

___
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

2018-11-19 Thread translation

commit 03e8577564678eeda7be32bb603d530a99f4e527
Author: Translation commit bot 
Date:   Tue Nov 20 05:16:16 2018 +

Update translations for tails-misc
---
 sv.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv.po b/sv.po
index 6bf3decee..b8c7660dd 100644
--- a/sv.po
+++ b/sv.po
@@ -25,7 +25,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-31 16:04+0100\n"
-"PO-Revision-Date: 2018-11-07 09:36+\n"
+"PO-Revision-Date: 2018-11-20 04:57+\n"
 "Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -719,7 +719,7 @@ msgstr "LÃ¤r dig mer om Tails"
 
 #: 
../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
 msgid "Tor Browser"
-msgstr "Tor webblÃ¤saren"
+msgstr "Tor Browser"
 
 #: 
../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
 msgid "Anonymous Web Browser"

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

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

2018-11-19 Thread translation

commit d6aac8d669691bc65ac8a254f5ff70e9b9ef711f
Author: Translation commit bot 
Date:   Tue Nov 20 05:15:25 2018 +

Update translations for bridgedb_completed
---
 sv/LC_MESSAGES/bridgedb.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 6dc471f15..06de0f97a 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -8,6 +8,7 @@
 # Gabor Sebastiani, 2014
 # Jacob Andersson , 2018
 # Jonatan Nyberg, 2017
+# Jonatan Nyberg, 2018
 # Peter Michanek , 2015
 # Petomatick , 2011
 # ph AA, 2015
@@ -16,11 +17,11 @@
 # WinterFairy , 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-04-12 18:54+\n"
-"Last-Translator: Martin Coborn \n"
+"PO-Revision-Date: 2018-11-20 04:58+\n"
+"Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -130,7 +131,7 @@ msgstr "Steg %s3%s"
 #: bridgedb/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "LÃ¤gg nu till %s bryggorna till Tor %s"
+msgstr "LÃ¤gg nu till %s bryggorna till Tor Browser%s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!

___
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

2018-11-19 Thread translation

commit 5a500988de8f15d2a9aa447b53d795d9cc8e59c1
Author: Translation commit bot 
Date:   Tue Nov 20 05:15:05 2018 +

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

diff --git a/sv/aboutTor.dtd b/sv/aboutTor.dtd
index 76dcfa013..110322e4f 100644
--- a/sv/aboutTor.dtd
+++ b/sv/aboutTor.dtd
@@ -15,10 +15,10 @@
 https://duckduckgo.com;>
 
 
-
+
 
 
-
+
 
 
 

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

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

2018-11-19 Thread translation

commit 2b21ff3e475b7a02845f3db61e987a686f9cdcbf
Author: Translation commit bot 
Date:   Tue Nov 20 05:15:18 2018 +

Update translations for bridgedb
---
 sv/LC_MESSAGES/bridgedb.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 6dc471f15..06de0f97a 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -8,6 +8,7 @@
 # Gabor Sebastiani, 2014
 # Jacob Andersson , 2018
 # Jonatan Nyberg, 2017
+# Jonatan Nyberg, 2018
 # Peter Michanek , 2015
 # Petomatick , 2011
 # ph AA, 2015
@@ -16,11 +17,11 @@
 # WinterFairy , 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-04-12 18:54+\n"
-"Last-Translator: Martin Coborn \n"
+"PO-Revision-Date: 2018-11-20 04:58+\n"
+"Last-Translator: Jonatan Nyberg\n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -130,7 +131,7 @@ msgstr "Steg %s3%s"
 #: bridgedb/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "LÃ¤gg nu till %s bryggorna till Tor %s"
+msgstr "LÃ¤gg nu till %s bryggorna till Tor Browser%s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!

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

[tor-commits] [bridgedb/master] Render the contact email address

2018-11-19 Thread sysrqb

commit 2458f374d69bd6cc57f268013f6e9ebf02f132f9
Author: Matthew Finkel 
Date:   Tue Nov 20 02:55:37 2018 +

Render the contact email address

 * FIXES #23894 https://bugs.torproject.org/23894
---
 bridgedb/distributors/https/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridgedb/distributors/https/templates/base.html 
b/bridgedb/distributors/https/templates/base.html
index edd25ff..93eb2b5 100644
--- a/bridgedb/distributors/https/templates/base.html
+++ b/bridgedb/distributors/https/templates/base.html
@@ -67,7 +67,7 @@ ${next.body(strings, rtl=rtl, lang=lang, **kwargs)}
 ${_(strings.HELP[0])}
 
   ${_(strings.HELP[1]) % \
- ("""mailto:frontd...@torproject.org;>""")}
+ ("""mailto:frontd...@torproject.org;>frontd...@torproject.org""")}
   ${_(strings.HELP[2])}
 
   

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

[tor-commits] [bridgedb/master] Bug 23894 - Correct another location

2018-11-19 Thread sysrqb

commit 98959db87996407ec4e734c44a7ab9970ede5dde
Author: Matthew Finkel 
Date:   Tue Nov 20 02:35:57 2018 +

Bug 23894 - Correct another location
---
 bridgedb/distributors/https/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridgedb/distributors/https/templates/base.html 
b/bridgedb/distributors/https/templates/base.html
index 0582d46..edd25ff 100644
--- a/bridgedb/distributors/https/templates/base.html
+++ b/bridgedb/distributors/https/templates/base.html
@@ -85,7 +85,7 @@ ${next.body(strings, rtl=rtl, lang=lang, **kwargs)}
 https://gitweb.torproject.org/bridgedb.git/tree/CHANGELOG;>
   ${_("Changelog")}
   
-mailto:h...@rt.torproject.org;>
+mailto:frontd...@torproject.org;>
   ${_("Contact")}
   
 ${_("Public Keys")}

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

[tor-commits] [bridgedb/master] Really change the contact address, in the correct place this time

2018-11-19 Thread sysrqb

commit 1d2d260c00b0b0e89b5df07d2df30733895108bb
Author: Matthew Finkel 
Date:   Tue Nov 20 02:24:39 2018 +

Really change the contact address, in the correct place this time

 * FIXES #23894 https://bugs.torproject.org/23894
---
 bridgedb/distributors/https/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridgedb/distributors/https/templates/base.html 
b/bridgedb/distributors/https/templates/base.html
index 86bf85d..0582d46 100644
--- a/bridgedb/distributors/https/templates/base.html
+++ b/bridgedb/distributors/https/templates/base.html
@@ -67,7 +67,7 @@ ${next.body(strings, rtl=rtl, lang=lang, **kwargs)}
 ${_(strings.HELP[0])}
 
   ${_(strings.HELP[1]) % \
- ("""mailto:h...@rt.torproject.org;>h...@rt.torproject.org""")}
+ ("""mailto:frontd...@torproject.org;>""")}
   ${_(strings.HELP[2])}
 
   

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

[tor-commits] [bridgedb/master] Change maintainer and CI references

2018-11-19 Thread sysrqb

commit 38c025ab495347956b1d3a74c1f7e3504f823159
Author: Matthew Finkel 
Date:   Mon Nov 19 22:24:51 2018 +

Change maintainer and CI references

Isis, thanks for everything.

 * FIXES #28528 https://trac.torproject.org/28528
---
 .travis.yml |  1 -
 AUTHORS |  2 +-
 README.rst  | 11 ++-
 setup.py|  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9fb68f3..c474963 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ notifications:
 on_failure: always
   email:
 recipients:
-  - i...@torproject.org
   - sys...@torproject.org
 on_success: never
 on_failure: change
diff --git a/AUTHORS b/AUTHORS
index 4995534..e8b068b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,8 +1,8 @@
 Current core developers:
-  Isis Lovecruft 0xA3ADB67A2CDB8B35
   Matthew Finkel   0x017DD169EA793BE2
 
 Past core developers:
+  Isis Lovecruft 0xA3ADB67A2CDB8B35
   Nick Mathewson0x21194EBB165733EA
   Aaron Gibson 0x2C4B239DD876C9F6
   Christian Fromme  0xA922CB73CC0960D0
diff --git a/README.rst b/README.rst
index b234d01..feb5227 100644
--- a/README.rst
+++ b/README.rst
@@ -9,10 +9,11 @@ a webserver with `an HTTPS interface 
`__,
 
 .. |Latest Version| image:: 
https://pypip.in/version/bridgedb/badge.svg?style=flat
:target: https://pypi.python.org/pypi/bridgedb/
-.. |Build Status| image:: https://travis-ci.org/isislovecruft/bridgedb.svg
-   :target: https://travis-ci.org/isislovecruft/bridgedb
-.. |Coverage Status| image:: 
https://coveralls.io/repos/isislovecruft/bridgedb/badge.png?branch=develop
-   :target: https://coveralls.io/r/isislovecruft/bridgedb?branch=develop
+.. |Build Status| image:: https://travis-ci.org/sysrqbci/bridgedb.svg
+   :target: https://travis-ci.org/sysrqbci/bridgedb
+.. |Coverage Status| image:: 
https://coveralls.io/repos/github/sysrqbci/bridgedb/badge.svg?branch=develop
+   :target: https://coveralls.io/github/sysrqbci/bridgedb?branch=develop
+
 
 
 .. image:: doc/sphinx/source/_static/bay-bridge.jpg
@@ -590,4 +591,4 @@ Contact & Support
 
 Send your questions, patches, and suggestions to
 `the tor-dev mailing list `__
-or `isis `__.
+or `sysrqb `__.
diff --git a/setup.py b/setup.py
index 1139a65..a31391c 100644
--- a/setup.py
+++ b/setup.py
@@ -369,8 +369,8 @@ setuptools.setup(
 description='Backend systems for distribution of Tor bridge relays',
 author='Nick Mathewson',
 author_email='nickm at torproject dot org',
-maintainer='Isis Agora Lovecruft',
-maintainer_email='i...@torproject.org 0xA3ADB67A2CDB8B35',
+maintainer='Matthew Finkel',
+maintainer_email='sys...@torproject.org 0xCB8FC772D1AA1D30',
 url='https://www.torproject.org',
 download_url='https://gitweb.torproject.org/bridgedb.git',
 package_dir={'bridgedb': 'bridgedb'},



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

[tor-commits] [bridgedb/master] Change contact email address

2018-11-19 Thread sysrqb

commit 280599e1836610e052be84d7d7ab16e50c091a3f
Author: Matthew Finkel 
Date:   Mon Nov 19 21:35:21 2018 +

Change contact email address

 * FIXES #23894 https://bugs.torproject.org/23894
---
 bridgedb/strings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridgedb/strings.py b/bridgedb/strings.py
index 1c40695..49bb933 100644
--- a/bridgedb/strings.py
+++ b/bridgedb/strings.py
@@ -271,7 +271,7 @@ EMAIL_SPRINTF = {
 # For the "%s Tor Browser download page %s" part of ``HOWTO_TBB[1]``
 "HOWTO_TBB1": ("", "[0]"),
 # For the "you should email %s" in ``HELP[0]``
-"HELP0": ("h...@rt.torproject.org"),
+"HELP0": ("frontd...@torproject.org"),
 }
 """``EMAIL_SPRINTF`` is a dictionary that maps translated strings which
 contain format specifiers (i.e. ``%s``) to what those format specifiers should



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

[tor-commits] [bridgedb/master] Merge branch 'bug23894' into develop

2018-11-19 Thread sysrqb

commit 09de26c244f31a7029825b402b70d3a316af1604
Merge: 21e9bb1 280599e
Author: Matthew Finkel 
Date:   Mon Nov 19 22:54:37 2018 +

Merge branch 'bug23894' into develop

 bridgedb/strings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

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

2018-11-19 Thread sysrqb

commit 5ca53926d4bf32fe2cdd2ae3f2dba9e7a6f91b4e
Merge: ac7df7f 8a74291
Author: Isis Lovecruft 
Date:   Mon May 21 18:59:51 2018 +

Merge branch 'master' into develop




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

[tor-commits] [bridgedb/master] Merge branch '28528' into develop

2018-11-19 Thread sysrqb

commit 21e9bb195915957baa088838c2f9c46cae7fb53e
Merge: 5ca5392 38c025a
Author: Matthew Finkel 
Date:   Mon Nov 19 22:54:29 2018 +

Merge branch '28528' into develop

 .travis.yml |  1 -
 AUTHORS |  2 +-
 README.rst  | 11 ++-
 setup.py|  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)



___
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 'bug23894' into develop

2018-11-19 Thread sysrqb

commit 09de26c244f31a7029825b402b70d3a316af1604
Merge: 21e9bb1 280599e
Author: Matthew Finkel 
Date:   Mon Nov 19 22:54:37 2018 +

Merge branch 'bug23894' into develop

 bridgedb/strings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

___
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 '28528' into develop

2018-11-19 Thread sysrqb

commit 21e9bb195915957baa088838c2f9c46cae7fb53e
Merge: 5ca5392 38c025a
Author: Matthew Finkel 
Date:   Mon Nov 19 22:54:29 2018 +

Merge branch '28528' into develop

 .travis.yml |  1 -
 AUTHORS |  2 +-
 README.rst  | 11 ++-
 setup.py|  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)



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

[tor-commits] [bridgedb/develop] Change maintainer and CI references

2018-11-19 Thread sysrqb

commit 38c025ab495347956b1d3a74c1f7e3504f823159
Author: Matthew Finkel 
Date:   Mon Nov 19 22:24:51 2018 +

Change maintainer and CI references

Isis, thanks for everything.

 * FIXES #28528 https://trac.torproject.org/28528
---
 .travis.yml |  1 -
 AUTHORS |  2 +-
 README.rst  | 11 ++-
 setup.py|  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9fb68f3..c474963 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ notifications:
 on_failure: always
   email:
 recipients:
-  - i...@torproject.org
   - sys...@torproject.org
 on_success: never
 on_failure: change
diff --git a/AUTHORS b/AUTHORS
index 4995534..e8b068b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,8 +1,8 @@
 Current core developers:
-  Isis Lovecruft 0xA3ADB67A2CDB8B35
   Matthew Finkel   0x017DD169EA793BE2
 
 Past core developers:
+  Isis Lovecruft 0xA3ADB67A2CDB8B35
   Nick Mathewson0x21194EBB165733EA
   Aaron Gibson 0x2C4B239DD876C9F6
   Christian Fromme  0xA922CB73CC0960D0
diff --git a/README.rst b/README.rst
index b234d01..feb5227 100644
--- a/README.rst
+++ b/README.rst
@@ -9,10 +9,11 @@ a webserver with `an HTTPS interface 
`__,
 
 .. |Latest Version| image:: 
https://pypip.in/version/bridgedb/badge.svg?style=flat
:target: https://pypi.python.org/pypi/bridgedb/
-.. |Build Status| image:: https://travis-ci.org/isislovecruft/bridgedb.svg
-   :target: https://travis-ci.org/isislovecruft/bridgedb
-.. |Coverage Status| image:: 
https://coveralls.io/repos/isislovecruft/bridgedb/badge.png?branch=develop
-   :target: https://coveralls.io/r/isislovecruft/bridgedb?branch=develop
+.. |Build Status| image:: https://travis-ci.org/sysrqbci/bridgedb.svg
+   :target: https://travis-ci.org/sysrqbci/bridgedb
+.. |Coverage Status| image:: 
https://coveralls.io/repos/github/sysrqbci/bridgedb/badge.svg?branch=develop
+   :target: https://coveralls.io/github/sysrqbci/bridgedb?branch=develop
+
 
 
 .. image:: doc/sphinx/source/_static/bay-bridge.jpg
@@ -590,4 +591,4 @@ Contact & Support
 
 Send your questions, patches, and suggestions to
 `the tor-dev mailing list `__
-or `isis `__.
+or `sysrqb `__.
diff --git a/setup.py b/setup.py
index 1139a65..a31391c 100644
--- a/setup.py
+++ b/setup.py
@@ -369,8 +369,8 @@ setuptools.setup(
 description='Backend systems for distribution of Tor bridge relays',
 author='Nick Mathewson',
 author_email='nickm at torproject dot org',
-maintainer='Isis Agora Lovecruft',
-maintainer_email='i...@torproject.org 0xA3ADB67A2CDB8B35',
+maintainer='Matthew Finkel',
+maintainer_email='sys...@torproject.org 0xCB8FC772D1AA1D30',
 url='https://www.torproject.org',
 download_url='https://gitweb.torproject.org/bridgedb.git',
 package_dir={'bridgedb': 'bridgedb'},



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

[tor-commits] [bridgedb/develop] Change contact email address

2018-11-19 Thread sysrqb

commit 280599e1836610e052be84d7d7ab16e50c091a3f
Author: Matthew Finkel 
Date:   Mon Nov 19 21:35:21 2018 +

Change contact email address

 * FIXES #23894 https://bugs.torproject.org/23894
---
 bridgedb/strings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridgedb/strings.py b/bridgedb/strings.py
index 1c40695..49bb933 100644
--- a/bridgedb/strings.py
+++ b/bridgedb/strings.py
@@ -271,7 +271,7 @@ EMAIL_SPRINTF = {
 # For the "%s Tor Browser download page %s" part of ``HOWTO_TBB[1]``
 "HOWTO_TBB1": ("", "[0]"),
 # For the "you should email %s" in ``HELP[0]``
-"HELP0": ("h...@rt.torproject.org"),
+"HELP0": ("frontd...@torproject.org"),
 }
 """``EMAIL_SPRINTF`` is a dictionary that maps translated strings which
 contain format specifiers (i.e. ``%s``) to what those format specifiers should



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

[tor-commits] [stem/master] Parse 'bandwidth-file-digest' lines from votes

2018-11-19 Thread atagar

commit e810cc093a6469e26fe57789f064cb627f017e64
Author: Damian Johnson 
Date:   Mon Nov 19 10:43:00 2018 -0800

Parse 'bandwidth-file-digest' lines from votes

Parsing of a newly added field...

  https://gitweb.torproject.org/torspec.git/commit/?id=1b686ef
---
 docs/change_log.rst   |  3 ++-
 stem/descriptor/networkstatus.py  | 21 +++
 test/unit/descriptor/networkstatus/document_v3.py | 25 +++
 3 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index 0c427784..2fb3ae7e 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -53,6 +53,7 @@ The following are only available within Stem's `git repository
 
   * Added :func:`~stem.descriptor.Descriptor.type_annotation` method 
(:trac:`28397`)
   * Added the **hash_type** and **encoding** arguments to `ServerDescriptor 
`_
 and `ExtraInfo's 
`_
 digest methods (:trac:`28398`)
+  * Added the network status vote's new bandwidth_file_digest attribute 
(:spec:`1b686ef`)
   * Added 
:func:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3.is_valid` and 
:func:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3.is_fresh` methods 
(:trac:`28448`)
   * DescriptorDownloader crashed if **use_mirrors** is set (:trac:`28393`)
   * Don't download from Serge, a bridge authority that frequently timeout
@@ -102,7 +103,7 @@ and the `stem.directory module `_.
   * `Fallback directory v2 support 
`_, 
which adds *nickname* and *extrainfo*
   * Added the *orport_v6* attribute to the :class:`~stem.directory.Authority` 
class
   * Added server descriptor's new is_hidden_service_dir attribute
-  * Added the network status vote's new bandwidth_file attribute 
(:spec:`84591df`)
+  * Added the network status vote's new bandwidth_file_headers attribute 
(:spec:`84591df`)
   * Added the microdescriptor router status entry's new or_addresses attribute 
(:trac:`26405`, :spec:`fdc8f3e8`)
   * Don't retry downloading descriptors when we've timed out
   * Don't download from tor26, an authority that frequently timeout
diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py
index 6c14097f..bc34f5b4 100644
--- a/stem/descriptor/networkstatus.py
+++ b/stem/descriptor/networkstatus.py
@@ -135,6 +135,7 @@ HEADER_STATUS_DOCUMENT_FIELDS = (
   ('shared-rand-previous-value', True, True, False),
   ('shared-rand-current-value', True, True, False),
   ('bandwidth-file-headers', True, False, False),
+  ('bandwidth-file-digest', True, False, False),
   ('recommended-client-protocols', True, True, False),
   ('recommended-relay-protocols', True, True, False),
   ('required-client-protocols', True, True, False),
@@ -796,6 +797,18 @@ def _parse_bandwidth_file_headers(descriptor, entries):
   descriptor.bandwidth_file_headers = results
 
 
+def _parse_bandwidth_file_digest(descriptor, entries):
+  # "bandwidth-file-digest" 1*(SP algorithm "=" digest)
+
+  value = _value('bandwidth-file-digest', entries)
+  results = {}
+
+  for key, val in _mappings_for('bandwidth-file-digest', value):
+results[key] = val
+
+  descriptor.bandwidth_file_digest = results
+
+
 _parse_header_valid_after_line = _parse_timestamp_line('valid-after', 
'valid_after')
 _parse_header_fresh_until_line = _parse_timestamp_line('fresh-until', 
'fresh_until')
 _parse_header_valid_until_line = _parse_timestamp_line('valid-until', 
'valid_until')
@@ -867,6 +880,9 @@ class NetworkStatusDocumentV3(NetworkStatusDocument):
   :var dict required_relay_protocols: required protocols for relays
   :var dict bandwidth_file_headers: headers from the bandwidth authority that
 generated this vote
+  :var dict bandwidth_file_digest: hashes of the bandwidth authority file used
+to generate this vote, this is a mapping of hash functions to their 
resulting
+digest value
 
   **\*** attribute is either required when we're parsed with validation or has
   a default value, others are left as None if undefined
@@ -898,6 +914,9 @@ class NetworkStatusDocumentV3(NetworkStatusDocument):
 
   .. versionchanged:: 1.7.0
  Added the bandwidth_file_headers attributbute.
+
+  .. versionchanged:: 1.8.0
+ Added the bandwidth_file_digest attributbute.
   """
 
   ATTRIBUTES = {
@@ -929,6 +948,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument):
 'shared_randomness_current_reveal_count': (None, 
_parse_shared_rand_current_value),
 'shared_randomness_current_value': (None, 
_parse_shared_rand_current_value),
 'bandwidth_file_headers': ({}, _parse_bandwidth_file_headers),
+'bandwidth_file_digest': ({}, _parse_bandwidth_file_digest),
 
 'signatures': ([], _parse_footer_directory_signature_line),
 'bandwidth_weights': ({}, _parse_footer_bandwidth_weights_line),
@@ -957,6 +977,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument):

[tor-commits] [torspec/master] dir-spec: add bandwidth-file item to the vote

2018-11-19 Thread nickm

commit 1b686efc101cffb95cec4d75a954c0f6fd7a105e
Author: juga0 
Date:   Thu Nov 8 10:12:41 2018 +

dir-spec: add bandwidth-file item to the vote
---
 dir-spec.txt | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/dir-spec.txt b/dir-spec.txt
index 8da28c4..3058180 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -2125,6 +2125,24 @@
 to read.
 First-appeared: Tor 0.3.5.1-alpha.
 
+"bandwidth-file-digest" 1*(SP algorithm "=" digest) NL
+
+[At most once for votes; does not occur in consensuses.]
+
+A digest of the bandwidth file used to generate this vote.
+"algorithm" is the name of the hash algorithm producing "digest",
+which can be "sha256" or another algorithm.  "digest" is the
+base64 encoding of the hash of the bandwidth file, with trailing =s
+omitted.
+
+If an authority is not configured with a V3BandwidthsFile, this line
+SHOULD NOT appear in its vote.
+
+If an authority is configured with a V3BandwidthsFile, but parsing
+fails, this line SHOULD appear in its vote, with the digest(s) of the
+unparseable file.
+First-appeared: Tor 0.4.0.1-alpha
+
The authority section of a vote contains the following items, followed
in turn by the authority's current key certificate:
 



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

[tor-commits] [torspec/master] Merge branch 'ticket28359_squashed'

2018-11-19 Thread nickm

commit 43ad5143d46c68d0eff81393f6f8e55659eee902
Merge: 9d8c044 1b686ef
Author: Nick Mathewson 
Date:   Mon Nov 19 08:52:04 2018 -0500

Merge branch 'ticket28359_squashed'

 dir-spec.txt | 18 ++
 1 file changed, 18 insertions(+)

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

[tor-commits] [torsocks/master] Update version to v2.3.0

2018-11-19 Thread dgoulet

commit cec4a733c081e09fb34f0aa4224ffd7b687fb310
Author: David Goulet 
Date:   Mon Nov 19 10:42:40 2018 -0500

Update version to v2.3.0

Signed-off-by: David Goulet 
---
 ChangeLog| 36 
 configure.ac |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e90ea19..0b92bf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2018-11-19 torsocks 2.3.0
+   * Fix a bunch of stuff in the wrapper script, #24967
+   * gethostbyaddr_r: always assign result
+   * log: Remove log line when logging is stopped
+   * gethostbyaddr_r: Don't put garbage in data->hostname
+   * gethostbyaddr_r: Populate h_addrtype field
+   * log: Avoid crash or file corruption when closing logs
+   * connect: Always pass .onion IP cookie to connection object
+   * Merge remote-tracking branch 'yawning/bug23715'
+   * Make torsocks always connect to the configured Tor port
+   * test: Make getpeername test connect to moria1
+   * socks5: Always use ATYP 0x03 for CONNECT command
+   * Merge remote-tracking branch 'upstream/master'
+   * doc: Clarify the libc limitation in README
+   * accept4: Initialize libc symbol early
+   * Bug 23715: Support memfd_create(2).
+   * test: Detect if tor is running in test_fd_passing
+   * No tab in the README
+   * Merge remote-tracking branch 'debian/bugfix/typo-subsytem'
+   * Merge remote-tracking branch 'debian/bugfix/typo-catched'
+   * Merge remote-tracking branch 'debian/bugfix/typo-conect'
+   * doc: Add autogen.sh step to README
+   * Add a -q/--quiet to torsocks
+   * tests: Add a check for a running Tor
+   * Make cpp conditional for definition of handle_mmap match use
+   * utils: Add useful function for later use
+   * man: Some words were missing
+   * Remove clang warnings
+   * Add missing quotes to variable in torsocks.in
+   * Fix check_addr() to return either 0 or 1
+   * Ignore stderr for getcap command
+   * syscall: Add seccomp, gettimeofday, clock_gettime, fork
+   * Fix typo: conect â connect.
+   * Fix typo: subsytem â subsystem.
+   * Fix typo: catched â caught.
+
 2016-10-18 torsocks 2.2.0
* Use xz for dist tarball now
* Remove TODO as we use the bugtracker for those
diff --git a/configure.ac b/configure.ac
index f6fdb0e..3846244 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 ##
 
 # Process this file with autoconf to produce a configure script.
-AC_INIT([torsocks], 
[2.2.0],[dgou...@torproject.org],[],[https://torproject.org])
+AC_INIT([torsocks], 
[2.3.0],[dgou...@torproject.org],[],[https://torproject.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 # Get hostname and other information.

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

[tor-commits] [torsocks/master] Fix a bunch of stuff in the wrapper script, #24967

2018-11-19 Thread dgoulet

commit 47b10b686e8e94fe0a2096135d4d9b195afb5267
Author: Alex Xu (Hello71) 
Date:   Tue Jan 23 10:01:17 2018 -0500

Fix a bunch of stuff in the wrapper script, #24967
---
 src/bin/torsocks.in | 160 
 1 file changed, 125 insertions(+), 35 deletions(-)

diff --git a/src/bin/torsocks.in b/src/bin/torsocks.in
index fe8b67a..68ec2e5 100644
--- a/src/bin/torsocks.in
+++ b/src/bin/torsocks.in
@@ -58,6 +58,7 @@
 # Tamas Szerb 
 # Modified by Robert Hogan  April 16th 2006
 # Modified by David Goulet  2013
+# Modified by Alex Xu (Hello71)  2018
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -67,15 +68,108 @@ LIB_NAME="libtorsocks"
 SHLIB_EXT="@SHLIB_EXT@"
 SHLIB="${LIBDIR}/${LIB_NAME}.${SHLIB_EXT}"
 
+# https://github.com/mkropat/sh-realpath
+#
+# Copyright (c) 2014 Michael Kropat
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+realpath() {
+canonicalize_path "$(resolve_symlinks "$1")"
+}
+
+resolve_symlinks() {
+_resolve_symlinks "$1"
+}
+
+_resolve_symlinks() {
+_assert_no_path_cycles "$@" || return
+
+local dir_context path
+path=$(readlink -- "$1")
+if [ $? -eq 0 ]; then
+dir_context=$(dirname -- "$1")
+_resolve_symlinks "$(_prepend_dir_context_if_necessary "$dir_context" 
"$path")" "$@"
+else
+printf '%s\n' "$1"
+fi
+}
+
+_prepend_dir_context_if_necessary() {
+if [ "$1" = . ]; then
+printf '%s\n' "$2"
+else
+_prepend_path_if_relative "$1" "$2"
+fi
+}
+
+_prepend_path_if_relative() {
+case "$2" in
+/* ) printf '%s\n' "$2" ;;
+ * ) printf '%s\n' "$1/$2" ;;
+esac
+}
+
+_assert_no_path_cycles() {
+local target path
+
+target=$1
+shift
+
+for path in "$@"; do
+if [ "$path" = "$target" ]; then
+return 1
+fi
+done
+}
+
+canonicalize_path() {
+if [ -d "$1" ]; then
+_canonicalize_dir_path "$1"
+else
+_canonicalize_file_path "$1"
+fi
+}
+
+_canonicalize_dir_path() {
+(cd "$1" 2>/dev/null && pwd -P)
+}
+
+_canonicalize_file_path() {
+local dir file
+dir=$(dirname -- "$1")
+file=$(basename -- "$1")
+(cd "$dir" 2>/dev/null && printf '%s/%s\n' "$(pwd -P)" "$file")
+}
+
 # Set @LDPRELOAD@ variable with torsocks library path.
 set_ld_preload ()
 {
-   if [ -z "$@LDPRELOAD@" ]; then
-   export @LDPRELOAD@="${SHLIB}"
-   else
-   echo "$@LDPRELOAD@" | grep -q "${SHLIB}" || \
-   export @LDPRELOAD@="${SHLIB} $@LDPRELOAD@"
-   fi
+   case "$@LDPRELOAD@" in
+   *"${SHLIB}"*) ;;
+   '')
+   export @LDPRELOAD@="${SHLIB}"
+   ;;
+   *)
+   export @LDPRELOAD@="${SHLIB}:$@LDPRELOAD@"
+   ;;
+   esac
 
# OS X specific env variable
case "$OSTYPE" in
@@ -88,7 +182,7 @@ set_ld_preload ()
 # Report error due to Apple's System Integrity Protection.
 macos_sip_error ()
 {
-   echo "ERROR: $1 is located in a directory protected by Apple's System 
Integrity Protection." >&2
+   printf "ERROR: %s is located in a directory protected by Apple's System 
Integrity Protection.\n" "$1" >&2
exit 1
 }
 
@@ -101,21 +195,20 @@ macos_sip_check ()
darwin*)
# We need to figure out if Apple's System Integrity 
Protection is
# enabled on the users' system.
-   if /usr/bin/csrutil status | grep -q enabled; then
-   local abs_app_dir=`cd "$(dirname "$app_path")" 
&& pwd -P`
-
-   # It seems like /usr/** (with an exception of 
/usr/local/**),
-   # /System/**, /sbin/**, and /bin/** are 
currently protected
-   # using SIP.
-   case "$abs_app_dir/`basename $app_path`" in

[tor-commits] [torsocks/master] gethostbyaddr_r: always assign result

2018-11-19 Thread dgoulet

commit 446ce04bb31a023712f5ff74a6a0649606286662
Author: David Goulet 
Date:   Mon Nov 19 10:18:04 2018 -0500

gethostbyaddr_r: always assign result

Originating from: https://bugzilla.redhat.com/show_bug.cgi?id=1601259

Patch by "cHBWyJuH".

Fixes #26794

Signed-off-by: David Goulet 
---
 src/lib/gethostbyname.c | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/src/lib/gethostbyname.c b/src/lib/gethostbyname.c
index df84e14..b1b2183 100644
--- a/src/lib/gethostbyname.c
+++ b/src/lib/gethostbyname.c
@@ -349,6 +349,9 @@ LIBC_GETHOSTBYNAME_R_RET_TYPE 
tsocks_gethostbyname_r(LIBC_GETHOSTBYNAME_R_SIG)
char padding[];
} *data;
 
+   /* result must be NULL if no entry is found or if an error occurs */
+   *result = NULL;
+
DBG("[gethostbyname_r] Requesting %s hostname", name);
 
if (!name) {
@@ -390,6 +393,9 @@ LIBC_GETHOSTBYNAME_R_RET_TYPE 
tsocks_gethostbyname_r(LIBC_GETHOSTBYNAME_R_SIG)
he->h_length = sizeof(in_addr_t);
he->h_addrtype = AF_INET;
 
+   /* Assign result as specified by the documentation */
+   *result = he;
+
DBG("[gethostbyname_r] Hostname %s resolved to %u.%u.%u.%u", name,
ip & 0XFF, (ip >> 8) & 0XFF, (ip >> 16) & 0XFF, (ip >> 
24) & 0xFF);
 

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

[tor-commits] [torsocks/master] log: Remove log line when logging is stopped

2018-11-19 Thread dgoulet

commit 9895fbf6af444b55f0f5bfdda71b6591be819a9d
Author: David Goulet 
Date:   Mon Apr 23 08:35:59 2018 -0400

log: Remove log line when logging is stopped

It gets really noisy with mutt. Not sure why, I expect maybe multi
thread/process makes it that everytime it dies, we get that log statement.

Signed-off-by: David Goulet 
---
 src/common/log.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/common/log.c b/src/common/log.c
index 60a56f7..683a806 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -199,7 +199,6 @@ ATTR_HIDDEN
 void log_fd_close_notify(int fd)
 {
if (fd >= 0 && logconfig.fp && (fd == fileno(logconfig.fp))) {
-   log_print("[tsocks] Log file descriptor closed. Stopping 
logging.\n");
log_destroy();
}
 }



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

[tor-commits] [tor/release-0.3.5] Add missing library to build tor-print-ed-signing-cert.

2018-11-19 Thread nickm

commit 3260914db06acd5a8a0b4f0e5991f8e318190dce
Author: Alexander FÃ¦rÃ¸y 
Date:   Sat Nov 17 03:29:04 2018 +0100

Add missing library to build tor-print-ed-signing-cert.

To succesful compile tor-print-ed-signing-cert.exe on Windows we
sometimes need to include the @TOR_LIB_GDI@ library.

See: https://bugs.torproject.org/28485
---
 changes/bug28485 | 3 +++
 src/tools/include.am | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug28485 b/changes/bug28485
new file mode 100644
index 0..a8309ae21
--- /dev/null
+++ b/changes/bug28485
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+- Add missing dependency on libgdi32.dll for tor-print-ed-signing-cert.exe
+  on Windows. Fixes bug 28485; bugfix on 0.3.5.1-alpha.
diff --git a/src/tools/include.am b/src/tools/include.am
index 73ec86935..f7aa7e0d1 100644
--- a/src/tools/include.am
+++ b/src/tools/include.am
@@ -41,7 +41,7 @@ src_tools_tor_print_ed_signing_cert_LDADD = \
 $(TOR_CRYPTO_LIBS) \
 $(TOR_UTIL_LIBS) \
@TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \
-   @TOR_LIB_WS32@ @TOR_LIB_USERENV@
+   @TOR_LIB_WS32@ @TOR_LIB_USERENV@ @TOR_LIB_GDI@
 
 if USE_NSS
 # ...



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

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

2018-11-19 Thread nickm

commit 2d227dcfcbf509a9fee93084425ac1e7e732185c
Merge: f704c29e0 3260914db
Author: Nick Mathewson 
Date:   Mon Nov 19 10:18:56 2018 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

 changes/bug28485 | 3 +++
 src/tools/include.am | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

2018-11-19 Thread nickm

commit 8183640ada0ccef0c1f123a312b99c87269a1cae
Merge: a8df39e95 3260914db
Author: Nick Mathewson 
Date:   Mon Nov 19 10:18:57 2018 -0500

Merge branch 'maint-0.3.5'

 changes/bug28485 | 3 +++
 src/tools/include.am | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.3.5] Add missing library to build tor-print-ed-signing-cert.

2018-11-19 Thread nickm

commit 3260914db06acd5a8a0b4f0e5991f8e318190dce
Author: Alexander FÃ¦rÃ¸y 
Date:   Sat Nov 17 03:29:04 2018 +0100

Add missing library to build tor-print-ed-signing-cert.

To succesful compile tor-print-ed-signing-cert.exe on Windows we
sometimes need to include the @TOR_LIB_GDI@ library.

See: https://bugs.torproject.org/28485
---
 changes/bug28485 | 3 +++
 src/tools/include.am | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug28485 b/changes/bug28485
new file mode 100644
index 0..a8309ae21
--- /dev/null
+++ b/changes/bug28485
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+- Add missing dependency on libgdi32.dll for tor-print-ed-signing-cert.exe
+  on Windows. Fixes bug 28485; bugfix on 0.3.5.1-alpha.
diff --git a/src/tools/include.am b/src/tools/include.am
index 73ec86935..f7aa7e0d1 100644
--- a/src/tools/include.am
+++ b/src/tools/include.am
@@ -41,7 +41,7 @@ src_tools_tor_print_ed_signing_cert_LDADD = \
 $(TOR_CRYPTO_LIBS) \
 $(TOR_UTIL_LIBS) \
@TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \
-   @TOR_LIB_WS32@ @TOR_LIB_USERENV@
+   @TOR_LIB_WS32@ @TOR_LIB_USERENV@ @TOR_LIB_GDI@
 
 if USE_NSS
 # ...

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

[tor-commits] [tor/master] Add missing library to build tor-print-ed-signing-cert.

2018-11-19 Thread nickm

commit 3260914db06acd5a8a0b4f0e5991f8e318190dce
Author: Alexander FÃ¦rÃ¸y 
Date:   Sat Nov 17 03:29:04 2018 +0100

Add missing library to build tor-print-ed-signing-cert.

To succesful compile tor-print-ed-signing-cert.exe on Windows we
sometimes need to include the @TOR_LIB_GDI@ library.

See: https://bugs.torproject.org/28485
---
 changes/bug28485 | 3 +++
 src/tools/include.am | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug28485 b/changes/bug28485
new file mode 100644
index 0..a8309ae21
--- /dev/null
+++ b/changes/bug28485
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+- Add missing dependency on libgdi32.dll for tor-print-ed-signing-cert.exe
+  on Windows. Fixes bug 28485; bugfix on 0.3.5.1-alpha.
diff --git a/src/tools/include.am b/src/tools/include.am
index 73ec86935..f7aa7e0d1 100644
--- a/src/tools/include.am
+++ b/src/tools/include.am
@@ -41,7 +41,7 @@ src_tools_tor_print_ed_signing_cert_LDADD = \
 $(TOR_CRYPTO_LIBS) \
 $(TOR_UTIL_LIBS) \
@TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \
-   @TOR_LIB_WS32@ @TOR_LIB_USERENV@
+   @TOR_LIB_WS32@ @TOR_LIB_USERENV@ @TOR_LIB_GDI@
 
 if USE_NSS
 # ...



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

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

2018-11-19 Thread translation

commit dfc4a188a1c411c05795cfd9838d048c5cee3de0
Author: Translation commit bot 
Date:   Mon Nov 19 14:47:01 2018 +

Update translations for tbmanual-contentspot
---
 contents+es.po | 4 
 1 file changed, 4 insertions(+)

diff --git a/contents+es.po b/contents+es.po
index f9b0add71..25b91b97f 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -85,6 +85,10 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
 msgstr ""
+"De forma predeterminada, el Navegador Tor no conserva ningÃºn historial de "
+"navegaciÃ³n. Los cookies sÃ³lo son vÃ¡lidos para una sola sesiÃ³n (hasta que 
se "
+"cierre el Navegador Tor o se solicite una Nueva Identidad)."
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)

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

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

2018-11-19 Thread translation

commit 2599d469ad8b6751021a5bf3559e7d5abc884ba9
Author: Translation commit bot 
Date:   Mon Nov 19 14:47:11 2018 +

Update translations for tbmanual-contentspot_completed
---
 contents+es.po | 4 
 1 file changed, 4 insertions(+)

diff --git a/contents+es.po b/contents+es.po
index f9b0add71..25b91b97f 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -85,6 +85,10 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
 msgstr ""
+"De forma predeterminada, el Navegador Tor no conserva ningÃºn historial de "
+"navegaciÃ³n. Los cookies sÃ³lo son vÃ¡lidos para una sola sesiÃ³n (hasta que 
se "
+"cierre el Navegador Tor o se solicite una Nueva Identidad)."
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)

___
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

2018-11-19 Thread translation

commit 8234d9bee5246a2055ff142ec13a932bd1658650
Author: Translation commit bot 
Date:   Mon Nov 19 13:50:22 2018 +

Update translations for support-portal_completed
---
 contents+es.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index aafdc0f29..54bc923ad 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -4564,11 +4564,11 @@ msgstr ""
 
 #: templates/footer.html:24
 msgid "Subscribe to our Newsletter"
-msgstr "Suscribirse a nuestra lista de correo"
+msgstr "SuscrÃbete a nuestra lista de correo"
 
 #: templates/footer.html:25
 msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "Recibir noticias mensuales y oportunidades del Proyecto Tor"
+msgstr "Recibe noticias mensuales y oportunidades del Proyecto Tor"
 
 #: templates/footer.html:32
 msgid ""

___
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

2018-11-19 Thread translation

commit e5234c856fb80d610cb09359df97a4e84dd53800
Author: Translation commit bot 
Date:   Mon Nov 19 13:50:16 2018 +

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

diff --git a/contents+es.po b/contents+es.po
index aafdc0f29..54bc923ad 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -4564,11 +4564,11 @@ msgstr ""
 
 #: templates/footer.html:24
 msgid "Subscribe to our Newsletter"
-msgstr "Suscribirse a nuestra lista de correo"
+msgstr "SuscrÃbete a nuestra lista de correo"
 
 #: templates/footer.html:25
 msgid "Get monthly updates and opportunities from the Tor Project"
-msgstr "Recibir noticias mensuales y oportunidades del Proyecto Tor"
+msgstr "Recibe noticias mensuales y oportunidades del Proyecto Tor"
 
 #: templates/footer.html:32
 msgid ""

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

2018-11-19 Thread nickm

commit a8df39e9552bd679b35513fa4a1c98507e870082
Merge: 26539ec3a d9f7cb3f6
Author: Nick Mathewson 
Date:   Mon Nov 19 08:47:03 2018 -0500

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

 changes/ticket28009   | 3 +++
 scripts/test/cov-diff | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

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

[tor-commits] [tor/master] Fix shellcheck issues in cov-diff - SC2231, SC2006 and SC2086

2018-11-19 Thread nickm

commit d9f7cb3f6202291d38d611165f70e0c1c33b3e92
Author: rl1987 
Date:   Sun Nov 11 19:18:49 2018 +0200

Fix shellcheck issues in cov-diff - SC2231, SC2006 and SC2086
---
 changes/ticket28009   | 3 +++
 scripts/test/cov-diff | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/changes/ticket28009 b/changes/ticket28009
new file mode 100644
index 0..1d986d421
--- /dev/null
+++ b/changes/ticket28009
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+- Fix shellcheck warnings in cov-diff script. Resolves issue
+  28009.
diff --git a/scripts/test/cov-diff b/scripts/test/cov-diff
index 6179dff63..f3ca85688 100755
--- a/scripts/test/cov-diff
+++ b/scripts/test/cov-diff
@@ -7,9 +7,9 @@
 DIRA="$1"
 DIRB="$2"
 
-for B in $DIRB/*; do
-  A=$DIRA/`basename $B`
-  if [ -f $A ]; then
+for B in "$DIRB"/*; do
+  A=$DIRA/$(basename "$B")
+  if [ -f "$A" ]; then
   perl -pe 's/^\s*\!*\d+(\*?):/1$1:/; s/^([^:]+:)[\d\s]+:/$1/; s/^ 
*-:(Runs|Programs):.*//;' "$A" > "$A.tmp"
   else
   cat /dev/null > "$A.tmp"



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

[tor-commits] [tor/master] Fix one last SC2086

2018-11-19 Thread nickm

commit 4fc584f20e5aae8f7b89f169690c17d5bce84d41
Author: rl1987 
Date:   Sun Nov 11 18:04:07 2018 +0200

Fix one last SC2086
---
 scripts/test/coverage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/test/coverage b/scripts/test/coverage
index 180a2d6dc..7a417cdc8 100755
--- a/scripts/test/coverage
+++ b/scripts/test/coverage
@@ -13,7 +13,7 @@ for fn in src/core/*/*.c src/feature/*/*.c src/app/*/*.c 
src/lib/*/*.c; do
 F=$(echo "$BN" | sed -e 's/\.c$//;')
 GC="${BN}.gcov"
 # Figure out the object file names
-ONS=$(echo ${DN}/src_*-${F}.o)
+ONS=$(echo "${DN}"/src_*-"${F}".o)
 ONS_WILDCARD_LITERAL="${DN}/src_*-${F}.o"
 # If the wildcard didn't expand, no files
 if [ "$ONS" != "${ONS_WILDCARD_LITERAL}" ]



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

[tor-commits] [tor/master] Fix shellcheck SC2006 warnings in 'coverage' script

2018-11-19 Thread nickm

commit ce1b018ab742492e96b5bdae049a13c2faaefdbf
Author: rl1987 
Date:   Sun Nov 11 17:44:41 2018 +0200

Fix shellcheck SC2006 warnings in 'coverage' script
---
 scripts/test/coverage | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/test/coverage b/scripts/test/coverage
index 59d468ee1..e611a4be1 100755
--- a/scripts/test/coverage
+++ b/scripts/test/coverage
@@ -8,19 +8,19 @@
 dst=$1
 
 for fn in src/core/*/*.c src/feature/*/*.c src/app/*/*.c src/lib/*/*.c; do
-BN=`basename $fn`
-DN=`dirname $fn`
-F=`echo $BN | sed -e 's/\.c$//;'`
+BN=$(basename $fn)
+DN=$(dirname $fn)
+F=$(echo $BN | sed -e 's/\.c$//;')
 GC="${BN}.gcov"
 # Figure out the object file names
-ONS=`echo ${DN}/src_*-${F}.o`
+ONS=$(echo ${DN}/src_*-${F}.o)
 ONS_WILDCARD_LITERAL="${DN}/src_*-${F}.o"
 # If the wildcard didn't expand, no files
 if [ "$ONS" != "${ONS_WILDCARD_LITERAL}" ]
 then
   for on in $ONS; do
 # We should have a gcno file
-GCNO=`echo $on | sed -e 's/\.o$/\.gcno/;'`
+GCNO=$(echo $on | sed -e 's/\.o$/\.gcno/;')
 if [ -e $GCNO ]
 then
   # No need to test for gcda, since gcov assumes no execution



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

2018-11-19 Thread nickm

commit 26539ec3ae01a33f0ab4ce59fa83355ebdf32470
Merge: 48b08f059 8cb817cc5
Author: Nick Mathewson 
Date:   Mon Nov 19 08:45:41 2018 -0500

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

 changes/ticket28008   |  3 +++
 scripts/test/coverage | 20 ++--
 2 files changed, 13 insertions(+), 10 deletions(-)

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

[tor-commits] [tor/master] Fix most instances of SC2086 warning

2018-11-19 Thread nickm

commit 7c04b00e65d67a38f119f4d3e50e8a47236e202f
Author: rl1987 
Date:   Sun Nov 11 17:50:43 2018 +0200

Fix most instances of SC2086 warning
---
 scripts/test/coverage | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/test/coverage b/scripts/test/coverage
index e611a4be1..180a2d6dc 100755
--- a/scripts/test/coverage
+++ b/scripts/test/coverage
@@ -8,9 +8,9 @@
 dst=$1
 
 for fn in src/core/*/*.c src/feature/*/*.c src/app/*/*.c src/lib/*/*.c; do
-BN=$(basename $fn)
-DN=$(dirname $fn)
-F=$(echo $BN | sed -e 's/\.c$//;')
+BN=$(basename "$fn")
+DN=$(dirname "$fn")
+F=$(echo "$BN" | sed -e 's/\.c$//;')
 GC="${BN}.gcov"
 # Figure out the object file names
 ONS=$(echo ${DN}/src_*-${F}.o)
@@ -20,18 +20,18 @@ for fn in src/core/*/*.c src/feature/*/*.c src/app/*/*.c 
src/lib/*/*.c; do
 then
   for on in $ONS; do
 # We should have a gcno file
-GCNO=$(echo $on | sed -e 's/\.o$/\.gcno/;')
-if [ -e $GCNO ]
+GCNO=$(echo "$on" | sed -e 's/\.o$/\.gcno/;')
+if [ -e "$GCNO" ]
 then
   # No need to test for gcda, since gcov assumes no execution
   # if it's absent
-  rm -f $GC
-  gcov -o $on $fn
-  if [ -e $GC ]
+  rm -f "$GC"
+  gcov -o "$on" "$fn"
+  if [ -e "$GC" ]
   then
 if [ -d "$dst" ]
 then
-  mv $GC $dst/$GC
+  mv "$GC" "$dst"/"$GC"
 fi
   else
 echo "gcov -o $on $fn didn't make a .gcov file"



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

[tor-commits] [tor/master] Add changes file

2018-11-19 Thread nickm

commit 8cb817cc5e0cc36cc0218da53bc4c1f277ccd8cc
Author: rl1987 
Date:   Sun Nov 11 18:56:20 2018 +0200

Add changes file
---
 changes/ticket28008 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/ticket28008 b/changes/ticket28008
new file mode 100644
index 0..1f0de1a14
--- /dev/null
+++ b/changes/ticket28008
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+- Fix shellcheck warnings in scripts/test/coverage. Resolves issue
+  28008.



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

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

2018-11-19 Thread translation

commit ac44d44466dc544eb645b756f00ecf0de827a57a
Author: Translation commit bot 
Date:   Mon Nov 19 13:45:20 2018 +

Update translations for donatepages-messagespot
---
 locale/es/LC_MESSAGES/messages.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/es/LC_MESSAGES/messages.po 
b/locale/es/LC_MESSAGES/messages.po
index 4545433a7..a1423d020 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -655,7 +655,7 @@ msgstr "SuscrÃbete a nuestra lista de correo"
 
 #: 
tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:35
 msgid "Get monthly updates and opportunities from the Tor Project."
-msgstr "Recibir noticias mensuales y oportunidades del Proyecto Tor"
+msgstr "Recibe noticias mensuales y oportunidades del Proyecto Tor"
 
 #: 
tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:39
 msgid "Sign Up"

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

[tor-commits] [tor/master] Aim for 100% test coverage on nodefamily.c

2018-11-19 Thread nickm

commit aa1d767e6b98efa4ffa7d39dba2272949aae2f65
Author: Nick Mathewson 
Date:   Sat Nov 17 12:46:59 2018 -0500

Aim for 100% test coverage on nodefamily.c
---
 src/test/test_nodelist.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c
index 2dbd949b7..7e0df56df 100644
--- a/src/test/test_nodelist.c
+++ b/src/test/test_nodelist.c
@@ -259,6 +259,10 @@ test_nodelist_nodefamily(void *arg)
   nodefamily_t *nf2 = NULL;
   nodefamily_t *nf3 = NULL;
 
+  enc = nodefamily_format(NULL);
+  tt_str_op(enc, OP_EQ, "");
+  tor_free(enc);
+
   /* Make sure that sorting and de-duplication work. */
   tor_asprintf(, "$%s hello", h1);
   nf1 = nodefamily_parse(enc, NULL, 0);
@@ -361,6 +365,7 @@ test_nodelist_nodefamily(void *arg)
   nodefamily_free(nf1);
   nodefamily_free(nf2);
   nodefamily_free(nf3);
+  nodefamily_free_all();
 }
 
 static void



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

[tor-commits] [tor/master] Expose more nodelist.c functions to tests

2018-11-19 Thread nickm

commit 4f9548f89339fe1fab1863ac2b2c72d09f7224ef
Author: Nick Mathewson 
Date:   Sat Nov 17 12:55:23 2018 -0500

Expose more nodelist.c functions to tests
---
 src/feature/nodelist/nodelist.c | 10 +-
 src/feature/nodelist/nodelist.h | 10 --
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c
index 3994c8d07..d070f31c1 100644
--- a/src/feature/nodelist/nodelist.c
+++ b/src/feature/nodelist/nodelist.c
@@ -1870,7 +1870,7 @@ addrs_in_same_network_family(const tor_addr_t *a1,
  * (case-insensitive), or if node's identity key digest
  * matches a hexadecimal value stored in nickname.  Return
  * false otherwise. */
-static int
+STATIC int
 node_nickname_matches(const node_t *node, const char *nickname)
 {
   const char *n = node_get_nickname(node);
@@ -1882,7 +1882,7 @@ node_nickname_matches(const node_t *node, const char 
*nickname)
 }
 
 /** Return true iff node is named by some nickname in lst. */
-static inline int
+STATIC int
 node_in_nickname_smartlist(const smartlist_t *lst, const node_t *node)
 {
   if (!lst) return 0;
@@ -1894,7 +1894,7 @@ node_in_nickname_smartlist(const smartlist_t *lst, const 
node_t *node)
 }
 
 /** Return true iff n1's declared family contains n2. */
-static int
+STATIC int
 node_family_contains(const node_t *n1, const node_t *n2)
 {
   if (n1->ri && n1->ri->declared_family) {
@@ -1909,7 +1909,7 @@ node_family_contains(const node_t *n1, const node_t *n2)
 /**
  * Return true iff node has declared a nonempty family.
  **/
-static bool
+STATIC bool
 node_has_declared_family(const node_t *node)
 {
   if (node->ri && node->ri->declared_family &&
@@ -1929,7 +1929,7 @@ node_has_declared_family(const node_t *node)
  * its family.  (Note that these nodes are not in node's family unless they
  * also agree that node is in their family.)
  **/
-static void
+STATIC void
 node_lookup_declared_family(smartlist_t *out, const node_t *node)
 {
   if (node->ri && node->ri->declared_family &&
diff --git a/src/feature/nodelist/nodelist.h b/src/feature/nodelist/nodelist.h
index 87ea544db..32300eb00 100644
--- a/src/feature/nodelist/nodelist.h
+++ b/src/feature/nodelist/nodelist.h
@@ -154,10 +154,16 @@ int count_loading_descriptors_progress(void);
 
 #ifdef NODELIST_PRIVATE
 
+STATIC int node_nickname_matches(const node_t *node, const char *nickname);
+STATIC int node_in_nickname_smartlist(const smartlist_t *lst,
+  const node_t *node);
+STATIC int node_family_contains(const node_t *n1, const node_t *n2);
+STATIC bool node_has_declared_family(const node_t *node);
+STATIC void node_lookup_declared_family(smartlist_t *out, const node_t *node);
+
 #ifdef TOR_UNIT_TESTS
 
-STATIC void
-node_set_hsdir_index(node_t *node, const networkstatus_t *ns);
+STATIC void node_set_hsdir_index(node_t *node, const networkstatus_t *ns);
 
 #endif /* defined(TOR_UNIT_TESTS) */
 



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

[tor-commits] [tor/master] Backend for compact node-family representation.

2018-11-19 Thread nickm

commit 83be4d2bbd7a4ed584f42d043558a4026c4a449d
Author: Nick Mathewson 
Date:   Tue Aug 28 11:34:31 2018 -0400

Backend for compact node-family representation.

This representation is meant to save memory in microdescriptors --
we can't use it in routerinfo_t yet, since those families need to be
encoded losslessly for directory voting to work.

This representation saves memory in three ways:
   1. It uses only one allocation per family.  (The old way used a
  smartlist (2 allocs) plus one strdup per entry.)
   2. It stores identity digests in binary, not hex.
   3. It keeps families in a canonical format, memoizes, and
  reference-counts them.

Part of #27359.
---
 src/core/include.am  |   3 +
 src/feature/nodelist/nodefamily.c| 373 +++
 src/feature/nodelist/nodefamily.h|  47 +
 src/feature/nodelist/nodefamily_st.h |  48 +
 src/test/test_nodelist.c | 251 ++-
 5 files changed, 721 insertions(+), 1 deletion(-)

diff --git a/src/core/include.am b/src/core/include.am
index 1b8ef2ac5..003ef8421 100644
--- a/src/core/include.am
+++ b/src/core/include.am
@@ -106,6 +106,7 @@ LIBTOR_APP_A_SOURCES =  \
src/feature/nodelist/microdesc.c\
src/feature/nodelist/networkstatus.c\
src/feature/nodelist/nickname.c \
+   src/feature/nodelist/nodefamily.c   \
src/feature/nodelist/nodelist.c \
src/feature/nodelist/node_select.c  \
src/feature/nodelist/routerinfo.c   \
@@ -340,6 +341,8 @@ noinst_HEADERS +=   \
src/feature/nodelist/networkstatus_voter_info_st.h  \
src/feature/nodelist/nickname.h \
src/feature/nodelist/node_st.h  \
+   src/feature/nodelist/nodefamily.h   \
+   src/feature/nodelist/nodefamily_st.h\
src/feature/nodelist/nodelist.h \
src/feature/nodelist/node_select.h  \
src/feature/nodelist/routerinfo.h   \
diff --git a/src/feature/nodelist/nodefamily.c 
b/src/feature/nodelist/nodefamily.c
new file mode 100644
index 0..6b504c0ac
--- /dev/null
+++ b/src/feature/nodelist/nodefamily.c
@@ -0,0 +1,373 @@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2018, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file nodefamily.c
+ * \brief Code to manipulate encoded, reference-counted node families.  We
+ *  use these tricks to save space, since these families would otherwise
+ *  require a large number of tiny allocations.
+ **/
+
+#include "core/or/or.h"
+#include "feature/nodelist/nickname.h"
+#include "feature/nodelist/nodefamily.h"
+#include "feature/nodelist/nodefamily_st.h"
+#include "feature/nodelist/nodelist.h"
+#include "feature/relay/router.h"
+#include "feature/nodelist/routerlist.h"
+
+#include "ht.h"
+#include "siphash.h"
+
+#include "lib/container/smartlist.h"
+#include "lib/ctime/di_ops.h"
+#include "lib/defs/digest_sizes.h"
+#include "lib/log/util_bug.h"
+
+#include 
+#include 
+
+/**
+ * Allocate and return a blank node family with space to hold n_members
+ * members.
+ */
+static nodefamily_t *
+nodefamily_alloc(int n_members)
+{
+  size_t alloc_len = offsetof(nodefamily_t, family_members) +
+NODEFAMILY_ARRAY_SIZE(n_members);
+  nodefamily_t *nf = tor_malloc_zero(alloc_len);
+  nf->n_members = n_members;
+  return nf;
+}
+
+/**
+ * Hashtable hash implementation.
+ */
+static inline unsigned int
+nodefamily_hash(const nodefamily_t *nf)
+{
+  return (unsigned) siphash24g(nf->family_members,
+   NODEFAMILY_ARRAY_SIZE(nf->n_members));
+}
+
+/**
+ * Hashtable equality implementation.
+ */
+static inline unsigned int
+nodefamily_eq(const nodefamily_t *a, const nodefamily_t *b)
+{
+  return (a->n_members == b->n_members) &&
+fast_memeq(a->family_members, b->family_members,
+   NODEFAMILY_ARRAY_SIZE(a->n_members));
+}
+
+static HT_HEAD(nodefamily_map, nodefamily_t) the_node_families
+  = HT_INITIALIZER();
+
+HT_PROTOTYPE(nodefamily_map, nodefamily_t, ht_ent, nodefamily_hash,
+ nodefamily_eq)
+HT_GENERATE2(nodefamily_map, nodefamily_t, ht_ent, nodefamily_hash,
+ node_family_eq, 0.6, tor_reallocarray_, tor_free_)
+
+/**
+ * Parse the family declaration in s, returning the canonical
+ * nodefamily_t for its members.  Return NULL on error.
+ *
+ * If rsa_id_self is provided, it is a DIGEST_LEN-byte digest
+ * for the router that declared this family: insert it into the
+ * family declaration if it is not there already.
+ *
+ * If NF_WARN_MALFORMED is set in flags, warn about any
+ * elements that we can't parse.  (By default, we

[tor-commits] [tor/master] Test new functions in nodelist.c

2018-11-19 Thread nickm

commit 0e762c0cf5260040c38e93b4d4204be3f6746301
Author: Nick Mathewson 
Date:   Sat Nov 17 13:35:52 2018 -0500

Test new functions in nodelist.c
---
 src/test/test_nodelist.c | 129 +++
 1 file changed, 129 insertions(+)

diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c
index 7e0df56df..0287be330 100644
--- a/src/test/test_nodelist.c
+++ b/src/test/test_nodelist.c
@@ -6,6 +6,8 @@
  * \brief Unit tests for nodelist related functions.
  **/
 
+#define NODELIST_PRIVATE
+
 #include "core/or/or.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "feature/nodelist/networkstatus.h"
@@ -483,6 +485,131 @@ test_nodelist_nodefamily_lookup(void *arg)
   tor_free(mem_op_hex_tmp);
 }
 
+static void
+test_nodelist_nickname_matches(void *arg)
+{
+  (void)arg;
+  node_t mock_node;
+  routerstatus_t mock_rs;
+  memset(_node, 0, sizeof(mock_node));
+  memset(_rs, 0, sizeof(mock_rs));
+
+  strlcpy(mock_rs.nickname, "evilgeniuses", sizeof(mock_rs.nickname));
+  mock_node.rs = _rs;
+  memcpy(mock_node.identity, ".forabettertomorrow.", DIGEST_LEN);
+
+#define match(x) tt_assert(node_nickname_matches(_node, (x)))
+#define no_match(x) tt_assert(! node_nickname_matches(_node, (x)))
+
+  match("evilgeniuses");
+  match("EvilGeniuses");
+  match("EvilGeniuses");
+  match("2e666f7261626574746572746f6d6f72726f772e");
+  match("2E666F7261626574746572746F6D6F72726F772E");
+  match("$2e666f7261626574746572746f6d6f72726f772e");
+  match("$2E666F7261626574746572746F6D6F72726F772E");
+  match("$2E666F7261626574746572746F6D6F72726F772E~evilgeniuses");
+  match("$2E666F7261626574746572746F6D6F72726F772E~EVILGENIUSES");
+
+  no_match("evilgenius");
+  no_match("evilgeniuseses");
+  no_match("evil.genius");
+  no_match("$2E666F7261626574746572746F6D6F72726F");
+  no_match("2E666F7261626574746572746F6D6F72726F");
+  no_match("$2E666F7261626574746572746F6D6F72726F772E~fred");
+  no_match("$2E666F7261626574746572746F6D6F72726F772E=EVILGENIUSES");
+ done:
+  ;
+}
+
+static void
+test_nodelist_node_nodefamily(void *arg)
+{
+  (void)arg;
+  node_t mock_node1;
+  routerstatus_t mock_rs;
+  microdesc_t mock_md;
+
+  node_t mock_node2;
+  routerinfo_t mock_ri;
+
+  smartlist_t *nodes=smartlist_new();
+
+  memset(_node1, 0, sizeof(mock_node1));
+  memset(_node2, 0, sizeof(mock_node2));
+  memset(_rs, 0, sizeof(mock_rs));
+  memset(_md, 0, sizeof(mock_md));
+  memset(_ri, 0, sizeof(mock_ri));
+
+  mock_node1.rs = _rs;
+  mock_node1.md = _md;
+
+  mock_node2.ri = _ri;
+
+  strlcpy(mock_rs.nickname, "nodeone", sizeof(mock_rs.nickname));
+  mock_ri.nickname = tor_strdup("nodetwo");
+
+  memcpy(mock_node1.identity, "NodeOneNode1NodeOne1", DIGEST_LEN);
+  memcpy(mock_node2.identity, "SecondNodeWe'reTestn", DIGEST_LEN);
+
+  // empty families.
+  tt_assert(! node_family_contains(_node1, _node2));
+  tt_assert(! node_family_contains(_node2, _node1));
+
+  // Families contain nodes, but not these nodes
+  mock_ri.declared_family = smartlist_new();
+  smartlist_add(mock_ri.declared_family, (char*)"NodeThree");
+  mock_md.family = nodefamily_parse("NodeFour", NULL, 0);
+  tt_assert(! node_family_contains(_node1, _node2));
+  tt_assert(! node_family_contains(_node2, _node1));
+
+  // Families contain one another.
+  smartlist_add(mock_ri.declared_family, (char*)
+"4e6f64654f6e654e6f6465314e6f64654f6e6531");
+  tt_assert(! node_family_contains(_node1, _node2));
+  tt_assert(node_family_contains(_node2, _node1));
+
+  nodefamily_free(mock_md.family);
+  mock_md.family = nodefamily_parse(
+"NodeFour "
+"5365636f6e644e6f64655765277265546573746e", NULL, 0);
+  tt_assert(node_family_contains(_node1, _node2));
+  tt_assert(node_family_contains(_node2, _node1));
+
+  // Try looking up families now.
+  MOCK(node_get_by_nickname, mock_node_get_by_nickname);
+  MOCK(node_get_by_id, mock_node_get_by_id);
+
+  node_lookup_declared_family(nodes, _node1);
+  tt_int_op(smartlist_len(nodes), OP_EQ, 2);
+  const node_t *n = smartlist_get(nodes, 0);
+  tt_str_op(n->identity, OP_EQ, "NodeFour");
+  n = smartlist_get(nodes, 1);
+  tt_mem_op(n->identity, OP_EQ, "SecondNodeWe'reTestn", DIGEST_LEN);
+
+  // free, try the other one.
+  SMARTLIST_FOREACH(nodes, node_t *, x, tor_free(x));
+  smartlist_clear(nodes);
+
+  node_lookup_declared_family(nodes, _node2);
+  tt_int_op(smartlist_len(nodes), OP_EQ, 2);
+  n = smartlist_get(nodes, 0);
+  tt_str_op(n->identity, OP_EQ, "NodeThree");
+  n = smartlist_get(nodes, 1);
+  // This gets a truncated hex hex ID since it was looked up by name
+  tt_str_op(n->identity, OP_EQ, "4e6f64654f6e654e6f6");
+
+ done:
+  UNMOCK(node_get_by_nickname);
+  UNMOCK(node_get_by_id);
+  smartlist_free(mock_ri.declared_family);
+  nodefamily_free(mock_md.family);
+  tor_free(mock_ri.nickname);
+  // use tor_free, these aren't real nodes
+  SMARTLIST_FOREACH(nodes, node_t *, x, tor_free(x));
+  smartlist_free(nodes);
+}
+
 #define NODE(name, flags) \
   {

[tor-commits] [tor/master] Merge branch 'ticket27359_v2_squashed'

2018-11-19 Thread nickm

commit 48b08f0592734085d88b7546e39d42f6606026d6
Merge: bf82389e1 0e762c0cf
Author: Nick Mathewson 
Date:   Mon Nov 19 08:26:49 2018 -0500

Merge branch 'ticket27359_v2_squashed'

 changes/ticket27359|   3 +
 src/core/include.am|   3 +
 src/feature/dirparse/microdesc_parse.c |  16 +-
 src/feature/nodelist/microdesc.c   |   6 +-
 src/feature/nodelist/microdesc_st.h|   5 +-
 src/feature/nodelist/nodefamily.c  | 373 
 src/feature/nodelist/nodefamily.h  |  47 
 src/feature/nodelist/nodefamily_st.h   |  48 
 src/feature/nodelist/nodelist.c| 114 ++
 src/feature/nodelist/nodelist.h|  11 +-
 src/test/test_microdesc.c  |   8 +-
 src/test/test_nodelist.c   | 385 -
 12 files changed, 954 insertions(+), 65 deletions(-)

diff --cc src/feature/nodelist/nodelist.c
index 9ddb71e8a,d070f31c1..f93ecd5bf
--- a/src/feature/nodelist/nodelist.c
+++ b/src/feature/nodelist/nodelist.c
@@@ -1930,17 -1965,12 +1973,12 @@@ nodes_in_same_family(const node_t *node
}
  
/* Are they in the same family because the agree they are? */
-   {
- const smartlist_t *f1, *f2;
- f1 = node_get_declared_family(node1);
- f2 = node_get_declared_family(node2);
- if (f1 && f2 &&
- node_in_nickname_smartlist(f1, node2) &&
- node_in_nickname_smartlist(f2, node1))
-   return 1;
+   if (node_family_contains(node1, node2) &&
+   node_family_contains(node2, node1)) {
+ return 1;
}
  
 -  /* Are they in the same option because the user says they are? */
 +  /* Are they in the same family because the user says they are? */
if (options->NodeFamilySets) {
  SMARTLIST_FOREACH(options->NodeFamilySets, const routerset_t *, rs, {
  if (routerset_contains_node(rs, node1) &&

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

[tor-commits] [tor/master] Use nodefamily_t in microdescriptors.

2018-11-19 Thread nickm

commit 426c9561c5f5bc5f38a42f3e46437db59fcdc7c0
Author: Nick Mathewson 
Date:   Tue Oct 23 19:55:12 2018 -0400

Use nodefamily_t in microdescriptors.

Closes ticket 27359.
---
 changes/ticket27359|   3 +
 src/feature/dirparse/microdesc_parse.c |  16 ++---
 src/feature/nodelist/microdesc.c   |   6 +-
 src/feature/nodelist/microdesc_st.h|   5 +-
 src/feature/nodelist/nodelist.c| 110 +
 src/feature/nodelist/nodelist.h|   1 -
 src/test/test_microdesc.c  |   8 ++-
 7 files changed, 89 insertions(+), 60 deletions(-)

diff --git a/changes/ticket27359 b/changes/ticket27359
new file mode 100644
index 0..bddc90634
--- /dev/null
+++ b/changes/ticket27359
@@ -0,0 +1,3 @@
+  o Minor features (memory usage):
+- Store microdescriptor family lists with a more compact representation
+  to save memory.  Closes ticket 27359.
diff --git a/src/feature/dirparse/microdesc_parse.c 
b/src/feature/dirparse/microdesc_parse.c
index aebff5a35..8ad962637 100644
--- a/src/feature/dirparse/microdesc_parse.c
+++ b/src/feature/dirparse/microdesc_parse.c
@@ -18,6 +18,7 @@
 #include "feature/dirparse/routerparse.h"
 #include "feature/nodelist/microdesc.h"
 #include "feature/nodelist/nickname.h"
+#include "feature/nodelist/nodefamily.h"
 #include "feature/relay/router.h"
 #include "lib/crypt_ops/crypto_curve25519.h"
 #include "lib/crypt_ops/crypto_ed25519.h"
@@ -32,7 +33,7 @@ static token_rule_t microdesc_token_table[] = {
   T01("ntor-onion-key",K_ONION_KEY_NTOR,   GE(1),   NO_OBJ ),
   T0N("id",K_ID,   GE(2),   NO_OBJ ),
   T0N("a", K_A,GE(1),   NO_OBJ ),
-  T01("family",K_FAMILY,   ARGS,NO_OBJ ),
+  T01("family",K_FAMILY,   CONCAT_ARGS, NO_OBJ ),
   T01("p", K_P,CONCAT_ARGS, NO_OBJ ),
   T01("p6",K_P6,   CONCAT_ARGS, NO_OBJ ),
   A01("@last-listed",  A_LAST_LISTED,  CONCAT_ARGS, NO_OBJ ),
@@ -222,16 +223,9 @@ microdescs_parse_from_string(const char *s, const char 
*eos,
 }
 
 if ((tok = find_opt_by_keyword(tokens, K_FAMILY))) {
-  int i;
-  md->family = smartlist_new();
-  for (i=0;in_args;++i) {
-if (!is_legal_nickname_or_hexdigest(tok->args[i])) {
-  log_warn(LD_DIR, "Illegal nickname %s in family line",
-   escaped(tok->args[i]));
-  goto next;
-}
-smartlist_add_strdup(md->family, tok->args[i]);
-  }
+  md->family = nodefamily_parse(tok->args[0],
+NULL,
+NF_WARN_MALFORMED);
 }
 
 if ((tok = find_opt_by_keyword(tokens, K_P))) {
diff --git a/src/feature/nodelist/microdesc.c b/src/feature/nodelist/microdesc.c
index 146c772da..f331d5e10 100644
--- a/src/feature/nodelist/microdesc.c
+++ b/src/feature/nodelist/microdesc.c
@@ -23,6 +23,7 @@
 #include "feature/nodelist/dirlist.h"
 #include "feature/nodelist/microdesc.h"
 #include "feature/nodelist/networkstatus.h"
+#include "feature/nodelist/nodefamily.h"
 #include "feature/nodelist/nodelist.h"
 #include "feature/nodelist/routerlist.h"
 #include "feature/relay/router.h"
@@ -882,10 +883,7 @@ microdesc_free_(microdesc_t *md, const char *fname, int 
lineno)
   if (md->body && md->saved_location != SAVED_IN_CACHE)
 tor_free(md->body);
 
-  if (md->family) {
-SMARTLIST_FOREACH(md->family, char *, cp, tor_free(cp));
-smartlist_free(md->family);
-  }
+  nodefamily_free(md->family);
   short_policy_free(md->exit_policy);
   short_policy_free(md->ipv6_exit_policy);
 
diff --git a/src/feature/nodelist/microdesc_st.h 
b/src/feature/nodelist/microdesc_st.h
index d23da1313..30c896181 100644
--- a/src/feature/nodelist/microdesc_st.h
+++ b/src/feature/nodelist/microdesc_st.h
@@ -9,6 +9,7 @@
 
 struct curve25519_public_key_t;
 struct ed25519_public_key_t;
+struct nodefamily_t;
 struct short_policy_t;
 
 /** A microdescriptor is the smallest amount of information needed to build a
@@ -69,8 +70,8 @@ struct microdesc_t {
   tor_addr_t ipv6_addr;
   /** As routerinfo_t.ipv6_orport */
   uint16_t ipv6_orport;
-  /** As routerinfo_t.family */
-  smartlist_t *family;
+  /** As routerinfo_t.family, with readable members parsed. */
+  struct nodefamily_t *family;
   /** IPv4 exit policy summary */
   struct short_policy_t *exit_policy;
   /** IPv6 exit policy summary */
diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c
index a98a5c865..3994c8d07 100644
--- a/src/feature/nodelist/nodelist.c
+++ b/src/feature/nodelist/nodelist.c
@@ -59,6 +59,7 @@
 #include "feature/nodelist/microdesc.h"
 #include "feature/nodelist/networkstatus.h"
 #include "feature/nodelist/node_select.h"
+#include "feature/nodelist/nodefamily.h"
 #include "feature/nodelist/nodelist.h"
 #include

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

2018-11-19 Thread translation

commit 0d7c07fada9c1e4b5a411457b0b4ecb0c1640431
Author: Translation commit bot 
Date:   Mon Nov 19 13:17:01 2018 +

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

diff --git a/contents+es.po b/contents+es.po
index 54a546c76..32913c78e 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -78,10 +78,10 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
 msgstr ""
-"* De forma predeterminada, el Navegador Tor no conserva ningÃºn historial de "
+"De forma predeterminada, el Navegador Tor no conserva ningÃºn historial de "
 "navegaciÃ³n. Los cookies sÃ³lo son vÃ¡lidos para una sola sesiÃ³n (hasta que 
se "
-"cierre el Navegador Tor o se solicite una Nueva Identidad)."
+"cierre el Navegador Tor o se solicite una Nueva Identidad)."
 
 #: http//localhost/en-US/about/ (content/about/contents+en-US.lrtopic.body)
 msgid "# How Tor works"

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

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

2018-11-19 Thread translation

commit 9762a6a33624f27ce906c55ba21411bfdfa03fb0
Author: Translation commit bot 
Date:   Mon Nov 19 13:17:07 2018 +

Update translations for tbmanual-contentspot_completed
---
 contents+es.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index 54a546c76..32913c78e 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -78,10 +78,10 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
 msgstr ""
-"* De forma predeterminada, el Navegador Tor no conserva ningÃºn historial de "
+"De forma predeterminada, el Navegador Tor no conserva ningÃºn historial de "
 "navegaciÃ³n. Los cookies sÃ³lo son vÃ¡lidos para una sola sesiÃ³n (hasta que 
se "
-"cierre el Navegador Tor o se solicite una Nueva Identidad)."
+"cierre el Navegador Tor o se solicite una Nueva Identidad)."
 
 #: http//localhost/en-US/about/ (content/about/contents+en-US.lrtopic.body)
 msgid "# How Tor works"

___
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

2018-11-19 Thread translation

commit 4bcd935e21ff4c9e00524cc52ce796d51668183d
Author: Translation commit bot 
Date:   Mon Nov 19 12:19:43 2018 +

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

diff --git a/contents+ka.po b/contents+ka.po
index e5e8d6990..454095470 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -2398,6 +2398,10 @@ msgid ""
 "depends on the model of the computer you are using; consult documentation "
 "about your computer to find out more."
 msgstr ""
+"á¨áá¡áá«ááá á¨ááááááááááá£áá 
áá§áá¡ áá á©ááááá â32-ááá¢áááá¡áâ áá 
â64-ááá¢áááâ "
+"áá ááá ááááá¡ á¨áá áá¡: ááá 
áááááááááá£ááá áááááá£á¢áá áá¡ 
áááá áá¢á£á ááá, á ááááá¡ááª "
+"áá§ááááá; ááááªáááá áááá áá¢á£á 
áá¡ á¡áá®áááá«á¦áááááá ááá¡ááááá¡, 
á¡ááááá®áá¡ á£ááá "
+"ááá¡áá áááááá."
 
 #: http//localhost/gettor/gettor-2/
 #: (content/gettor/gettor-2/contents+en.lrquestion.seo_slug)
@@ -4184,6 +4188,12 @@ msgid ""
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
+"ááááááááá¡ á£á¤ááááááá¡ áááªááá¡á 
áá ááááá¡á£á¤ááááá¡ á®áá áá¡á®áá¡ 
ááá£áá¯áááá¡áááá¡ "
+"á®ááá¨áá¬á§ááá, á£á¤áá¡á áá á¦áá á¬á§áá 
áá¡ áá¥ááá, áááááááá¡á áá ááá ááá 
áááááªáááááá¡ "
+"ááááá¦ááááááá¡ááá áá¡áá 
ááááááá á¡áá¨á£áááááááá¡ 
á¨áá¥ááááá áá áááá áªáááááá, 
ááááá "
+"á¨áá£áá¦á£áááá á¬áááááá¡á áá 
ááááá§áááááá¡ á£áá á£ááááá§áá¤áá, 
á¨áááááá áá áááááá "
+"áááááá¨áá áááá, áááªáááá á£áá 
ááááááá¡á áá  á¡ááááááááááá¡ 
áªáááááá áááá¡ ááááá¡ "
+"áááá¦ááááá."
 
 #: templates/footer.html:24
 msgid "Subscribe to our Newsletter"
@@ -4200,6 +4210,8 @@ msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
 "found in our "
 msgstr ""
+"á¡ááááá á ááá¨áááá, á¡áááá¢áá á 
á£á¤ááááááá¡ áááªááá¡ 
áááááªá®ááááá áá ááá¡ááá áá®áá áá¡ 
áááá "
+" ááááá¡áá§ááááááá á¬áá¡ááá, 
á¨áááá«áááá áá®áááá "
 
 #: templates/layout.html:7
 msgid "Tor Project | Support"

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

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

2018-11-19 Thread translation

commit 05f93e3c204fdf9397dee4cbefc479e1158c0d36
Author: Translation commit bot 
Date:   Mon Nov 19 10:47:03 2018 +

Update translations for tbmanual-contentspot
---
 contents+it.po | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contents+it.po b/contents+it.po
index e39966777..e1538dbfb 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -1049,6 +1049,8 @@ msgid ""
 "You can also access this option in the new circuit display, in the site "
 "information menu, in the URL bar."
 msgstr ""
+"Puoi accedere a questa opzione anche nel nuovo circuito, nel menu "
+"informazioni del sito, nella barra URL."
 
 #: http//localhost/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.seo_slug)



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

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

2018-11-19 Thread translation

commit 71adb934262d9ced00fd5f0c44d696973351247a
Author: Translation commit bot 
Date:   Mon Nov 19 10:17:04 2018 +

Update translations for tbmanual-contentspot
---
 contents+it.po | 54 --
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/contents+it.po b/contents+it.po
index f4a295bb7..e39966777 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -367,7 +367,7 @@ msgstr ""
 #: http//localhost/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.seo_slug)
 msgid "running-tor-browser"
-msgstr ""
+msgstr "usare-tor-browser"
 
 #: http//localhost/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.title)
@@ -462,6 +462,10 @@ msgid ""
 " of the URL bar, then select 'Tor Network Settings...' to access these "
 "options."
 msgstr ""
+"Se stai avviando Tor Browser per la prima volta, clicca 'Configura' per "
+"aprire la finestra Impostazioni di rete Tor. Altrimenti, clicca il pulsante "
+"Tor a sinistra della barra URL, poi seleziona 'Impostazioni di rete Tor...' "
+"per accedere a queste opzioni."
 
 #: http//localhost/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
@@ -477,6 +481,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: http//localhost/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
@@ -484,6 +490,8 @@ msgid ""
 "Click âOKâ to save your settings. Using bridges may slow down the 
connection"
 " compared to using ordinary Tor relays."
 msgstr ""
+"Clicca âOKâ per salvare le impostazioni. Usare i bridge potrebbe 
rallentare "
+"la connessione rispetto all'uso dei normali relay Tor."
 
 #: http//localhost/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
@@ -669,7 +677,7 @@ msgstr ""
 #: http//localhost/en-US/transports/
 #: (content/transports/contents+en-US.lrtopic.seo_slug)
 msgid "plugable-transports"
-msgstr ""
+msgstr "pluggable-transports"
 
 #: http//localhost/en-US/circumvention/
 #: (content/circumvention/contents+en-US.lrtopic.title)
@@ -735,7 +743,7 @@ msgstr ""
 #: http//localhost/en-US/circumvention/
 #: (content/circumvention/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/en-US/circumvention/
 #: (content/circumvention/contents+en-US.lrtopic.body)
@@ -874,7 +882,7 @@ msgstr ""
 #: http//localhost/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
@@ -882,6 +890,8 @@ msgid ""
 "You can see a diagram of the circuit that Tor Browser is using for the "
 "current tab in the site information menu, in the URL bar."
 msgstr ""
+"Puoi vedere un diagramma del circuito utilizzato dal browser Tor per la "
+"scheda attiva nel menu informazioni del sito, nella barra URL."
 
 #: http//localhost/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
@@ -975,7 +985,7 @@ msgstr "# Cambiare identitÃ  e circuiti"
 #: http//localhost/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
@@ -1043,7 +1053,7 @@ msgstr ""
 #: http//localhost/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.seo_slug)
 msgid "managing-identities"
-msgstr ""
+msgstr "gestire-identitÃ "
 
 #: http//localhost/en-US/onion-services/
 #: (content/onion-services/contents+en-US.lrtopic.title)
@@ -1212,7 +1222,7 @@ msgstr ""
 #: http//localhost/en-US/secure-connections/
 #: (content/secure-connections/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/en-US/secure-connections/
 #: (content/secure-connections/contents+en-US.lrtopic.body)
@@ -1226,7 +1236,7 @@ msgstr ""
 #: http//localhost/en-US/secure-connections/
 #: (content/secure-connections/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/en-US/secure-connections/
 #: (content/secure-connections/contents+en-US.lrtopic.body)
@@ -1382,7 +1392,7 @@ msgstr ""
 #: http//localhost/en-US/secure-connections/
 #: (content/secure-connections/contents+en-US.lrtopic.seo_slug)
 msgid "secure-connections"
-msgstr ""
+msgstr "connessioni-sicure"
 
 #: http//localhost/en-US/security-slider/
 #: (content/security-slider/contents+en-US.lrtopic.title)
@@ -1428,7 +1438,7 @@ msgstr "# Accesso alla Tab di Sicurezza"
 #: http//localhost/en-US/security-slider.html
 #: (content/security-slider.html/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/en-US/security-slider/
 #: (content/security-slider/contents+en-US.lrtopic.body)
@@ -1452,7 +1462,7 @@ msgstr "# Livelli di sicurezza"
 #: http//localhost/en-US/security-slider.html
 #: (content/security-slider.html/contents+en-US.lrtopic.body)
 msgid

[tor-commits] [translation/tbmanual-contentspot] Merge branch 'tbmanual-contentspot' of git-rw.torproject.org:translation into tbmanual-contentspot

2018-11-19 Thread translation

commit 2fd3f8df37607852f1b976149ff6b0bbbc768293
Merge: 05f93e3c2 abccb75bd
Author: Translation commit bot 
Date:   Mon Nov 19 11:48:19 2018 +

Merge branch 'tbmanual-contentspot' of git-rw.torproject.org:translation 
into tbmanual-contentspot

 contents+bn-IN.po | 1 +
 contents+es-ES.po | 1 +
 2 files changed, 2 insertions(+)

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

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

2018-11-19 Thread translation

commit 4a80a9a69c0146052a18d66177bfe34fb4f10dc5
Author: Translation commit bot 
Date:   Mon Nov 19 09:47:00 2018 +

Update translations for tbmanual-contentspot
---
 contents+it.po | 14 --
 contents+ka.po | 58 --
 2 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/contents+it.po b/contents+it.po
index 3086cfca3..f4a295bb7 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -1,7 +1,7 @@
 # Translators:
-# Random_R, 2018
 # erinm, 2018
 # Emma Peel, 2018
+# Random_R, 2018
 # 
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-18 22:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Emma Peel, 2018\n"
+"Last-Translator: Random_R, 2018\n"
 "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -105,6 +105,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: http//localhost/en-US/about/ (content/about/contents+en-US.lrtopic.body)
 msgid ""
@@ -277,7 +279,7 @@ msgstr "# Connetti"
 #: http//localhost/en-US/troubleshooting/
 #: (content/troubleshooting/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.body)
@@ -306,7 +308,7 @@ msgstr "# Configura"
 #: http//localhost/en-US/circumvention/
 #: (content/circumvention/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.body)
@@ -355,12 +357,12 @@ msgstr ""
 #: http//localhost/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.seo_slug)
diff --git a/contents+ka.po b/contents+ka.po
index a532084b5..6fc8c01b4 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -106,6 +106,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: http//localhost/en-US/about/ (content/about/contents+en-US.lrtopic.body)
 msgid ""
@@ -122,7 +124,7 @@ msgstr ""
 #: http//localhost/en-US/about/
 #: (content/about/contents+en-US.lrtopic.seo_slug)
 msgid "about"
-msgstr ""
+msgstr "á¨áá¡áá®áá"
 
 #: http//localhost/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.title)
@@ -275,7 +277,7 @@ msgstr "# áááááá¨áá ááá"
 #: http//localhost/en-US/troubleshooting/
 #: (content/troubleshooting/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.body)
@@ -304,7 +306,7 @@ msgstr "# ááááá ááá"
 #: http//localhost/en-US/circumvention/
 #: (content/circumvention/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.body)
@@ -353,17 +355,17 @@ msgstr ""
 #: http//localhost/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/en-US/running-tor-browser/
 #: (content/running-tor-browser/contents+en-US.lrtopic.seo_slug)
 msgid "running-tor-browser"
-msgstr ""
+msgstr "tor-áá áá£ááá áá¡-ááá¨áááá"
 
 #: http//localhost/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.title)
@@ -475,6 +477,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: http//localhost/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
@@ -731,7 +735,7 @@ msgstr ""
 #: http//localhost/en-US/circumvention/
 #: (content/circumvention/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/en-US/circumvention/
 #: (content/circumvention/contents+en-US.lrtopic.body)
@@ -868,7 +872,7 @@ msgstr ""
 #: http//localhost/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
@@ -966,7 +970,7 @@ msgstr "# áááááááá¡á áá á¬á 
áááá¡ á¨ááªá
 #: http//localhost/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
@@ -1200,7 +1204,7 @@ msgstr ""
 #: http//localhost/en-US/secure-connections/
 #:

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

2018-11-19 Thread translation

commit b7e872fd6c70e75c3ad41bbf9beac6cb90558deb
Author: Translation commit bot 
Date:   Mon Nov 19 09:17:07 2018 +

Update translations for tbmanual-contentspot
---
 contents+ka.po | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/contents+ka.po b/contents+ka.po
index 15ac5c0d1..a532084b5 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -2221,6 +2221,12 @@ msgid ""
 "availability and use, and furthering their scientific and popular "
 "understanding."
 msgstr ""
+"ááááááááá¡ á£á¤ááááááá¡ áááªááá¡á 
áá ááááá¡á£á¤ááááá¡ á®áá áá¡á®áá¡ 
ááá£áá¯áááá¡áááá¡ "
+"á®ááá¨áá¬á§ááá, á£á¤áá¡á áá á¦áá á¬á§áá 
áá¡ áá¥ááá, áááááááá¡á áá ááá ááá 
áááááªáááááá¡ "
+"ááááá¦ááááááá¡ááá áá¡áá 
ááááááá á¡áá¨á£áááááááá¡ 
á¨áá¥ááááá áá áááá áªáááááá, 
ááááá "
+"á¨áá£áá¦á£áááá á¬áááááá¡á áá 
ááááá§áááááá¡ á£áá á£ááááá§áá¤áá, 
á¨áááááá áá áááááá "
+"áááááá¨áá áááá, áááªáááá á£áá 
ááááááá¡á áá  á¡ááááááááááá¡ 
áªáááááá áááá¡ ááááá¡ "
+"áááá¦ááááá."
 
 #: templates/footer.html:24
 msgid "Subscribe to our Newsletter"



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

[tor-commits] [tor-glossary/master] add Arabic glossary from transifex

2018-11-19 Thread emmapeel

commit 44c7ae9e0660cb7dfe1082a6515129c220d5c9a7
Author: emma peel 
Date:   Mon Nov 19 11:21:47 2018 +

add Arabic glossary from transifex
---
 glossary_ar.csv | 2207 +++
 1 file changed, 2207 insertions(+)

diff --git a/glossary_ar.csv b/glossary_ar.csv
new file mode 100644
index 000..69d3750
--- /dev/null
+++ b/glossary_ar.csv
@@ -0,0 +1,2207 @@
+term,pos,comment,translation_ar,comment_ar
+ donation process
+ testing
+ third-party
+!,Conjunction,"Punctuation, not a conjunction, however âpunctionationâ is 
not an option in Transifex",,
+,Conjunction,"Punctuation, not a conjunction, however âpunctionationâ 
is not an option in Transifex",,
+$
+$,Conjunction,,,
+%s,Conjunction,Do not translate or change. This is a placeholder (ex: 2%s or 
1%s),,
+,Conjunction,"&_nbsp_; [without underscores, Non-Breaking Space]",,
+...
+...,Conjunction,,,
+24/7,Noun,"Twenty-four hours, seven days a week. This essentially means ""all 
the time"" (non stop). Ex: The store is open 24/7 = The store is always open. 
The application runs 24/7 = The application is always running.",Ù¢Ù¤\Ù§,
+2FA,Noun,"Two-factor authentication
+Two-factor authentication
+""Something you know, and something you have."" Login systems that require 
only a username and password risk being broken when someone else can obtain (or 
guess) those pieces of information. Services that offer two-factor 
authentication also require you to provide a separate confirmation that you are 
who you say you are. The second factor could be a one-off secret code, a number 
generated by a program running on a mobile device, or a device that you carry 
and that you can use to confirm who you are. Companies like banks, and major 
internet services like Google, Paypal and Twitter now offer two-factor 
authentication.
+Synonyms: two-step verification, multi-factor authentication.
+Source EFF.",,
+3D bar chart,Noun,[Martus],ÙØ®Ø·Ø· Ø¨Ø£Ø¹ÙØ¯Ø© Ø«ÙØ§Ø«ÙØ© Ø§ÙØ£Ø¨Ø¹Ø§Ø¯,
+3rd party,Adjective,[Signal] As in âUse a 3rd party application.â,,
+:,Conjunction,"Punctuation, not a conjunction, however âpunctionationâ is 
not an option in Transifex",,
+;,Conjunction,"Punctuation, not a conjunction, however âpunctionationâ is 
not an option in Transifex",,
+?,Conjunction,"Punctuation, not a conjunction, however âpunctionationâ is 
not an option in Transifex",,
+A reasonably secure operating system,Noun,[Qubes OS] This is the Qubes OS 
tagline.,ÙØ¸Ø§Ù ØªØ´ØºÙÙ Ø¢ÙÙ Ø¨Ø´ÙÙ ÙØ¹ÙÙÙ,
+A security-oriented operating system,Noun,[Qubes OS],ÙØ¸Ø§Ù ØªØ´ØºÙÙ Ù
Ø¹ÙÙ Ø¨Ø§ÙØ£ÙÙ,
+ADIDS,Noun,what is that?,,
+API,Noun,"Application Programming Interface: ""In computer programming, an 
application programming interface (API) is a set of subroutine definitions, 
protocols, and tools for building application software."" - 
Wikipedia",,"ÙØ§Ø¬ÙØ© Ø¨Ø±ÙØ¬Ø© Ø§ÙØªØ·Ø¨ÙÙØ§Øª: "" ÙØµÙÙ 
Ø§ÙØ¹ÙØ§ØµØ± Ø§ÙØ¨Ø±ÙØ¬ÙÙØ© ØØ³Ø¨ ÙØ¸Ø§Ø¦ÙÙØ§Ø Ù ÙØ¯Ø®ÙØ§ØªÙØ§ 
Ù ÙØ®Ø±Ø¬Ø§ØªÙØ§. Ø§ÙÙØ¯Ù Ø§ÙØ±Ø¦ÙØ³ÙÙ ÙÙÙØ§ ØªÙÙÙØ± ÙØ§Ø¦ÙØ© 
ÙÙ Ø§ÙÙØ¸Ø§Ø¦Ù Ø§ÙÙØ³ØªÙÙÙØ© ØªÙØ§ÙØ§Ù Ø¹Ù Ø§ÙØ¢ÙÙØ© Ø§ÙØªÙ 
ÙÙÙØ°Øª Ø¨ÙØ§Ø ÙØªØªÙØ ÙÙØ¢Ø®Ø±ÙÙ Ø§ÙØªÙØ§ØµÙ ÙØ¹ÙØ§ ÙÙ 
Ø®ÙØ§Ù Ø£ÙÙ Ø¢ÙÙØ© Ø£Ø®Ø±Ù."" - ÙÙÙÙØ¨ÙØ¯ÙØ§"
+APK,Noun,"""Android application package (APK) is the package file format used 
to distribute and install application software and middleware onto Google's 
Android operating system and sometimes on the BlackBerry OS 10."" 
https://en.wikipedia.org/wiki/Android_application_package",APK,"""ØØ²ÙØ© 
Ø¨Ø±ÙØ§ÙØ¬ Ø¢ÙØ¯Ø±ÙÙØ¯ (APK) ÙÙ ØµÙØºØ© Ø§ÙÙÙÙ Ø§ÙØ°Ù ÙÙØ³ØªØ¹Ù
Ù ÙÙ ÙØ´Ø± ÙØªØ«Ø¨ÙØª Ø§ÙØ¨Ø±Ø§ÙØ¬ Ø§ÙØ®Ø§ØµØ© Ø¨ÙØ¸Ø§Ù 
Ø£ÙØ¯Ø±ÙÙØ¯."" - ÙÙÙÙØ¨ÙØ¯ÙØ§"
+About,Noun,,,
+Alice,,[Briar],,
+Alice,Noun,[Briar],,
+American Apparel
+American Apparel,Noun,,,
+Android,Noun,[Signal] [Orbot] Operating system,,
+Anti Evil Maid,Noun,[Qubes OS] Do not translate. Anti Evil Maid is an 
implementation of a TPM-based static trusted boot with a primary goal to 
prevent Evil Maid attacks. (Source: 
https://theinvisiblethings.blogspot.com/2011/09/anti-evil-maid.html),Ù
ÙØ§ÙØØ© Ø§ÙØ®Ø§Ø¯ÙØ© Ø§ÙØ´Ø±ÙØ±Ø©,ÙÙ ØªÙÙÙØ© ÙÙÙØ§ÙØØ© ÙØ¬ÙÙ
 Ø§ÙØ®Ø§Ø¯ÙØ© Ø§ÙØ´Ø±ÙØ±Ø© Ø¹ÙÙ Ø§ÙØ£Ø¬ÙØ²Ø© Ø§ÙÙØ´ÙØ±Ø© 
Ø¨ÙØ§Ø³Ø·Ø© TrueCrypt.
+App Store,Noun,Apple App Store [Signal],,
+AppVM,Noun,"[Qubes OS] ""Application Virtual Machine""A VM which is intended 
for running software applications.",ÙØØ¯Ø© Ø§ÙØªØ·Ø¨ÙÙØ§Øª,
+Apt.
+Apt.,Noun,,,
+Ativistas
+Ativistas,Noun,,,
+Autocrypt Setup Message,Noun,[Enigmail] [OpenKeychain],,
+Autonomous System number,Noun,,,
+BCC,Noun,"""Blind carbon copy""",,
+Back,Adverb,,,
+Back to
+Back to,Adverb,,,
+Backup Key File,Noun,[Martus] Also: key backup,ÙÙÙ Ø§ÙÙÙØªØ§Ø 
Ø§ÙØ§ØØªÙØ§Ø·Ù,
+Benetech,Noun,Company name which should not be

[tor-commits] [translation/tba-android_stringsdtd] Update translations for tba-android_stringsdtd

2018-11-19 Thread translation

commit b5156a0a4733b13adf0a0f8a59a35e74429ebe82
Author: Translation commit bot 
Date:   Mon Nov 19 09:46:49 2018 +

Update translations for tba-android_stringsdtd
---
 mk/android_strings.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mk/android_strings.dtd b/mk/android_strings.dtd
index 35ee029f0..0b0633294 100644
--- a/mk/android_strings.dtd
+++ b/mk/android_strings.dtd
@@ -205,7 +205,7 @@
  context means consuming less data, e.g. by not loading images, not
  âstoring dataâ. -->
 
-
+
 
 
 
@@ -246,7 +246,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [translation/tba-android_stringsdtd] Update translations for tba-android_stringsdtd

2018-11-19 Thread translation

commit cc680c79e7a4dcc879e5b5da9383aaea0fba423d
Author: Translation commit bot 
Date:   Mon Nov 19 09:16:57 2018 +

Update translations for tba-android_stringsdtd
---
 mk/android_strings.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mk/android_strings.dtd b/mk/android_strings.dtd
index 152cb0bd1..35ee029f0 100644
--- a/mk/android_strings.dtd
+++ b/mk/android_strings.dtd
@@ -151,7 +151,7 @@
 
-
+
 
 
 
 
-
+
 
 
 

___
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

2018-11-19 Thread translation

commit 114dcbfcc193462826940025224d52a5acb71d30
Author: Translation commit bot 
Date:   Mon Nov 19 09:15:03 2018 +

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

diff --git a/ka/aboutTor.dtd b/ka/aboutTor.dtd
index f232c0ba4..f6b9dd76f 100644
--- a/ka/aboutTor.dtd
+++ b/ka/aboutTor.dtd
@@ -20,7 +20,7 @@
 
 
 
-
+
 
 https://www.torproject.org/getinvolved/volunteer.html.en;>
 

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

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

2018-11-19 Thread translation

commit e2fa1d41a692d9ee680df469bda5b0249bc70e39
Author: Translation commit bot 
Date:   Mon Nov 19 09:15:22 2018 +

Update translations for donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index 6fa9599f9..066357525 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -639,6 +639,12 @@ msgid ""
 "supporting their unrestricted availability and use, and furthering their "
 "scientific and popular understanding."
 msgstr ""
+"Tor-áá ááá¥á¢áá¡ ááááááá 
ááááááááá¡ á£á¤ááááááá¡ áááªááá¡á 
áá ááááá¡á£á¤ááááá¡ á®áá áá¡á®áá¡ "
+"ááá£áá¯áááá¡áááá¡ á®ááá¨áá¬á§ááá, 
á£á¤áá¡á áá á¦áá á¬á§áá áá¡ áá¥ááá, 
áááááááá¡á áá ááá ááá "
+"áááááªáááááá¡ 
ááááá¦ááááááá¡ááá áá¡áá ááááááá 
á¡áá¨á£áááááááá¡ á¨áá¥ááááá áá "
+"áááá áªáááááá, ááááá 
á¨áá£áá¦á£áááá á¬áááááá¡á áá 
ááááá§áááááá¡ á£áá á£ááááá§áá¤áá, 
á¨áááááá"
+" áá áááááá áááááá¨áá áááá, 
áááªáááá á£áá ááááááá¡á áá 
á¡ááááááááááá¡ áªáááááá áááá¡ "
+"ááááá¡ áááá¦ááááá."
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:74
 msgid ""

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

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

2018-11-19 Thread translation

commit e428860514598d2de1aa7f511be4c80681864e0d
Author: Translation commit bot 
Date:   Mon Nov 19 09:15:08 2018 +

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

diff --git a/ka/aboutTor.dtd b/ka/aboutTor.dtd
index f232c0ba4..f6b9dd76f 100644
--- a/ka/aboutTor.dtd
+++ b/ka/aboutTor.dtd
@@ -20,7 +20,7 @@
 
 
 
-
+
 
 https://www.torproject.org/getinvolved/volunteer.html.en;>
 

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

[tor-commits] [translation/tbmanual-contentspot] some symlinks to test

2018-11-19 Thread emmapeel

commit 92ff211d009a1b0da91eb1ed161b3ed0c9a2d6d1
Author: emma peel 
Date:   Mon Nov 19 10:10:32 2018 +0100

some symlinks to test
---
 contents+bn-IN.po | 1 +
 contents+es-ES.po | 1 +
 2 files changed, 2 insertions(+)

diff --git a/contents+bn-IN.po b/contents+bn-IN.po
new file mode 12
index 0..685276203
--- /dev/null
+++ b/contents+bn-IN.po
@@ -0,0 +1 @@
+contents+bn-BD.po
\ No newline at end of file
diff --git a/contents+es-ES.po b/contents+es-ES.po
new file mode 12
index 0..5625c7901
--- /dev/null
+++ b/contents+es-ES.po
@@ -0,0 +1 @@
+contents+es.po
\ No newline at end of file



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

[tor-commits] [translation/tbmanual-contentspot] Merge branch 'tbmanual-contentspot' of https://git.torproject.org/translation into tbmanual-contentspot

2018-11-19 Thread emmapeel

commit abccb75bdd1a01f7f17e3856a28d4eed8841847a
Merge: 92ff211d0 58fcea331
Author: emma peel 
Date:   Mon Nov 19 10:14:17 2018 +0100

Merge branch 'tbmanual-contentspot' of 
https://git.torproject.org/translation into tbmanual-contentspot

 contents+ar.po|  95 ++--
 contents+bg.po|  90 +--
 contents+bn-BD.po |  90 +--
 contents+ca.po|  92 +--
 contents+cs.po|  90 +--
 contents+da.po|  90 +--
 contents+de.po| 140 +++
 contents+el.po|  90 +--
 contents+en-GB.po |  90 +--
 contents+en.po| 134 ++
 contents+es-AR.po | 140 +++
 contents+es.po| 140 +++
 contents+fa.po|  90 +--
 contents+fr.po|  90 +--
 contents+ga.po| 138 +++
 contents+he.po| 132 ++---
 contents+hr.po|  90 +--
 contents+id.po|  90 +--
 contents+is.po| 126 +---
 contents+it.po|  90 +--
 contents+ka.po|  96 +---
 contents+lv.po|  90 +--
 contents+mk.po|  90 +--
 contents+nb.po|  90 +--
 contents+nl.po|  90 +--
 contents+pl.po|  90 +--
 contents+pt-BR.po |  98 ++---
 contents+ru.po|  90 +--
 contents+sv.po|  90 +--
 contents+tr.po|  90 +--
 contents+uk.po| 215 +-
 contents+vi.po|  90 +--
 contents+zh-CN.po |  90 +--
 contents+zh-TW.po |  90 +--
 contents.pot  | 134 ++
 35 files changed, 2633 insertions(+), 1027 deletions(-)

___
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

2018-11-19 Thread translation

commit ff669713229b78b003412821830c0462ce3ebf23
Author: Translation commit bot 
Date:   Mon Nov 19 08:49:07 2018 +

Update translations for support-portal
---
 contents+ka.po | 20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/contents+ka.po b/contents+ka.po
index a5a6101ca..e5e8d6990 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -754,6 +754,9 @@ msgid ""
 "href=\"https://www.torbsd.org/\;>TorBSD project, but their Tor "
 "Browser is not officially supported."
 msgstr ""
+"áá á¡ááááá¡ áá ááá¥á¢á 
á¡áá®ááá¬áááááá https://www.torbsd.org/\;>TorBSD, áááá áá 
Tor-áá áá£ááá á áá áá"
+" áá¤ááªáááá£á áá áá®áá ááááá ááá."
 
 #: http//localhost/tbb/tbb-18/
 #: (content/tbb/tbb-18/contents+en.lrquestion.seo_slug)
@@ -2090,6 +2093,9 @@ msgid ""
 "Please take a strong stance in favor of digital privacy and internet "
 "freedom, and allow Tor users access to xyz.com."
 msgstr ""
+"ááá®ááá, áá®áá á ááá£ááá áá ááá 
ááá áááááªáááááá¡ 
á®ááá¨áá£á®ááááááá¡á áá ááá¢áá 
ááá¢áá¡ "
+"ááááá¡á£á¤ááááá¡ áá ááá ááá Tor-áá¡ 
áááá®ááá áááááá¡ xyz.com á¡ááá¢ááá 
á¬áááááá¡ áááá. "
+"áááááááá.â"
 
 #: http//localhost/tbb/tbb-7/
 #: (content/tbb/tbb-7/contents+en.lrquestion.description)
@@ -2134,7 +2140,7 @@ msgstr 
"á¡ááá¢á¡-áá¦á£áááá¡-áªááááá á-á¨áá£á«
 
 #: http//localhost/tbb/tbb-9/ (content/tbb/tbb-9/contents+en.lrquestion.title)
 msgid "Can I use Tor with a browser besides Tor Browser?"
-msgstr ""
+msgstr "á¨áááá«ááá Tor-áá¡ á¡á®áá áá áá£ááá 
áá ááááá§ááááá, ááá áá Tor-áá áá£ááá 
áá¡?"
 
 #: http//localhost/tbb/tbb-9/
 #: (content/tbb/tbb-9/contents+en.lrquestion.description)
@@ -2142,6 +2148,8 @@ msgid ""
 "We strongly recommend against using Tor in any browser other than Tor "
 "Browser."
 msgstr ""
+"á©ááá ááááááááá ááá á©ááá áá  
áááááá§áááá Tor á ááááááá á¡á®áá áá 
áá£ááá áá, ááá áá Tor-"
+"áá áá£ááá áá¡."
 
 #: http//localhost/tbb/tbb-9/
 #: (content/tbb/tbb-9/contents+en.lrquestion.description)
@@ -2149,6 +2157,8 @@ msgid ""
 "Using Tor in another browser can leave you vulnerable without the privacy "
 "protections of Tor Browser."
 msgstr ""
+"Tor-áá¡ á¡á®áá áá áá£ááá áá 
ááááá§áááááá¡áá¡, ááá£áªáááá ááá 
á©áááá ááá ááá áááááªáááááá¡ "
+"á£á¡áá¤á áá®ááááá¡ áá 
á¡áá¨á£áááááááá¡ ááá áá¨á, á ááááááª 
Tor-áá áá£ááá á¡ áááá©ááá."
 
 #: http//localhost/tbb/tbb-9/
 #: (content/tbb/tbb-9/contents+en.lrquestion.seo_slug)
@@ -2258,6 +2268,9 @@ msgid ""
 "which prevents Onion Browser from having the same privacy protections as Tor"
 " Browser."
 msgstr ""
+"áá£ááªá, Apple ááááá®ááá¡, á áá iOS-áá áá 
á¡ááá£áá áá áá£ááá ááá 
áá£áªááááááá áá§ááááááá¡ "
+"Webkit-á¡, á ááª áá  áá«áááá¡ Onion-áá áá£ááá 
á¡ áá¡ááááá á£á¡áá¤á áá®ááááá¡ ááááá¡ 
ááá¦á¬áááá¡ "
+"á¡áá¨á£áááááá¡, á áááá ááª Tor-áá 
áá£ááá á¨áá."
 
 #: http//localhost/tormobile/tormobile-3/
 #: (content/tormobile/tormobile-3/contents+en.lrquestion.description)
@@ -2834,6 +2847,9 @@ msgid ""
 "Please take a strong stance in favor of digital privacy and internet "
 "freedom, and allow Tor users access to xyz.com. Thank you.\""
 msgstr ""
+"ááá®ááá, áá®áá á ááá£ááá áá ááá 
ááá áááááªáááááá¡ 
á®ááá¨áá£á®ááááááá¡á áá ááá¢áá 
ááá¢áá¡ "
+"ááááá¡á£á¤ááááá¡ áá ááá ááá Tor-áá¡ 
áááá®ááá áááááá¡ xyz.com á¡ááá¢ááá 
á¬áááááá¡ áááá. "
+"áááááááá.â"
 
 #: http//localhost/censorship/censorship-2/
 #: (content/censorship/censorship-2/contents+en.lrquestion.description)
@@ -4159,7 +4175,7 @@ msgstr ""
 
 #: templates/footer.html:5
 msgid "Our mission:"
-msgstr ""
+msgstr "á©áááá áááááá:"
 
 #: templates/footer.html:5
 msgid ""

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

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

2018-11-19 Thread translation

commit 58fcea3313240a399a328254493eafd6372c40b2
Author: Translation commit bot 
Date:   Mon Nov 19 08:46:57 2018 +

Update translations for tbmanual-contentspot
---
 contents+ar.po | 3 +++
 contents+ka.po | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/contents+ar.po b/contents+ar.po
index b8347916f..4bea9381e 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -427,6 +427,9 @@ msgid ""
 " of the URL bar, then select 'Tor Network Settings...' to access these "
 "options."
 msgstr ""
+"Ø§Ø°Ø§ ÙÙØª ØªØ´ØºÙ  ÙØªØµÙØ ØªÙØ± ÙÙÙØ±Ø© Ø§ÙØ£ÙÙÙØ Ø§Ø¶ØºØ· 
\"Ø¶Ø¨Ø·\"ÙÙØªØ  ÙØ§ÙØ°Ø© Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø´Ø¨ÙØ© "
+"ØªÙØ±. Ø§Ø¶ØºØ· Ø¹ÙÙ Ø²Ø±Ø§Ø± ØªÙØ± Ø¹ÙÙ ÙØ³Ø§Ø± URL bar Ù Ø§Ø®ØªØ± 
Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª Ø´Ø¨ÙØ© ØªÙØ± ÙÙØ¯Ø®ÙÙ Ø¹ÙÙ "
+"Ø§ÙØ®ÙØ§Ø±Ø§Øª ."
 
 #: http//localhost/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
diff --git a/contents+ka.po b/contents+ka.po
index 0ba1a5dc5..15ac5c0d1 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -1,7 +1,7 @@
 # Translators:
 # erinm, 2018
-# A. C., 2018
 # Emma Peel, 2018
+# A. C., 2018
 # 
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-18 22:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Emma Peel, 2018\n"
+"Last-Translator: A. C., 2018\n"
 "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2212,7 +2212,7 @@ msgstr "ááá®ááá Tor-áá¡ áááá 
áááááá"
 
 #: templates/footer.html:5
 msgid "Our mission:"
-msgstr ""
+msgstr "á©áááá áááááá:"
 
 #: templates/footer.html:5
 msgid ""

___
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

2018-11-19 Thread translation

commit da7fedca1008738ea4d8fc03fb6aca962b74d2b7
Author: Translation commit bot 
Date:   Mon Nov 19 08:19:04 2018 +

Update translations for support-portal
---
 contents+ka.po | 31 ---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/contents+ka.po b/contents+ka.po
index 17bd87ea7..a5a6101ca 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -1945,7 +1945,7 @@ msgid ""
 "protection is blocking me from accessing Tor Browser, it is "
 "common for anti-virus / anti-malware software to cause this type of issue."
 msgstr ""
-"áá£ ááá¢áááá á£á¡á£áá áá ááá ááá 
ááá¥áá ááá¨áááá£ááá, ááá®ááá 
áá®áááá áááááªá http://support.torproject.org/#tbb-10\;>á©ááá 
ááá¢áááá á£á¡á£áá/ááááá "
 "áá ááá áááááá¡ááá ááá¡ááªááá 
á¡áá¨á£ááááá á®ááá¡ ááá¨ááá¡ Tor-áá 
áá£ááá ááá "
 "á¬áááááá¨á, á®á¨áá áá 
á¨áááá®áááááá, á ááªá ááá¢áááá 
á£á¡á£áá/ááááá "
@@ -1986,10 +1986,13 @@ msgid ""
 "browser, because you may accidentally use the other browser for something "
 "you intended to do using Tor."
 msgstr ""
+"áá¡ááá, á¡áá¤á áá®ááá áááááá©áááá 
Tor-á¡á áá áááááááá á£á¡áá¤á áá®á áá 
áá£ááá ááá¡ á¨áá áá¡ "
+"ááááá áááá¡áá¡, áááááááá 
á£ááááááá, á¨áá¡áá«ááá áá áá¡áá¡á£á 
áááá áá áá£ááá á áááááá§áááá áá"
+" ááá¥ááááááá¡áááá¡, á 
ááááá¡áááá¡ááª Tor-áá¡ ááááá§áááááá¡ 
áááá ááááá."
 
 #: http//localhost/tbb/tbb-6/ (content/tbb/tbb-6/contents+en.lrquestion.title)
 msgid "Can I make Tor Browser my default browser?"
-msgstr ""
+msgstr "á¨áááá«ááá Tor-áá áá£ááá á 
áááá®ááá áááá£ááá¡á®áááá áá áá£ááá 
á?"
 
 #: http//localhost/tbb/tbb-6/
 #: (content/tbb/tbb-6/contents+en.lrquestion.description)
@@ -1997,6 +2000,8 @@ msgid ""
 "Unfortunately, there is no supported way to make Tor Browser your default "
 "browser."
 msgstr ""
+"á¡ááá¬á£á®áá áá, áá áá á ááá áá®áá 
ááááá ááá ááá, Tor-áá áá£ááá áá¡ 
áááá£ááá¡á®ááááá "
+"ááá§ááááá."
 
 #: http//localhost/tbb/tbb-6/
 #: (content/tbb/tbb-6/contents+en.lrquestion.seo_slug)
@@ -2017,6 +2022,8 @@ msgid ""
 "Sometimes websites will block Tor users because they can't tell the "
 "difference between the average Tor user and automated traffic."
 msgstr ""
+"áááá¯áá , áááá¡ááá¢ááá áá¦á£áááá¡ 
Tor-áá¡ áááá®ááá áááááá¡, áááááááá 
ááá  áá¡á®áááááá¡ "
+"á©ááá£áááá áá Tor-áááá®ááá ááááá¡, 
ááá¢áááá¢á£á á áá ááá áááááá¡ááá."
 
 #: http//localhost/tbb/tbb-7/
 #: (content/tbb/tbb-7/contents+en.lrquestion.description)
@@ -2026,13 +2033,15 @@ msgid ""
 "The best success we've had in getting sites to unblock Tor users is getting "
 "users to contact the site administrators directly."
 msgstr ""
+"á¡áá£ááááá¡á ááá, Tor-áááá®ááá 
ááááááá¡áááá¡ á¡ááá¢áááá 
á¨ááá¦á£áááá¡ ááá¡áá®á¡ááááá, áá "
+"á¡ááá¢áááá¡ áááá ááááááááá ááá 
ááááá  áááááá¨áá áááá."
 
 #: http//localhost/tbb/tbb-7/
 #: (content/tbb/tbb-7/contents+en.lrquestion.description)
 #: http//localhost/censorship/censorship-2/
 #: (content/censorship/censorship-2/contents+en.lrquestion.description)
 msgid "Something like this might do the trick:"
-msgstr "á áá¦ááª áá¡áááá á£ááá á£á¨ááááá¡:"
+msgstr "á áá¦ááª áááá¡ áá¡áááá¡á á¬áá¡áá 
ááá£á¨ááááá¡:"
 
 #: http//localhost/tbb/tbb-7/
 #: (content/tbb/tbb-7/contents+en.lrquestion.description)
@@ -2042,6 +2051,9 @@ msgid ""
 "\"Hi! I tried to access your site xyz.com while using Tor Browser and "
 "discovered that you don't allow Tor users to access your site."
 msgstr ""
+"âááááá á¯ááá! ááªáááááá áá¥áááá¡ 
á¡ááá¢ááá xyz.com áááááá¨áá áááá¡ Tor-áá 
áá£ááá áá¡ "
+"ááááá§áááááá áá áá¦ááááá©ááá, á 
áá Tor-áá¡ áááá®ááá ááááááá¡ááá¡ 
á¨ááá¦á£áá£áá ááá¥áá "
+"áá¥áááá¡

84 matches

Mail list logo