date:20191206

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

2019-12-06 Thread translation

commit 392d19a7393a3bf4dd4c4c57eabaa936c023782f
Author: Translation commit bot 
Date:   Sat Dec 7 07:47:08 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 is/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/is/messages.json b/is/messages.json
index 1044dde50a..fbcd8c1278 100644
--- a/is/messages.json
+++ b/is/messages.json
@@ -60,7 +60,7 @@
 "message": "Ef Ã¾Ãº rekst Ã¡ vandamÃ¡l Ã Snowflake sem biÃ°lara eÃ°a 
milliÃ¾jÃ³n, skaltu endilega tilkynna vandamÃ¡liÃ°.  Til aÃ° gera Ã¾aÃ° muntu 
Ã¾urfa aÃ°:"
   },
   "sharedAccount": {
-"message": "Either https://trac.torproject.org/projects/tor/register\;>create an 
account or https://trac.torproject.org/projects/tor/login\;>log 
in using the shared cypherpunks account with password 
writecode."
+"message": "AnnaÃ° hvort aÃ° https://trac.torproject.org/projects/tor/register\;>bÃºa til aÃ°gang 
eÃ°a https://trac.torproject.org/projects/tor/login\;>skrÃ¡ inn 
meÃ° sameiginlega cypherpunks aÃ°gangnum og lykilorÃ°inu 
writecode."
   },
   "bugTracker": {
 "message": "https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake\;>SkrÃ¡
 beiÃ°ni/ticket meÃ° villuskrÃ¡ningarkerfinu okkar."

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

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

2019-12-06 Thread translation

commit 7c0f0f230e0fc73825fa8924de958a444224742e
Author: Translation commit bot 
Date:   Sat Dec 7 07:17:08 2019 +


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

diff --git a/is/messages.json b/is/messages.json
index 7c53a337fb..1044dde50a 100644
--- a/is/messages.json
+++ b/is/messages.json
@@ -30,7 +30,7 @@
 "message": "VefkÃ¶kur eru ekki virkar."
   },
   "websiteIntro": {
-"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\; 
data-msgid=\"__MSG_docWiki__\">documentation wiki."
+"message": "Snowflake er kerfi til aÃ° komast Ã kringum ritskoÃ°un Ã¡ 
internetinu. FÃ³lk sem verÃ°ur fyrir ritskoÃ°un getur notaÃ° Snowflake til aÃ° 
komast Ã¡ internetiÃ°. Tengingin Ã¾eirra fer Ã¾Ã¡ Ã gegnum 
Snowflake-milliÃ¾jÃ³na, sem eru reknir af sjÃ¡lfboÃ°aliÃ°um. Til aÃ° sjÃ¡ 
nÃ¡nari upplÃ½singar um hvernig Snowflake virkar https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\; 
data-msgid=\"__MSG_docWiki__\">wiki-vefinn meÃ° hjÃ¡lparskjÃ¶lunum."
   },
   "docWiki": {
 "message": "wiki-vefur meÃ° hjÃ¡lparskjÃ¶lum"
@@ -57,13 +57,13 @@
 "message": "Tilkynna villur"
   },
   "fileBug": {
-"message": "If you encounter problems with Snowflake as a client or a 
proxy, please consider filing a bug.  To do so, you will have to,"
+"message": "Ef Ã¾Ãº rekst Ã¡ vandamÃ¡l Ã Snowflake sem biÃ°lara eÃ°a 
milliÃ¾jÃ³n, skaltu endilega tilkynna vandamÃ¡liÃ°.  Til aÃ° gera Ã¾aÃ° muntu 
Ã¾urfa aÃ°:"
   },
   "sharedAccount": {
 "message": "Either https://trac.torproject.org/projects/tor/register\;>create an 
account or https://trac.torproject.org/projects/tor/login\;>log 
in using the shared cypherpunks account with password 
writecode."
   },
   "bugTracker": {
-"message": "https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake\;>SkrÃ¡Ã°u
 beiÃ°ni/ticket meÃ° villuskrÃ¡ningarkerfinu okkar."
+"message": "https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake\;>SkrÃ¡
 beiÃ°ni/ticket meÃ° villuskrÃ¡ningarkerfinu okkar."
   },
   "descriptive": {
 "message": "Please try to be as descriptive as possible with your ticket 
and if possible include log messages that will help us reproduce the bug. 
Consider adding keywords snowflake-webextension or 
snowflake-client to let us know how which part of the Snowflake system 
is experiencing problems."

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

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

2019-12-06 Thread translation

commit 44ec2658b802eed5f94dc0d66dc19bfa7c8c0ce3
Author: Translation commit bot 
Date:   Sat Dec 7 06:22:52 2019 +


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

diff --git a/sv-SE/network-settings.dtd b/sv-SE/network-settings.dtd
index a346d0c1e5..a31aa5766c 100644
--- a/sv-SE/network-settings.dtd
+++ b/sv-SE/network-settings.dtd
@@ -49,7 +49,7 @@
 
 
 
-
+
 
 
 

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

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

2019-12-06 Thread translation

commit ff87d0c2bfb7a0d0074b0eb56f17fb2ebf233322
Author: Translation commit bot 
Date:   Sat Dec 7 06:22:58 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
---
 sv-SE/network-settings.dtd | 62 +++---
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/sv-SE/network-settings.dtd b/sv-SE/network-settings.dtd
index a346d0c1e5..07ecc473f2 100644
--- a/sv-SE/network-settings.dtd
+++ b/sv-SE/network-settings.dtd
@@ -26,33 +26,33 @@
 
 
 
-
+
 
-
+
 
-
-
-
+
+
+
 
 
 
 
-
+
 
 
 
-
-
-
-
+
+
+
+
 
 
 
 
-
+
 
 
-
+
 
 
 
@@ -62,22 +62,22 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

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

2019-12-06 Thread translation

commit e8e440c17659d75a052d06675ca11e3f0ec0f9ac
Author: Translation commit bot 
Date:   Sat Dec 7 05:15:51 2019 +


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

diff --git a/locale/tr/LC_MESSAGES/messages.po 
b/locale/tr/LC_MESSAGES/messages.po
index 3694b421ac..399ccff09b 100644
--- a/locale/tr/LC_MESSAGES/messages.po
+++ b/locale/tr/LC_MESSAGES/messages.po
@@ -637,7 +637,7 @@ msgstr "SeÃ§ilmiÅ Hediye:"
 
 #: 
tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:464
 msgid "No Gift Selected"
-msgstr "Hediye SeÃ§ilmedi"
+msgstr "Hediye SeÃ§ilmemiÅ"
 
 #: 
tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:468
 msgid "Sticker Pack"
@@ -707,7 +707,7 @@ msgstr "aylÄ±k"
 
 #: 
tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:557
 msgid "Gift selected"
-msgstr "Hediye seÃ§ildi"
+msgstr "Hediye seÃ§ilmiÅ"
 
 #: 
tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:59
 msgid "Estimated Donation Date:"
@@ -894,6 +894,9 @@ msgid ""
 "making a donation with one of the methods above, please email giving(at)torproject.org."
 msgstr ""
+"SorularÄ±nÄ±z varsa ya da yukarÄ±daki yÃ¶ntemlerin biriyle baÄÄ±Å 
yaptÄ±ktan sonra"
+" bizden bir teÅekkÃ¼r hediyesi almak isterseniz, lÃ¼tfen giv...@torproject.org adresine yazÄ±n."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:149
 msgid "What is the Tor Project and what does it do?"
@@ -906,6 +909,10 @@ msgid ""
 "supporting their unrestricted availability and use, and furthering their "
 "scientific and popular understanding."
 msgstr ""
+"Tor Projesinin misyonu, Ã¶zgÃ¼r ve aÃ§Ä±k kaynaklÄ± anonimlik ve kiÅisel 
gizlilik"
+" teknolojileri saÄlayarak insan haklarÄ± ve Ã¶zgÃ¼rlÃ¼klerinin 
geliÅtirilmesini,"
+" bu teknolojilerin bilimsel ve kÃ¼ltÃ¼rel olarak bilinirliÄinin 
arttÄ±rÄ±lmasÄ±nÄ±"
+" ve herkes tarafÄ±ndan eriÅebilmesini saÄlamaktÄ±r."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:155
 msgid ""
@@ -914,6 +921,9 @@ msgid ""
 "target=\"_blank\">Tor Browser, which enables people to browse the "
 "internet anonymously."
 msgstr ""
+"Tor Projesinin ana Ã¼rÃ¼nÃ¼ olan https://www.torproject.org/download;
+"/download-easy.html.en\" target=\"_blank\">Tor Browser insanlarÄ±n "
+"Ä°nternet Ã¼zerinde anonim kalarak dolaÅabilmesini saÄlar."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:157
 msgid "The Tor Project is a 501(c)3 tax-exempt non-profit organization."

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

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

2019-12-06 Thread translation

commit a3d75dce9551bd519be235249c3121d97482e227
Author: Translation commit bot 
Date:   Sat Dec 7 03:18:22 2019 +

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

diff --git a/nl.po b/nl.po
index 64dd982bbd..ed0d8f7320 100644
--- a/nl.po
+++ b/nl.po
@@ -35,8 +35,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-28 17:02+0100\n"
-"PO-Revision-Date: 2019-11-29 08:47+\n"
-"Last-Translator: Tonnes \n"
+"PO-Revision-Date: 2019-12-07 02:51+\n"
+"Last-Translator: bacovane \n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2019-12-06 Thread translation

commit f4b7af52128619708d3098f65598ecd763077a39
Author: Translation commit bot 
Date:   Sat Dec 7 03:17:18 2019 +

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

diff --git a/nl.po b/nl.po
index 4850c1ed65..3c5f9f3dfd 100644
--- a/nl.po
+++ b/nl.po
@@ -35,8 +35,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-28 17:02+0100\n"
-"PO-Revision-Date: 2019-11-29 08:47+\n"
-"Last-Translator: Tonnes \n"
+"PO-Revision-Date: 2019-12-07 02:51+\n"
+"Last-Translator: bacovane \n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,7 +50,7 @@ msgstr "Tor is gereed"
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43
 msgid "You can now access the Internet."
-msgstr "U hebt nu toegang tot het internet."
+msgstr "U heeft nu internet toegang."
 
 #: config/chroot_local-includes/etc/whisperback/config.py:69
 #, python-format
@@ -398,7 +398,7 @@ msgstr "U zou {packages} automatisch kunnen installeren bij 
het starten van Tail
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:345
 msgid "To do so, you need to run Tails from a USB stick."
-msgstr ""
+msgstr "Voer hiervoor Tails uit vanaf een USB-stick."
 
 #. Translators: Don't translate {packages}, it's a placeholder and will be
 #. replaced.

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

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

2019-12-06 Thread translation

commit ae0d7fd8b4126e5c85fa5b586caf599f571bd356
Author: Translation commit bot 
Date:   Fri Dec 6 22:45:40 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 28 ++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index abfa8a9b73..6ed149749a 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -1398,7 +1398,7 @@ msgid ""
 msgstr ""
 "áá¡ááá ááá¡áªáááá á¨áááá¬áá 
á£ááááá¡ á¥ááááá á¡ https://renewablefreedom.org/contact/\; target=\"_blank\" "
-"class=\"hyperlinks links\">áááá®ááááá¡áááááá."
+"class=\"hyperlinks links\">áááá®ááááá."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:349
 msgid "The account information is as follows:"
@@ -2524,7 +2524,7 @@ msgid ""
 "+1-844-863-0915."
 msgstr ""
 "á¡á á£áá áá á¡ááááááá áá¦á¬áá á 
á©áááá áá ááá áááááá¡á áá 
á¤ááááá¡á£á á á®áá á¯ááá¦á ááªá®ááá¡ "
-"ááááá áá¨á á®ááááá¡áá¬áááááá 
áááá®ááááá¡áááááá 
ááá¬áá¡ááá£ááááá¨á áá 
á¡áá¢áááá¤ááá áááá áá "
+"ááááá áá¨á á®ááááá¡áá¬áááááá 
áááá®ááááá ááá¬áá¡ááá£ááááá¨á áá 
á¡áá¢áááá¤ááá ááááá áá "
 "+1-844-863-0915."
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:99
@@ -2623,6 +2623,9 @@ msgid ""
 " may be obtained from the Pennsylvania Department of State by calling toll-"
 "free, within Pennsylvania, 1-800-732-0999."
 msgstr ""
+"áá¤ááªáááá£á á á¡áá áááá¡á¢á ááªáá áá 
á¤ááááá¡á£á á ááá¤áá áááªááá¡ 
áááááá®ááá ááá¬áá¡ááá£áááááá "
+"The Tor Project, Inc. á¨áá¡áá«ááááááá á¨á¢áá¢ 
áááá¡áááááááá¡ áááá§áá¤áááááááá 
á£á¤áá¡á "
+"á¡áá¢áááá¤ááá ááá áá, 
áááá¡áááááááá¡ á¨ááááá, 1-800-732-0999."
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:139
 msgid "Virginia"
@@ -2633,6 +2636,8 @@ msgid ""
 "From the State Office of Consumer Affairs in the Department of Agriculture "
 "and Consumer Affairs, P.O. Box 1163, Richmond, VA 23218."
 msgstr ""
+"á¨á¢áá¢áá¡ á¡ááááá®ááá áááá 
á¡áá¥áááá á¡ááá¡áá®á£á áááá, á¡áááá£á 
ááá áá á¡ááááá®ááá áááá "
+"á¡áá¥áááá ááááá á¢ááááá¢á¨á P.O. Box 1163, 
Richmond, VA 23218."
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:145
 msgid "Washington"
@@ -2644,6 +2649,9 @@ msgid ""
 "href=\"http://www.sos.wa.gov/charities\; target=\"_blank\" "
 "class=\"hyperlinks links\">http://www.sos.wa.gov/charities/"
 msgstr ""
+"á¨á¢áá¢áá¡ á¡áááááááááá ááááá áá 
1-800-332-4483 áá ááá¡áááá ááá http://www.sos.wa.gov/charities\; target=\"_blank\" "
+"class=\"hyperlinks links\">http://www.sos.wa.gov/charities/"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:151
 msgid "West Virginia"
@@ -2655,6 +2663,9 @@ msgid ""
 "financial documents from the Secretary of State, State Capitol, Charleston, "
 "WV 25305."
 msgstr ""
+"ááá¡ááááá ááá á¯ááááá¡ áááªá®ááá 
áááááá¡ á¡áá áááá¡á¢á ááªáá 
á¡ááá£áááá áá á¤ááááá¡á£á á "
+"áááá£áááá¢ááá á¨áá£á«áááá 
ááááááá®áááá á¨á¢áá¢áá¡ 
á¡áááááááááá, ááááááá¡á¢á 
ááªáá£áá áªááá¢á á "
+"á©áá áá¡á¢ááá, WV 25305."
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:157
 msgid "Wisconsin"
@@ -2666,12 +2677,18 @@ msgid ""
 "liabilities, fund balances, revenue and expenses for the preceding fiscal "
 "year will be provided to any person upon request."
 msgstr ""
+"á¡áá¥áááááá¥áááá 
ááá¬áá¡ááá£ááááá¡ á¤ááááá¡á£á á 
ááááá áá¨ááá, áááªá®ááááá£áá 
á¥ááááá ááá "
+"ááááááá áááá, ááááááá£áááááá, 
á¤ááááá¡ ááá¨áááá,

[tor-commits] [snowflake/master] Add a build step / documentation for code reuse

2019-12-06 Thread arlo

commit af4cc52dc2eb46585d5f0da3ecc285c914e22414
Author: Arlo Breault 
Date:   Fri Nov 22 17:17:22 2019 -0500

Add a build step / documentation for code reuse

Trac: 32499
---
 .gitignore |  1 +
 proxy/.eslintignore|  1 +
 proxy/README.md| 64 +-
 proxy/make.js  | 10 +++-
 proxy/package.json |  1 +
 proxy/webext/README.md | 11 -
 6 files changed, 75 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1bae622..2d31939 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ snowflake.log
 proxy/test
 proxy/build
 proxy/node_modules
+proxy/snowflake-library.js
 proxy/spec/support
 proxy/webext/snowflake.js
 proxy/webext/popup.js
diff --git a/proxy/.eslintignore b/proxy/.eslintignore
index f580632..c249199 100644
--- a/proxy/.eslintignore
+++ b/proxy/.eslintignore
@@ -1,6 +1,7 @@
 build/
 test/
 webext/snowflake.js
+snowflake-library.js
 
 # FIXME: Whittle these away
 spec/
diff --git a/proxy/README.md b/proxy/README.md
index 61468c0..fedfa20 100644
--- a/proxy/README.md
+++ b/proxy/README.md
@@ -7,12 +7,26 @@ See https://snowflake.torproject.org/ for more info:
 https://snowflake.torproject.org/embed.html; width="88" 
height="16" frameborder="0" scrolling="no">
 ```
 
-### Building
+### Building the badge / snowflake.torproject.org
 
 ```
+npm install
 npm run build
 ```
 
+which outputs to the `build/` directory.
+
+### Building the webextension
+
+```
+npm install
+npm run webext
+```
+
+and then load the `webext/` directory as an unpacked extension.
+ * 
https://developer.mozilla.org/en-US/docs/Tools/about:debugging#Loading_a_temporary_extension
+ * https://developer.chrome.com/extensions/getstarted#manifest
+
 ### Testing
 
 Unit testing with Jasmine are available with:
@@ -44,6 +58,7 @@ IdentityFile ~/.ssh/tor
 ### Deploying
 
 ```
+npm install
 npm run build
 ```
 
@@ -73,3 +88,50 @@ With no parameters,
 snowflake uses the default relay `snowflake.freehaven.net:443` and
 uses automatic signaling with the default broker at
 `https://snowflake-broker.freehaven.net/`.
+
+### Reuse as a library
+
+The badge and the webextension make use of the same underlying library and
+only differ in their UI.  That same library can be produced for use with other
+interfaces, such as [Cupcake][1], by running,
+
+```
+npm install
+npm run library
+```
+
+which outputs a `./snowflake-library.js`.
+
+You'd then want to create a subclass of `UI` to perform various actions as
+the state of the snowflake changes,
+
+```
+class MyUI extends UI {
+...
+}
+```
+
+See `WebExtUI` in `init-webext.js` and `BadgeUI` in `init-badge.js` for
+examples.
+
+Finally, initialize the snowflake with,
+
+```
+var log = function(msg) {
+  return console.log('Snowflake: ' + msg);
+};
+var dbg = log;
+
+var config = new Config();
+var ui = new MyUI();  // NOTE: Using the class defined above
+var broker = new Broker(config.brokerUrl);
+
+var snowflake = new Snowflake(config, ui, broker);
+
+snowflake.setRelayAddr(config.relayAddr);
+snowflake.beginWebRTC();
+```
+
+This minimal setup is pretty much what's currently in `init-node.js`.
+
+[1]: 
https://chrome.google.com/webstore/detail/cupcake/dajjbehmbnbppjkcnpdkaniapgdppdnc
diff --git a/proxy/make.js b/proxy/make.js
index c7be058..f8b2192 100755
--- a/proxy/make.js
+++ b/proxy/make.js
@@ -39,7 +39,10 @@ var SHARED_FILES = [
 ];
 
 var concatJS = function(outDir, init, outFile, pre) {
-  var files = FILES.concat(`init-${init}.js`);
+  var files = FILES;
+  if (init) {
+files = files.concat(`init-${init}.js`);
+  }
   var outPath = `${outDir}/${outFile}`;
   writeFileSync(outPath, pre, 'utf8');
   execSync(`cat ${files.join(' ')} >> ${outPath}`);
@@ -176,6 +179,11 @@ task('clean', 'remove all built files', function() {
   execSync('rm -rf build test spec/support');
 });
 
+task('library', 'build the library', function() {
+  concatJS('.', '', 'snowflake-library.js', '');
+  console.log('Library prepared.');
+});
+
 var cmd = process.argv[2];
 
 if (tasks.has(cmd)) {
diff --git a/proxy/package.json b/proxy/package.json
index 6946691..772746e 100644
--- a/proxy/package.json
+++ b/proxy/package.json
@@ -10,6 +10,7 @@
 "test": "node make.js test",
 "build": "node make.js build",
 "webext": "node make.js webext",
+"library": "node make.js library",
 "pack-webext": "node make.js pack-webext",
 "clean": "node make.js clean",
 "prepublish": "node make.js node",
diff --git a/proxy/webext/README.md b/proxy/webext/README.md
deleted file mode 100644
index cd53ff1..000
--- a/proxy/webext/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Build it,
-
-```
-cd ..
-npm install
-npm run webext
-```
-
-and then load this directory as an unpacked extension.
- * 
https://developer.mozilla.org/en-US/docs/Tools/about:debugging#Loading_a_temporary_extension
- * https://developer.chrome.com/extensions/getstarted#manifest

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

2019-12-06 Thread translation

commit 74d836aa44076c13ba6cd7b6112e2f7955677d32
Author: Translation commit bot 
Date:   Fri Dec 6 22:15:42 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index 56a240b6af..abfa8a9b73 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -2591,6 +2591,10 @@ msgid ""
 "href=\"https://www.charitiesnys.com\; target=\"_blank\" class=\"hyperlinks "
 "links\">www.charitiesnys.com."
 msgstr ""
+"áá¤ááªáááá£á á áááá®ááááá¡áááá¡ 
á¡áááááá ááá á¬áá ááááááááááá¡ 
á¡áá¥áááááá¥áááá ááá£á áááá, "
+"28 Liberty Street, New York, NY 10005, 1-212-416-8686 áá https://www.charitiesnys.com\; target=\"_blank\" class=\"hyperlinks "
+"links\">www.charitiesnys.com."
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:125
 msgid "North Carolina"
@@ -2601,10 +2605,13 @@ msgid ""
 "Financial information about this organization and a copy of its license are "
 "available from the State Solicitation Licensing Branch at 1-919-814-5400."
 msgstr ""
+"á¤ááááá¡á£á á ááá¤áá áááªáá 
ááá¬áá¡ááá£ááááá¡ á¨áá¡áá®áá áá 
áá¡áá ááá¡á áááªáááááá¡ "
+"á®ááááá¡áá¬áááááá áááªááá£á 
á¨á¢áá¢á¨á, á¨áááá¬áá á£ááááá¡ 
áááá®ááááá¡ áááªááááá áááá¡ "
+"áááá§áá¤áááááá¨á ááááá áá 1-919-814-5400."
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:129
 msgid "The license is not an endorsement by the state."
-msgstr ""
+msgstr "áá¦ááá¨áá£áá áááªááááá áá  
áá£ááá¡á®áááá¡ á¨á¢áá¢áá¡ áááá  á ááá 
á¡áá®áá¡ áá®áá ááááá áá¡."
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:133
 msgid "Pennsylvania"

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

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

2019-12-06 Thread translation

commit ac8b80b4b77614b4bb1aea4dddcfc4e9f7b23aff
Author: Translation commit bot 
Date:   Fri Dec 6 21:45:40 2019 +


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

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index 955a4089a6..56a240b6af 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -2566,6 +2566,13 @@ msgid ""
 "href=\"https://www.state.nj.us/lps/ca/charfrm.htm\; target=\"_blank\" "
 "class=\"hyperlinks links\">www.state.nj.us/lps/ca/charfrm.htm."
 msgstr ""
+"áááááá®ááá ááá¤áá áááªááá¡, 
áááªááá£áá á¡áááááá ááá á¬áá 
ááááááááááá¡ ááá¨áááááá, "
+"ááááá áá¨ááááá¡ áááá ááá áááá¨á 
á¡áá¥áááááá¥áááá ááá¬áá¡ááá£ááááá¡ 
áááá  áááá®áááááá "
+"á¨áááá¬áá á£ááááá¡á áá ááá¦ááá£áá 
áááááááá¡ áá ááªááá¢á£áá á¬áááá¡ 
á¨áá¡áá®áá, á ááááááª "
+"áááááá§á á¥áááááá¥ááááááá¡ 
áááááá, á¨áá¡áá«ááááááá á¡áááááá 
ááá á¬áá ááááááááááá¡ááá "
+"ááá£-á¯áá á¡áá¡ á¨á¢áá¢á¨á 
á¡áá¢áááá¤ááá áááá áááá (973) 504-6215 áá 
ááá¢áá ááá¢á¡ááá¢áááá https://www.state.nj.us/lps/ca/charfrm.htm\; target=\"_blank\" "
+"class=\"hyperlinks links\">www.state.nj.us/lps/ca/charfrm.htm."
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:115
 msgid "Registration with the attorney general does not imply endorsement."

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

[tor-commits] [tor/release-0.4.1] actually include geoip changelog entry in 041.

2019-12-06 Thread nickm

commit 6ab63bf2a825be4dc87de36baefb05d3175fc184
Author: Nick Mathewson 
Date:   Fri Dec 6 16:20:56 2019 -0500

actually include geoip changelog entry in 041.
---
 ChangeLog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0aeb483d5..5c7726752 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,9 +40,9 @@ Changes in version 0.4.1.7 - 2019-12-??
   so that we are informed of all compilation failures, not just the
   first one or two. Closes ticket 31372.
 
-  o Minor features (geoip, backport from 0.4.2.4-rc):
-- Update geoip and geoip6 to the November 6 2019 Maxmind GeoLite2
-  Country database. Closes ticket 32440.
+  o Minor features (geoip, backport from 0.4.2.5):
+- Update geoip and geoip6 to the December 3 2019 Maxmind GeoLite2
+  Country database. Closes ticket 32685.
 
   o Minor bugfixes (Appveyor CI, backport from 0.4.2.2-alpha):
 - Avoid spurious errors when Appveyor CI fails before the install step.

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

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

2019-12-06 Thread translation

commit 9003310425e0b87e6b014dd0e4f12a0405b9f8c6
Author: Translation commit bot 
Date:   Fri Dec 6 21:15:37 2019 +


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

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index ef4daa346f..955a4089a6 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -2507,8 +2507,7 @@ msgid ""
 "Registration does not imply endorsement, approval, or recommendation by the "
 "state."
 msgstr ""
-"á áááá¡á¢á ááªáá áá  áá£ááá¡á®áááá¡ 
á¨á¢áá¢áá¡ áááá  ááááá¬ááááá¡, 
áááá®ááááá¡ áá "
-"á áááááááááªááá¡."
+"á áááá¡á¢á ááªáá áá  áá£ááá¡á®áááá¡ 
á¨á¢áá¢áá¡ áááá  á ááá á¡áá®áá¡, 
áááá®ááááá¡ áá áá®áá ááááá áá¡."
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:89
 msgid "Florida Registration #CH58356"
@@ -2571,6 +2570,8 @@ msgstr ""
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:115
 msgid "Registration with the attorney general does not imply endorsement."
 msgstr ""
+"á áááá¡á¢á ááªáá á¡áááááá ááá á¬áá 
ááááááááááá¡ áááá  áá  
áá£ááá¡á®áááá¡ á ááá á¡áá®áá¡ "
+"áá®áá ááááá áá¡."
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:119
 msgid "New York"

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

[tor-commits] [tor/release-0.4.1] update changelog for new geoip entry.

2019-12-06 Thread nickm

commit efd6864d39a498b6873ac609835d203a40b17518
Author: Nick Mathewson 
Date:   Fri Dec 6 16:05:53 2019 -0500

update changelog for new geoip entry.
---
 changes/geoip-2019-12-03 | 4 
 1 file changed, 4 deletions(-)

diff --git a/changes/geoip-2019-12-03 b/changes/geoip-2019-12-03
deleted file mode 100644
index ea62b6ee8..0
--- a/changes/geoip-2019-12-03
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (geoip):
-- Update geoip and geoip6 to the December 3 2019 Maxmind GeoLite2
-  Country database. Closes ticket 32685.
-

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

[tor-commits] [tor/release-0.4.2] update changelog for new geoip entry.

2019-12-06 Thread nickm

commit ad9bcbfc87d1c727fda51c0a32ad9a5189ad8f3e
Author: Nick Mathewson 
Date:   Fri Dec 6 16:06:01 2019 -0500

update changelog for new geoip entry.
---
 ChangeLog| 4 
 ReleaseNotes | 6 ++
 changes/geoip-2019-12-03 | 4 
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bbefe58d0..fa66eacc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 Changes in version 0.4.2.5 - 2019-12-??
   Blurb blurb.
 
+  o Minor features (geoip):
+- Update geoip and geoip6 to the December 3 2019 Maxmind GeoLite2
+  Country database. Closes ticket 32685.
+
   o Testing:
 - Require C99 standards-conforming code in Travis CI, but allow GNU
   gcc extensions. Also activates clang's -Wtypedef-redefinition
diff --git a/ReleaseNotes b/ReleaseNotes
index 545545b0f..3f95bdf6c 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -123,10 +123,8 @@ Changes in version 0.4.2.5 - 2019-12-??
   line parsing. Closes ticket 31529.
 
   o Minor features (geoip):
-- Update geoip and geoip6 to the November 6 2019 Maxmind GeoLite2
-  Country database. Closes ticket 32440.
-- Update geoip and geoip6 to the October 1 2019 Maxmind GeoLite2
-  Country database. Closes ticket 31931.
+- Update geoip and geoip6 to the December 3 2019 Maxmind GeoLite2
+  Country database. Closes ticket 32685.
 
   o Minor features (git hooks):
 - Our pre-commit git hook now checks for a special file before
diff --git a/changes/geoip-2019-12-03 b/changes/geoip-2019-12-03
deleted file mode 100644
index ea62b6ee8..0
--- a/changes/geoip-2019-12-03
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (geoip):
-- Update geoip and geoip6 to the December 3 2019 Maxmind GeoLite2
-  Country database. Closes ticket 32685.
-

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

[tor-commits] [tor/release-0.4.0] update changelog for new geoip entry.

2019-12-06 Thread nickm

commit 6f615ee205c206df83bea6dd7aebeb57d504da28
Author: Nick Mathewson 
Date:   Fri Dec 6 16:05:47 2019 -0500

update changelog for new geoip entry.
---
 ChangeLog| 8 +++-
 changes/geoip-2019-12-03 | 4 
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9c741c4bc..5b8b62c7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,9 +97,9 @@ Changes in version 0.4.0.6 - 2019-12-??
   list of 148 fallbacks (70 new, 78 existing, 79 removed) generated
   in June 2019. Closes ticket 28795.
 
-  o Minor features (geoip, backport from 0.4.2.4-rc):
-- Update geoip and geoip6 to the November 6 2019 Maxmind GeoLite2
-  Country database. Closes ticket 32440.
+  o Minor features (geoip, backport from 0.4.2.5):
+- Update geoip and geoip6 to the December 3 2019 Maxmind GeoLite2
+  Country database. Closes ticket 32685.
 
   o Minor features (stem tests, backport from 0.4.2.1-alpha):
 - Change "make test-stem" so it only runs the stem tests that use
@@ -336,8 +336,6 @@ Changes in version 0.4.0.6 - 2019-12-??
   ticket 30860.
 - Simplify the Travis CI build matrix, and optimise for build time.
   Closes ticket 31859.
-- Simplify the Travis CI build matrix, and optimise for build time.
-  Closes ticket 31859.
 - Use Windows Server 2019 instead of Windows Server 2016 in our
   Appveyor builds. Closes ticket 32086.
 
diff --git a/changes/geoip-2019-12-03 b/changes/geoip-2019-12-03
deleted file mode 100644
index ea62b6ee8..0
--- a/changes/geoip-2019-12-03
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (geoip):
-- Update geoip and geoip6 to the December 3 2019 Maxmind GeoLite2
-  Country database. Closes ticket 32685.
-

___
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] changelog: new geoip entry.

2019-12-06 Thread nickm

commit e0920a3f63295eff9436ca96084490c3172ec266
Author: Nick Mathewson 
Date:   Fri Dec 6 16:04:19 2019 -0500

changelog: new geoip entry.
---
 ChangeLog| 6 +++---
 changes/geoip-2019-12-03 | 4 
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a8f77ab17..d17070b79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -115,9 +115,9 @@ Changes in version 0.3.5.9 - 2019-12-??
   list of 148 fallbacks (70 new, 78 existing, 79 removed) generated
   in June 2019. Closes ticket 28795.
 
-  o Minor features (geoip, backport from 0.4.2.4-rc):
-- Update geoip and geoip6 to the November 6 2019 Maxmind GeoLite2
-  Country database. Closes ticket 32440.
+  o Minor features (geoip, backport from 0.4.2.5):
+- Update geoip and geoip6 to the December 3 2019 Maxmind GeoLite2
+  Country database. Closes ticket 32685.
 
   o Minor features (NSS, diagnostic, backport from 0.4.0.4-rc):
 - Try to log an error from NSS (if there is any) and a more useful
diff --git a/changes/geoip-2019-12-03 b/changes/geoip-2019-12-03
deleted file mode 100644
index ea62b6ee8..0
--- a/changes/geoip-2019-12-03
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (geoip):
-- Update geoip and geoip6 to the December 3 2019 Maxmind GeoLite2
-  Country database. Closes ticket 32685.
-

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

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

2019-12-06 Thread nickm

commit 3248630fc81b24b22e337fab70d67c966b059356
Merge: 0a33522b6 6513102b9
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:08 2019 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

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

2019-12-06 Thread nickm

commit c030d2cbc0a2ede198e9772a372b5f211a062fb9
Merge: 247dbf891 6513102b9
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:08 2019 -0500

Merge branch 'maint-0.4.1' into release-0.4.1

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)

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

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

2019-12-06 Thread nickm

commit 74cae547e5159049bc49057b994d57e29f06e992
Merge: c53567c36 b7b467d3a
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

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

2019-12-06 Thread nickm

commit 8646b4dde78a7e7d82de1cefc134b3f9f921624d
Merge: cb51b0d55 3248630fc
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:08 2019 -0500

Merge branch 'maint-0.4.2' into release-0.4.2

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)

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

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

2019-12-06 Thread nickm

commit 6513102b9d186793402e05ec3d37f077d01a0cc2
Merge: 8933c7908 c7ca3fc18
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:08 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

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

2019-12-06 Thread nickm

commit e49ec773d1572eed2f02f83bba61d6383810d0a1
Merge: dac74fbfa b7b467d3a
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:06 2019 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)

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

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

2019-12-06 Thread nickm

commit 74cae547e5159049bc49057b994d57e29f06e992
Merge: c53567c36 b7b467d3a
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

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

2019-12-06 Thread nickm

commit 74cae547e5159049bc49057b994d57e29f06e992
Merge: c53567c36 b7b467d3a
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

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

2019-12-06 Thread nickm

commit c7ca3fc1869f4999845526d7fd883e17630143e9
Merge: e66533bef 74cae547e
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

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

2019-12-06 Thread nickm

commit 74cae547e5159049bc49057b994d57e29f06e992
Merge: c53567c36 b7b467d3a
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

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

2019-12-06 Thread nickm

commit 289adbce584d2c42665d1e4fb6adeb77e0d4e037
Merge: bd664bca9 74cae547e
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)

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

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

2019-12-06 Thread nickm

commit c7ca3fc1869f4999845526d7fd883e17630143e9
Merge: e66533bef 74cae547e
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

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

2019-12-06 Thread nickm

commit 4de31504b0fe5b679b929981d0eb60b878859d7f
Merge: c3a3539da c7ca3fc18
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:08 2019 -0500

Merge branch 'maint-0.4.0' into release-0.4.0

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)

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

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-12-06 Thread nickm

commit 6513102b9d186793402e05ec3d37f077d01a0cc2
Merge: 8933c7908 c7ca3fc18
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:08 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

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

2019-12-06 Thread nickm

commit c7ca3fc1869f4999845526d7fd883e17630143e9
Merge: e66533bef 74cae547e
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2

2019-12-06 Thread nickm

commit 3248630fc81b24b22e337fab70d67c966b059356
Merge: 0a33522b6 6513102b9
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:08 2019 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)

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

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

2019-12-06 Thread nickm

commit 74cae547e5159049bc49057b994d57e29f06e992
Merge: c53567c36 b7b467d3a
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

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

2019-12-06 Thread nickm

commit 74cae547e5159049bc49057b994d57e29f06e992
Merge: c53567c36 b7b467d3a
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

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

2019-12-06 Thread nickm

commit 089466eff356454b0e0eb4e1d432057504a9a4d6
Merge: 39bb283fc 3248630fc
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:08 2019 -0500

Merge branch 'maint-0.4.2'

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2

2019-12-06 Thread nickm

commit 3248630fc81b24b22e337fab70d67c966b059356
Merge: 0a33522b6 6513102b9
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:08 2019 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-12-06 Thread nickm

commit 6513102b9d186793402e05ec3d37f077d01a0cc2
Merge: 8933c7908 c7ca3fc18
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:08 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

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

2019-12-06 Thread nickm

commit c7ca3fc1869f4999845526d7fd883e17630143e9
Merge: e66533bef 74cae547e
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

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

2019-12-06 Thread nickm

commit c7ca3fc1869f4999845526d7fd883e17630143e9
Merge: e66533bef 74cae547e
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-12-06 Thread nickm

commit 6513102b9d186793402e05ec3d37f077d01a0cc2
Merge: 8933c7908 c7ca3fc18
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:08 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

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

2019-12-06 Thread nickm

commit 74cae547e5159049bc49057b994d57e29f06e992
Merge: c53567c36 b7b467d3a
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

[tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-12-06 Thread nickm

commit 6513102b9d186793402e05ec3d37f077d01a0cc2
Merge: 8933c7908 c7ca3fc18
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:08 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)

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

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

2019-12-06 Thread nickm

commit c7ca3fc1869f4999845526d7fd883e17630143e9
Merge: e66533bef 74cae547e
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

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

2019-12-06 Thread nickm

commit 74cae547e5159049bc49057b994d57e29f06e992
Merge: c53567c36 b7b467d3a
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)



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

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

2019-12-06 Thread nickm

commit c7ca3fc1869f4999845526d7fd883e17630143e9
Merge: e66533bef 74cae547e
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)

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

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

2019-12-06 Thread nickm

commit 74cae547e5159049bc49057b994d57e29f06e992
Merge: c53567c36 b7b467d3a
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 deletions(-)

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

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

2019-12-06 Thread translation

commit e360fbe82e7fba8cf63eaa20ea033b768c565dec
Author: Translation commit bot 
Date:   Fri Dec 6 20:45:37 2019 +


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

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index fc8a3d4f15..ef4daa346f 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -1731,7 +1731,8 @@ msgstr ""
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:509
 msgid "You can donate by sending us a postal money order."
-msgstr "á¨áááá«áááá á¨áááá¬áá á£áááá 
á¡áááááá¡áá®ááá ááááááááá¡ 
á¤áá¡á¢áá ááááááááááá."
+msgstr ""
+"á¨áááá«áááá á¨áááá¬áá á£áááá 
áááá¦áá á¡áááááá¡áá®ááá 
ááááááááá¡ á¤áá¡á¢áá 
ááááááááááá."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:511
 msgid ""
@@ -1817,7 +1818,7 @@ msgid ""
 " us with every purchase you make at 3,000+ popular online retailers."
 msgstr ""
 "Giving Assistant ááááá®ááá áááá 
á¨áááááá¬áá áá áááááá£áá 
á¨áááá«áááááá, á£ááá "
-"áááá á£áááá£áá áááá®áá¡ ááá¬ááá 
3,000+ ááá¢áá ááá¢áááá áááá¡ áªáááááá 
á¡ááá¢áá "
+"áááá á£áááá£áá áááá®áá¡ ááá¬ááá 
ááá¢áá ááá¢áááá áááá¡ 3,000+ áªáááááá 
á¡ááá¢áá "
 "á¡áá áááááááá¡áá¡."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:567
@@ -2088,7 +2089,7 @@ msgid ""
 "Champions of Privacy donate $1,000 or more per year and enjoy special perks "
 "and access."
 msgstr ""
-"ááá ááá£ááááá¡ áá£á¨áááááá¡ 
ááá¦ááá£áá áááá®á áá¦áááá¢ááá $1,000-á¡ 
á¬áááá¬ááá¨á áá "
+"ááá ááá£ááááá¡ áá£á¨áááááá¡ 
ááá¦ááá£áá áááá®á áá¦áááá¢ááá $1,000-á¡ 
á¬áááá¬ááá¨á áá áá¡ááá "
 "á¡áá áááááááá ááá áááá£áá á£ááá 
áá¢áá¡ááááááá áá á¡áááááááá 
á¬áááááá¡ á¨áá¡áá«áááááááááá."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:705
@@ -2377,7 +2378,7 @@ msgstr "áááááááá!"
 
 #: 
tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:71
 msgid "Thank you for supporting Tor's Strength in Numbers campaign."
-msgstr "áááááááá Tor-áá¡ âá¡áá«áááá á á 
ááááááááá¨ááâ ááááááááá¡ áá®áá 
ááááá áá¡áááá¡."
+msgstr "áááááááá, á áá áá®áá á¡ á£ááá á 
Tor-áá¡ ááááááááá¡ âá¡áá«áááá á á 
ááááááááá¨ááâ."
 
 #: 
tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:73
 #: 
tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:70
@@ -2481,7 +2482,7 @@ msgid ""
 "Certain states require written disclosures for nonprofit organizations "
 "soliciting contributions. Individual state disclosures are below."
 msgstr ""
-"áááááá á á¨á¢áá¢á¨á áá 
ááááááááááá 
ááá¬áá¡ááá£ááááááá¡áááá¡ 
ááá¬áá¡ááá£ááá á¬áá ááááááá "
+"áááááá á á¨á¢áá¢á¨á áá 
ááááááááááá 
ááá¬áá¡ááá£ááááááá¡áááá¡ 
áááááááááá á¬áá ááááááá "
 "á¡ááá£ááááá¡ áááªáááá¡ 
ááááááá£áááá, á¨áááá¬áá 
á£ááááááá¡ ááááááá. á¥ááááá 
áááªááá£ááá "
 "áááááá£á á¨á¢áá¢á¨á á¬áá á¡áááááá 
áááááªááááá."
 

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

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

2019-12-06 Thread translation

commit a61f70570c3b37c069d765d8688cdf669042d4c4
Author: Translation commit bot 
Date:   Fri Dec 6 20:15:42 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index 2f2c7b0439..fc8a3d4f15 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -20,7 +20,7 @@ msgstr ""
 #: 
tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:43
 #: 
tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:66
 msgid "Take back the internet with Tor"
-msgstr "Take back the internet with Tor"
+msgstr "ááááá á£ááá ááá¢áá ááá¢á Tor-áá."
 
 #: 
tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:112
 msgid "Give today, and Mozilla will match your donation."

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

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

2019-12-06 Thread translation

commit 5cffd4bac622dc610fc786c0f7dc95e2f8f8b148
Author: Translation commit bot 
Date:   Fri Dec 6 18:50:15 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+it.po | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/contents+it.po b/contents+it.po
index 4ba1c7d410..ae714c9b15 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -890,7 +890,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.title)
 msgid "BRIDGES"
-msgstr "ponti"
+msgstr "BRIDGES"
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.description)
@@ -899,7 +899,7 @@ msgid ""
 "relays."
 msgstr ""
 "La maggior parte dei Pluggable Transports, come obfs4, si basano sull'uso di"
-" \"bridge\" relÃ¨. "
+" \"bridge\" relÃ¨ (ponti). "
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -907,8 +907,8 @@ msgid ""
 "Most [Pluggable Transports](/circumvention), such as obfs4, rely on the use "
 "of âbridgeâ relays."
 msgstr ""
-"La maggior parte dei [Pluggable Transports](/circumvention), come obfs4, si "
-"basano sull'uso di \"bridge\" relÃ¨."
+"La maggior parte dei [Pluggable Transports](/it/circumvention), come obfs4, "
+"si basano sull'uso di \"bridge\" relÃ¨."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -961,7 +961,8 @@ msgstr ""
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
 "* Visit https://bridges.torproject.org/ and follow the instructions, or"
-msgstr "* Visitare https://bridges.torproject.org/  e seguire le istruzioni"
+msgstr ""
+"* Visitare https://bridges.torproject.org/ e seguire le istruzioni, oppure"
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -1040,8 +1041,8 @@ msgid ""
 "Once you have obtained some bridge addresses, you will need to enter them "
 "into Tor Launcher."
 msgstr ""
-"Una volta che hai ottenuto degli indirizzi dei ponti, dovrai inserirli nel "
-"Launcher Tor."
+"Una volta che avrai ottenuto qualche indirizzo dei bridge, dovrai inserirli "
+"nel Launcher Tor."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -1073,8 +1074,8 @@ msgid ""
 "one of the above methods to obtain more bridge addresses, and try again."
 msgstr ""
 "Se la connessione non va a buon fine, il ponte che hai ricevuto potrebbe "
-"essere disattivato. Utilizza uno dei metodi qui sopra per ottenere piÃ¹ ponti"
-" e riprova."
+"essere disattivato. Utilizza uno dei metodi qui sopra per ottenere piÃ¹ "
+"\"ponti\" e riprova."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)

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

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

2019-12-06 Thread translation

commit 48fc294f2f5cf7a50fa8735d57a9461b093b3425
Author: Translation commit bot 
Date:   Fri Dec 6 18:19:52 2019 +

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

diff --git a/contents+it.po b/contents+it.po
index ddf52316c5..4ba1c7d410 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -231,8 +231,9 @@ msgid ""
 "](/managing-identities/#new-identity) is requested)."
 msgstr ""
 "Di base il browser di Tor non tiene traccia della navigazione. I file "
-"temporanei sono validi solo per la sessione corrente. (fino all'uscita del "
-"browser o a [nuova identitÃ ]( produci nuova identitÃ )Ã¨ richiesto)"
+"temporanei sono validi solo per la sessione corrente (fino all'uscita del "
+"browser o fino alla richiesta di una [Nuova identitÃ ](/it/managing-"
+"identities/#new-identity))."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -586,7 +587,7 @@ msgid ""
 "In most cases, choosing \"Connect\" will allow you to connect to the Tor "
 "network without any further configuration."
 msgstr ""
-"Nella maggior parte dei casi, la scelta di \"Connetti\" ti consentirÃ  di "
+"Nella maggior parte dei casi, cliccare \"Connetti\" ti consentirÃ  di "
 "connetterti alla rete Tor senza ulteriori configurazioni."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -604,9 +605,9 @@ msgid ""
 "at a certain point, see the [Troubleshooting](/troubleshooting) page for "
 "help solving the problem."
 msgstr ""
-"Se stai utilizzando una connessione relativamente veloce, ma questa barra "
-"sembra bloccarsi a un certo punto, guarda la pagina [Risoluzione "
-"problemi](/troubleshooting) per assistenza nella soluzione del problema.  "
+"Se stai utilizzando una connessione relativamente veloce, ma questa barra a "
+"un certo punto sembra bloccarsi, guarda la pagina [Risoluzione "
+"problemi](/it/troubleshooting) per ricevere assistenza.  "
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -626,7 +627,7 @@ msgid ""
 "configuration options."
 msgstr ""
 "Se sapete che la vostra connessione Ã¨ censurata, o utilizza un proxy, "
-"scegliete questa opzione. Il browser Tor vi guiderÃ  attraverso una seri di "
+"scegliete questa opzione. Il browser Tor vi guiderÃ  attraverso una serie di "
 "opzioni di configurazione."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
@@ -639,11 +640,12 @@ msgid ""
 " You will then be taken to the [Circumvention](/circumvention) screen to "
 "configure a pluggable transport."
 msgstr ""
-"Ia prima schermata chiede se l'accesso alla rete Tor Ã¨ bloccata o censurata "
+"La prima schermata chiede se l'accesso alla rete Tor Ã¨ bloccato o censurato "
 "nella tua connessione. Se non Ã¨ questo il tuo caso scegli \"No\". Se te giÃ  
"
-"sai che Ã¨ censurata, o hai avuto connessione fallita alla rete Tor scegli "
-"\"SI\". Tu prenderai la [Elusione](/[Elusione])schermata per configurare un "
-"diverso trasporto di connessione."
+"sai che la rete Ã¨ censurata, o la connessione alla rete Tor Ã¨ fallita, "
+"scegli \"SI\". Sarai reindirizzato alla schermata "
+"[Elusione](/it/circumvention) per configurare una via di connessione "
+"differente (pluggable transport)."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -655,11 +657,11 @@ msgid ""
 " a proxy, click âContinueâ."
 msgstr ""
 "La schermata seguente vi domanderÃ  se la vostra connessione utilizza un "
-"proxy. Nella maggior parte dei casi questo non Ã¨ necessario. Voi saprete di "
-"sicuro se rispondere \"SÃ¬\", in quanto sono gli stessi parametri utilizzati "
-"dagli altri browser internet sul vostro sistema. Se possibile, contattate il"
-" vostro amministratore di sistema per informazioni. Se la vostra connessione"
-" non usa proxy cliccate \"Continua\"."
+"proxy. Nella maggior parte dei casi questo non Ã¨ necessario. Dovreste sapere"
+" se rispondere \"SÃ¬\", in quanto sono gli stessi parametri utilizzati dagli "
+"altri browser internet sul vostro sistema. Se possibile, contattate il "
+"vostro amministratore di sistema per informazioni. Se la vostra connessione "
+"non usa proxy cliccate \"Continua\"."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -674,7 +676,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.title)
 msgid "CIRCUMVENTION"
-msgstr "elusione"
+msgstr "ELUSIONE"
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.description)
@@ -702,7 +704,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid "### TYPES OF PLUGGABLE TRANSPORT"
-msgstr

[tor-commits] [snowflake/master] Touched up snowflake client tests

2019-12-06 Thread cohosh

commit 0f99c5ab12edfaac2e95d5d403297cd26d6229bc
Author: Cecylia Bocovich 
Date:   Tue Nov 26 15:04:48 2019 -0500

Touched up snowflake client tests

There were a few tests that needed refreshing since the introduction of
the pion library. Also added a few tests for the ICE server parsing
function in the client.
---
 client/client_test.go  | 59 ++
 client/lib/lib_test.go | 38 +---
 client/snowflake.go|  1 +
 3 files changed, 90 insertions(+), 8 deletions(-)

diff --git a/client/client_test.go b/client/client_test.go
new file mode 100644
index 000..aeaf979
--- /dev/null
+++ b/client/client_test.go
@@ -0,0 +1,59 @@
+package main
+
+import (
+   "testing"
+
+   . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestICEServerParser(t *testing.T) {
+   Convey("Test parsing of ICE servers", t, func() {
+   for _, test := range []struct {
+   input  string
+   urls   [][]string
+   length int
+   }{
+   {
+   "",
+   nil,
+   0,
+   },
+   {
+   " ",
+   nil,
+   0,
+   },
+   {
+   "stun:stun.l.google.com:19302",
+   
[][]string{[]string{"stun:stun.l.google.com:19302"}},
+   1,
+   },
+   {
+   "stun:stun.l.google.com:19302,stun.ekiga.net",
+   
[][]string{[]string{"stun:stun.l.google.com:19302"}, 
[]string{"stun.ekiga.net"}},
+   2,
+   },
+   {
+   "stun:stun.l.google.com:19302, stun.ekiga.net",
+   
[][]string{[]string{"stun:stun.l.google.com:19302"}, 
[]string{"stun.ekiga.net"}},
+   2,
+   },
+   } {
+   servers := parseIceServers(test.input)
+
+   if test.urls == nil {
+   So(servers, ShouldBeNil)
+   } else {
+   So(servers, ShouldNotBeNil)
+   }
+
+   So(len(servers), ShouldEqual, test.length)
+
+   for i, server := range servers {
+   So(server.URLs, ShouldResemble, test.urls[i])
+   }
+
+   }
+
+   })
+}
diff --git a/client/lib/lib_test.go b/client/lib/lib_test.go
index 4e9e2c7..12368f3 100644
--- a/client/lib/lib_test.go
+++ b/client/lib/lib_test.go
@@ -6,6 +6,7 @@ import (
"io/ioutil"
"net"
"net/http"
+   "sync"
"testing"
 
"github.com/pion/webrtc"
@@ -72,6 +73,10 @@ func (f FakePeers) Collect() (Snowflake, error) { return 
{}, nil }
 func (f FakePeers) Pop() Snowflake  { return nil }
 func (f FakePeers) Melted() <-chan struct{} { return nil }
 
+const sampleSDP = `"v=0\r\no=- 4358805017720277108 2 IN IP4 
8.8.8.8\r\ns=-\r\nt=0 0\r\na=group:BUNDLE data\r\na=msid-semantic: 
WMS\r\nm=application 56688 DTLS/SCTP 5000\r\nc=IN IP4 
8.8.8.8\r\na=candidate:3769337065 1 udp 2122260223 8.8.8.8 56688 typ host 
generation 0 network-id 1 network-cost 50\r\na=candidate:2921887769 1 tcp 
1518280447 8.8.8.8 35441 typ host tcptype passive generation 0 network-id 1 
network-cost 
50\r\na=ice-ufrag:aMAZ\r\na=ice-pwd:jcHb08Jjgrazp2dzjdrvPPvV\r\na=ice-options:trickle\r\na=fingerprint:sha-256
 
C8:88:EE:B9:E7:02:2E:21:37:ED:7A:D1:EB:2B:A3:15:A2:3B:5B:1C:3D:D4:D5:1F:06:CF:52:40:03:F8:DD:66\r\na=setup:actpass\r\na=mid:data\r\na=sctpmap:5000
 webrtc-datachannel 1024\r\n"`
+
+const sampleAnswer = `{"type":"answer","sdp":` + sampleSDP + `}`
+
 func TestSnowflakeClient(t *testing.T) {
 
Convey("Peers", t, func() {
@@ -219,23 +224,40 @@ func TestSnowflakeClient(t *testing.T) {
c.answerChannel = make(chan 
*webrtc.SessionDescription, 1)
 
c.config = {}
-   c.preparePeerConnection()
+   c.pc, _ = webrtc.NewPeerConnection(*c.config)
+   offer, _ := c.pc.CreateOffer(nil)
+   err := c.pc.SetLocalDescription(offer)
+   So(err, ShouldBeNil)
 
c.offerChannel <- nil
-   answer := deserializeSessionDescription(
-   `{"type":"answer","sdp":""}`)
+   answer :=

[tor-commits] [snowflake/master] Increased test coverage for messages library

2019-12-06 Thread cohosh

commit 3bdcc3408ea2e5946dd27699e0f77e3f0f3816b2
Author: Cecylia Bocovich 
Date:   Wed Nov 27 10:55:48 2019 -0500

Increased test coverage for messages library
---
 common/messages/proxy_test.go | 57 +++
 1 file changed, 57 insertions(+)

diff --git a/common/messages/proxy_test.go b/common/messages/proxy_test.go
index 6783874..1570d4f 100644
--- a/common/messages/proxy_test.go
+++ b/common/messages/proxy_test.go
@@ -82,6 +82,57 @@ func TestEncodeProxyPollRequests(t *testing.T) {
})
 }
 
+func TestDecodeProxyPollResponse(t *testing.T) {
+   Convey("Context", t, func() {
+   for _, test := range []struct {
+   offer string
+   data  string
+   err   error
+   }{
+   {
+   "fake offer",
+   `{"Status":"client match","Offer":"fake 
offer"}`,
+   nil,
+   },
+   {
+   "",
+   `{"Status":"no match"}`,
+   nil,
+   },
+   {
+   "",
+   `{"Status":"client match"}`,
+   fmt.Errorf("no supplied offer"),
+   },
+   {
+   "",
+   `{"Test":"test"}`,
+   fmt.Errorf(""),
+   },
+   } {
+   offer, err := DecodePollResponse([]byte(test.data))
+   So(offer, ShouldResemble, test.offer)
+   So(err, ShouldHaveSameTypeAs, test.err)
+   }
+
+   })
+}
+
+func TestEncodeProxyPollResponse(t *testing.T) {
+   Convey("Context", t, func() {
+   b, err := EncodePollResponse("fake offer", true)
+   So(err, ShouldEqual, nil)
+   offer, err := DecodePollResponse(b)
+   So(offer, ShouldEqual, "fake offer")
+   So(err, ShouldEqual, nil)
+
+   b, err = EncodePollResponse("", false)
+   So(err, ShouldEqual, nil)
+   offer, err = DecodePollResponse(b)
+   So(offer, ShouldEqual, "")
+   So(err, ShouldEqual, nil)
+   })
+}
 func TestDecodeProxyAnswerRequest(t *testing.T) {
Convey("Context", t, func() {
for _, test := range []struct {
@@ -173,5 +224,11 @@ func TestEncodeProxyAnswerResponse(t *testing.T) {
success, err := DecodeAnswerResponse(b)
So(success, ShouldEqual, true)
So(err, ShouldEqual, nil)
+
+   b, err = EncodeAnswerResponse(false)
+   So(err, ShouldEqual, nil)
+   success, err = DecodeAnswerResponse(b)
+   So(success, ShouldEqual, false)
+   So(err, ShouldEqual, nil)
})
 }

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

[tor-commits] [snowflake/master] Expanded snowflake server tests

2019-12-06 Thread cohosh

commit dabdd847cefa0988af14584d98965c5af838325e
Author: Cecylia Bocovich 
Date:   Tue Nov 26 11:45:34 2019 -0500

Expanded snowflake server tests

Now tests the proxy and initServer functionalities. The tests use the
same websocket library as the server and proxy-go implementations.
---
 server/server_test.go | 176 +++---
 1 file changed, 139 insertions(+), 37 deletions(-)

diff --git a/server/server_test.go b/server/server_test.go
index 84ac7ba..7a72014 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -2,48 +2,150 @@ package main
 
 import (
"net"
+   "net/http"
"strconv"
"testing"
+
+   
"git.torproject.org/pluggable-transports/snowflake.git/common/websocketconn"
+   "github.com/gorilla/websocket"
+   . "github.com/smartystreets/goconvey/convey"
 )
 
 func TestClientAddr(t *testing.T) {
-   // good tests
-   for _, test := range []struct {
-   inputstring
-   expected net.IP
-   }{
-   {"1.2.3.4", net.ParseIP("1.2.3.4")},
-   {"1:2::3:4", net.ParseIP("1:2::3:4")},
-   } {
-   useraddr := clientAddr(test.input)
-   host, port, err := net.SplitHostPort(useraddr)
-   if err != nil {
-   t.Errorf("clientAddr(%q) â SplitHostPort error %v", 
test.input, err)
-   continue
-   }
-   if !test.expected.Equal(net.ParseIP(host)) {
-   t.Errorf("clientAddr(%q) â host %q, not %v", 
test.input, host, test.expected)
-   }
-   portNo, err := strconv.Atoi(port)
-   if err != nil {
-   t.Errorf("clientAddr(%q) â port %q", test.input, port)
-   continue
-   }
-   if portNo == 0 {
-   t.Errorf("clientAddr(%q) â port %d", test.input, 
portNo)
+   Convey("Testing clientAddr", t, func() {
+   // good tests
+   for _, test := range []struct {
+   inputstring
+   expected net.IP
+   }{
+   {"1.2.3.4", net.ParseIP("1.2.3.4")},
+   {"1:2::3:4", net.ParseIP("1:2::3:4")},
+   } {
+   useraddr := clientAddr(test.input)
+   host, port, err := net.SplitHostPort(useraddr)
+   if err != nil {
+   t.Errorf("clientAddr(%q) â SplitHostPort 
error %v", test.input, err)
+   continue
+   }
+   if !test.expected.Equal(net.ParseIP(host)) {
+   t.Errorf("clientAddr(%q) â host %q, not %v", 
test.input, host, test.expected)
+   }
+   portNo, err := strconv.Atoi(port)
+   if err != nil {
+   t.Errorf("clientAddr(%q) â port %q", 
test.input, port)
+   continue
+   }
+   if portNo == 0 {
+   t.Errorf("clientAddr(%q) â port %d", 
test.input, portNo)
+   }
}
-   }
-
-   // bad tests
-   for _, input := range []string{
-   "",
-   "abc",
-   "1.2.3.4.5",
-   "[12::34]",
-   } {
-   useraddr := clientAddr(input)
-   if useraddr != "" {
-   t.Errorf("clientAddr(%q) â %q, not %q", input, 
useraddr, "")
+
+   // bad tests
+   for _, input := range []string{
+   "",
+   "abc",
+   "1.2.3.4.5",
+   "[12::34]",
+   } {
+   useraddr := clientAddr(input)
+   if useraddr != "" {
+   t.Errorf("clientAddr(%q) â %q, not %q", 
input, useraddr, "")
+   }
}
-   }
+   })
+}
+
+type StubHandler struct{}
+
+func (handler *StubHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+   ws, _ := upgrader.Upgrade(w, r, nil)
+
+   conn := websocketconn.NewWebSocketConn(ws)
+   defer conn.Close()
+
+   //dial stub OR
+   or, _ := net.DialTCP("tcp", nil, {IP: 
net.ParseIP("localhost"), Port: 8889})
+
+   proxy(or, )
+}
+
+func Test(t *testing.T) {
+   Convey("Websocket server", t, func() {
+   //Set up the snowflake web server
+   ipStr, portStr, _ := net.SplitHostPort(":")
+   port, _ := strconv.ParseUint(portStr, 10, 16)
+   addr := {IP: net.ParseIP(ipStr), Port: int(port)}
+   Convey("We don't listen on port 0", func() {
+   addr = {IP: net.ParseIP(ipStr), Port: 0}

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

2019-12-06 Thread translation

commit cc8634ac99f6daca02e5a520f326a69c943bcd0f
Author: Translation commit bot 
Date:   Fri Dec 6 13:53:48 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+is.po | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/contents+is.po b/contents+is.po
index 269202e6b3..28dc2deeff 100644
--- a/contents+is.po
+++ b/contents+is.po
@@ -9105,6 +9105,9 @@ msgid ""
 "Click the âTorâ button to see what data is visible to observers when 
you're "
 "using Tor. The button will turn green to indicate that Tor is on."
 msgstr ""
+"Smelltu Ã¡ âTorâ-hnappinn til aÃ° sjÃ¡ hvaÃ°a gÃ¶gn eru sÃ½nileg 
eftirlitsaÃ°ilum "
+"Ã¾egar Ã¾Ãº ert aÃ° nota Tor. Hnappurinn verÃ°ur grÃ¦nn til aÃ° gefa til 
kynna aÃ° "
+"kveikt sÃ© Ã¡ Tor."
 
 #: lego/templates/secure-connections.html:5
 #: templates/secure-connections.html:5
@@ -9112,6 +9115,9 @@ msgid ""
 "Click the âHTTPSâ button to see what data is visible to observers when "
 "you're using HTTPS. The button will turn green to indicate that HTTPS is on."
 msgstr ""
+"Smelltu Ã¡ ââHTTPSââ-hnappinn til aÃ° sjÃ¡ hvaÃ°a gÃ¶gn eru sÃ½nileg "
+"eftirlitsaÃ°ilum Ã¾egar Ã¾Ãº ert aÃ° nota HTTPS. Hnappurinn verÃ°ur grÃ¦nn 
til aÃ° "
+"gefa til kynna aÃ° HTTPS sÃ© virkt."
 
 #: lego/templates/secure-connections.html:6
 #: templates/secure-connections.html:6
@@ -9119,6 +9125,8 @@ msgid ""
 "When both buttons are green, you see the data that is visible to observers "
 "when you are using both tools."
 msgstr ""
+"Ãegar bÃ¡Ã°ir hnapparnir eru grÃ¦nir, sÃ©rÃ°u gÃ¶gnin sem eru sÃ½nileg 
milliliÃ°um "
+"Ã¾egar Ã¾Ãº notar bÃ¦Ã°i Ã¾essi verkfÃ¦ri."
 
 #: lego/templates/secure-connections.html:7
 #: templates/secure-connections.html:7
@@ -9126,6 +9134,8 @@ msgid ""
 "When both buttons are grey, you see the data that is visible to observers "
 "when you don't use either tool."
 msgstr ""
+"Ãegar bÃ¡Ã°ir hnapparnir eru grÃ¡ir, sÃ©rÃ°u gÃ¶gnin sem eru sÃ½nileg 
milliliÃ°um "
+"Ã¾egar Ã¾Ãº notar hvorugt Ã¾essara verkfÃ¦ra."
 
 #: lego/templates/secure-connections.html:15
 #: lego/templates/secure-connections.html:65

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

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

2019-12-06 Thread translation

commit cf6d0bea340db18b98bc69e0f3195c7229a92ff5
Author: Translation commit bot 
Date:   Fri Dec 6 13:53:16 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
---
 contents+is.po | 45 +
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/contents+is.po b/contents+is.po
index 66fb64f506..4357b015ef 100644
--- a/contents+is.po
+++ b/contents+is.po
@@ -594,6 +594,12 @@ msgid ""
 "It not only protected people's identity online but also allowed them to "
 "access critical resources, social media, and websites which were blocked."
 msgstr ""
+"MeÃ° Ã¾vÃ aÃ° Tor-vafrinn hafÃ°i gert Tor aÃ°gengilegra fyrir venjulega "
+"netnotendur og aÃ°gerÃ°asinna, Ã¾Ã¡ verÃ°ur Tor mikilvÃ¦gt verkfÃ¦ri Ã¾egar "
+"[arabÃska voriÃ°](https://en.wikipedia.org/wiki/Arab_Spring) hÃ³fst sÃÃ°ari 
"
+"hluta Ã¡rs 2010. Ekki aÃ°eins sÃ¡ Tor um aÃ° vernda auÃ°kenni fÃ³lks Ã¡ 
netinu, "
+"heldur veitti Ã¾eim aÃ°gang aÃ° mikilvÃ¦gum upplÃ½singum, samfÃ©lagsmiÃ°lum 
og "
+"vefsvÃ¦Ã°um sem lokaÃ° hafÃ°i veriÃ° Ã¡."
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -603,6 +609,10 @@ msgid ""
 "2013](https://www.theguardian.com/world/interactive/2013/nov/01/snowden-nsa-;
 "files-surveillance-revelations-decoded#section/1)."
 msgstr ""
+"ÃÃ¶rfin fyrir verkfÃ¦ri sem vernda gegn fjÃ¶ldaeftirliti varÃ° sÃÃ°an 
augljÃ³s "
+"eftir [uppljÃ³stranir Snowdens Ã¡riÃ° "
+"2013](https://www.theguardian.com/world/interactive/2013/nov/01/snowden-nsa-;
+"files-surveillance-revelations-decoded#section/1)."
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -857,24 +867,34 @@ msgid ""
 "Click the âTorâ button to see what data is visible to observers when 
you're "
 "using Tor. The button will turn green to indicate that Tor is on."
 msgstr ""
+"Smelltu Ã¡ âTorâ-hnappinn til aÃ° sjÃ¡ hvaÃ°a gÃ¶gn eru sÃ½nileg 
eftirlitsaÃ°ilum "
+"Ã¾egar Ã¾Ãº ert aÃ° nota Tor. Hnappurinn verÃ°ur grÃ¦nn til aÃ° gefa til 
kynna aÃ° "
+"kveikt sÃ© Ã¡ Tor."
 
 #: lego/templates/secure-connections.html:5
 msgid ""
 "Click the âHTTPSâ button to see what data is visible to observers when "
 "you're using HTTPS. The button will turn green to indicate that HTTPS is on."
 msgstr ""
+"Smelltu Ã¡ ââHTTPSââ-hnappinn til aÃ° sjÃ¡ hvaÃ°a gÃ¶gn eru sÃ½nileg "
+"eftirlitsaÃ°ilum Ã¾egar Ã¾Ãº ert aÃ° nota HTTPS. Hnappurinn verÃ°ur grÃ¦nn 
til aÃ° "
+"gefa til kynna aÃ° HTTPS sÃ© virkt."
 
 #: lego/templates/secure-connections.html:6
 msgid ""
 "When both buttons are green, you see the data that is visible to observers "
 "when you are using both tools."
 msgstr ""
+"Ãegar bÃ¡Ã°ir hnapparnir eru grÃ¦nir, sÃ©rÃ°u gÃ¶gnin sem eru sÃ½nileg 
milliliÃ°um "
+"Ã¾egar Ã¾Ãº notar bÃ¦Ã°i Ã¾essi verkfÃ¦ri."
 
 #: lego/templates/secure-connections.html:7
 msgid ""
 "When both buttons are grey, you see the data that is visible to observers "
 "when you don't use either tool."
 msgstr ""
+"Ãegar bÃ¡Ã°ir hnapparnir eru grÃ¡ir, sÃ©rÃ°u gÃ¶gnin sem eru sÃ½nileg 
milliliÃ°um "
+"Ã¾egar Ã¾Ãº notar hvorugt Ã¾essara verkfÃ¦ra."
 
 #: lego/templates/secure-connections.html:11
 msgid "HTTPS"
@@ -1036,10 +1056,14 @@ msgid ""
 "infrastructure, please email tor-secur...@lists.torproject.org. If you've "
 "found a security bug in Tor or Tor Browser, feel free to submit it for our"
 msgstr ""
+"Ef Ã¾Ãº hefur fundiÃ° Ã¶ryggisvandamÃ¡l Ã einhverju verkefnanna okkar eÃ°a "
+"stoÃ°kerfunum, skaltu endilega senda tÃ¶lvupÃ³st Ã¡ tor-"
+"secur...@lists.torproject.org. Ef Ã¾Ãº hefur fundiÃ° Ã¶ryggisvandamÃ¡l Ã Tor 
eÃ°a "
+"Tor-vafranum, Ã¾Ã¡ mÃ¡ttu alveg senda Ã¾aÃ° inn Ã"
 
 #: templates/contact.html:80
 msgid "bug bounty program."
-msgstr ""
+msgstr "villuveiÃ°iverÃ°launasamkeppnina (bug bounty program) okkar."
 
 #: templates/contact.html:80
 msgid ""
@@ -1062,6 +1086,11 @@ msgid ""
 "email frontd...@torproject.org. For donor-related questions, contact "
 "giv...@torproject.org"
 msgstr ""
+"Fyrir spurningar og athugasemdir varÃ°andi Tor-sjÃ¡lfseignarstofnunina: "
+"spurningar varÃ°andi notkun vÃ¶rumerkja, aÃ°ild aÃ° samtÃ¶kunum og samstarf, "
+"fyrirspurnir um tengiliÃ°i o.s.frv, sendu tÃ¶lvupÃ³st Ã¡ "
+"frontd...@rt.torproject.org. Fyrir spurningar tengdar fjÃ¡rframlÃ¶gum, hafÃ°u 
"
+"samband viÃ° giv...@torproject.org"
 
 #: templates/contact.html:107
 msgid "Send us Mail"
@@ -1098,27 +1127,27 @@ msgstr "TungumÃ¡l"
 
 #: templates/download-languages.html:12 templates/download-options.html:12
 msgid "Windows"
-msgstr ""
+msgstr "Windows"
 
 #: templates/download-languages.html:13
 msgid "macOS"
-msgstr ""
+msgstr "macOS"
 
 #: templates/download-languages.html:14 templates/download-options.html:14
 msgid "GNU/Linux"
-msgstr ""
+msgstr "GNU/Linux"
 
 #: templates/download-options.html:13
 msgid "MacOS"
-msgstr ""
+msgstr "MacOS"
 
 #: templates/download-options.html:43
 msgid "Tor Browser for Android Alpha"
-msgstr ""

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

2019-12-06 Thread translation

commit f193f774f732c785f6e1506d5fe7a364012230ce
Author: Translation commit bot 
Date:   Fri Dec 6 13:50:00 2019 +

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

diff --git a/contents+is.po b/contents+is.po
index 128046152f..cdec3a77a7 100644
--- a/contents+is.po
+++ b/contents+is.po
@@ -1,6 +1,6 @@
 # Translators:
-# Sveinn Ã Felli , 2019
 # erinm, 2019
+# Sveinn Ã Felli , 2019
 # 
 msgid ""
 msgstr ""
@@ -8,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-29 10:58+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: erinm, 2019\n"
+"Last-Translator: Sveinn Ã Felli , 2019\n"
 "Language-Team: Icelandic (https://www.transifex.com/otf/teams/1519/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2248,7 +2248,7 @@ msgstr ""
 #: lego/templates/banner.html:3 lego/templates/banner.html:5
 #: templates/banner.html:3 templates/banner.html:5
 msgid "Close banner"
-msgstr ""
+msgstr "Loka borÃ°a"
 
 #: lego/templates/banner.html:11 templates/banner.html:11
 msgid "Tracking, surveillance, and censorship are widespread online."
@@ -2256,7 +2256,7 @@ msgstr "Eftirlit, ritskoÃ°un og njÃ³snir er Ãºtbreiddar 
hÃ¦ttur Ã¡ internetinu."
 
 #: lego/templates/banner.html:20 templates/banner.html:20
 msgid "TAKE BACK THE INTERNET WITH TOR"
-msgstr ""
+msgstr "TÃKUM INTERNETIÃ TIL BAKA MEÃ TOR"
 
 #: lego/templates/banner.html:33 lego/templates/banner.html:35
 #: templates/banner.html:33 templates/banner.html:35
@@ -2358,6 +2358,9 @@ msgid ""
 "Click the âTorâ button to see what data is visible to observers when 
you're "
 "using Tor. The button will turn green to indicate that Tor is on."
 msgstr ""
+"Smelltu Ã¡ âTorâ-hnappinn til aÃ° sjÃ¡ hvaÃ°a gÃ¶gn eru sÃ½nileg 
eftirlitsaÃ°ilum "
+"Ã¾egar Ã¾Ãº ert aÃ° nota Tor. Hnappurinn verÃ°ur grÃ¦nn til aÃ° gefa til 
kynna aÃ° "
+"kveikt sÃ© Ã¡ Tor."
 
 #: lego/templates/secure-connections.html:5
 #: templates/secure-connections.html:5
@@ -2365,6 +2368,9 @@ msgid ""
 "Click the âHTTPSâ button to see what data is visible to observers when "
 "you're using HTTPS. The button will turn green to indicate that HTTPS is on."
 msgstr ""
+"Smelltu Ã¡ ââHTTPSââ-hnappinn til aÃ° sjÃ¡ hvaÃ°a gÃ¶gn eru sÃ½nileg "
+"eftirlitsaÃ°ilum Ã¾egar Ã¾Ãº ert aÃ° nota HTTPS. Hnappurinn verÃ°ur grÃ¦nn 
til aÃ° "
+"gefa til kynna aÃ° HTTPS sÃ© virkt."
 
 #: lego/templates/secure-connections.html:6
 #: templates/secure-connections.html:6
@@ -2372,6 +2378,8 @@ msgid ""
 "When both buttons are green, you see the data that is visible to observers "
 "when you are using both tools."
 msgstr ""
+"Ãegar bÃ¡Ã°ir hnapparnir eru grÃ¦nir, sÃ©rÃ°u gÃ¶gnin sem eru sÃ½nileg 
milliliÃ°um "
+"Ã¾egar Ã¾Ãº notar bÃ¦Ã°i Ã¾essi verkfÃ¦ri."
 
 #: lego/templates/secure-connections.html:7
 #: templates/secure-connections.html:7
@@ -2379,6 +2387,8 @@ msgid ""
 "When both buttons are grey, you see the data that is visible to observers "
 "when you don't use either tool."
 msgstr ""
+"Ãegar bÃ¡Ã°ir hnapparnir eru grÃ¡ir, sÃ©rÃ°u gÃ¶gnin sem eru sÃ½nileg 
milliliÃ°um "
+"Ã¾egar Ã¾Ãº notar hvorugt Ã¾essara verkfÃ¦ra."
 
 #: lego/templates/secure-connections.html:11
 #: templates/secure-connections.html:11
@@ -2394,7 +2404,7 @@ msgstr "tor"
 #: lego/templates/secure-connections.html:32
 #: templates/secure-connections.html:32
 msgid "POTENTIALLY VISIBLE DATA"
-msgstr ""
+msgstr "MÃGULEGA SÃNILEG GÃGN"
 
 #: lego/templates/secure-connections.html:37
 #: templates/secure-connections.html:37

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

[tor-commits] [styleguide/master] Add svg for TBA icons

2019-12-06 Thread antonela

commit 3cdf3b7b0f93503f9601943bc9a76ea37ac296db
Author: Antonela 
Date:   Fri Dec 6 10:31:18 2019 -0300

Add svg for TBA icons
---
 assets/static/images/tor-browser-android/alpha.svg | 40 
 .../static/images/tor-browser-android/nightly.svg  | 37 +++
 .../static/images/tor-browser-android/stable.svg   | 43 ++
 3 files changed, 120 insertions(+)

diff --git a/assets/static/images/tor-browser-android/alpha.svg 
b/assets/static/images/tor-browser-android/alpha.svg
new file mode 100644
index 000..8f44f94
--- /dev/null
+++ b/assets/static/images/tor-browser-android/alpha.svg
@@ -0,0 +1,40 @@
+
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+
+alpha
+Created with Sketch.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/assets/static/images/tor-browser-android/nightly.svg 
b/assets/static/images/tor-browser-android/nightly.svg
new file mode 100644
index 000..eb5ff0d
--- /dev/null
+++ b/assets/static/images/tor-browser-android/nightly.svg
@@ -0,0 +1,37 @@
+
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+
+nightly
+Created with Sketch.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/assets/static/images/tor-browser-android/stable.svg 
b/assets/static/images/tor-browser-android/stable.svg
new file mode 100644
index 000..53bc0b9
--- /dev/null
+++ b/assets/static/images/tor-browser-android/stable.svg
@@ -0,0 +1,43 @@
+
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+
+stable
+Created with Sketch.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web

2019-12-06 Thread translation

commit 86280a6f1aad75477724c7ba8c8702076d6bd7e7
Author: Translation commit bot 
Date:   Fri Dec 6 13:23:02 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
---
 contents+is.po | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/contents+is.po b/contents+is.po
index 02fee4113b..66fb64f506 100644
--- a/contents+is.po
+++ b/contents+is.po
@@ -1,7 +1,7 @@
 # Translators:
 # erinm, 2019
-# Sveinn Ã Felli , 2019
 # Emma Peel, 2019
+# Sveinn Ã Felli , 2019
 # 
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-15 12:00+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Sveinn Ã Felli , 2019\n"
 "Language-Team: Icelandic (https://www.transifex.com/otf/teams/1519/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -146,7 +146,7 @@ msgstr "Styrkja nÃºna"
 #: https//www.torproject.org/about/trademark/
 #: (content/about/trademark/contents+en.lrtrademark.title)
 msgid "Trademark"
-msgstr ""
+msgstr "VÃ¶rumerki"
 
 #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body)
 msgid "Community"
@@ -763,7 +763,7 @@ msgstr "Algengar spurningar varÃ°andi vÃ¶rumerkiÃ° Tor"
 #: lego/templates/banner.html:2 lego/templates/banner.html:4
 #: templates/banner.html:2 templates/banner.html:4
 msgid "Close banner"
-msgstr ""
+msgstr "Loka borÃ°a"
 
 #: lego/templates/banner.html:10 templates/banner.html:10
 msgid "Tracking, surveillance, and censorship are widespread online."
@@ -771,7 +771,7 @@ msgstr "Eftirlit, ritskoÃ°un og njÃ³snir er Ãºtbreiddar 
hÃ¦ttur Ã¡ internetinu."
 
 #: lego/templates/banner.html:14 templates/banner.html:14
 msgid "TAKE BACK THE INTERNET WITH TOR"
-msgstr ""
+msgstr "TÃKUM INTERNETIÃ TIL BAKA MEÃ TOR"
 
 #: lego/templates/banner.html:18 templates/banner.html:18
 msgid "DONATE NOW"
@@ -887,7 +887,7 @@ msgstr "tor"
 
 #: lego/templates/secure-connections.html:32
 msgid "POTENTIALLY VISIBLE DATA"
-msgstr ""
+msgstr "MÃGULEGA SÃNILEG GÃGN"
 
 #: lego/templates/secure-connections.html:37
 msgid "Site.com"
@@ -1047,6 +1047,9 @@ msgid ""
 "list by contacting tor-security-send...@lists.torproject.org or from pool"
 ".sks-keyservers.net. Here is the fingerprint:"
 msgstr ""
+"Ef Ã¾Ãº vilt dulrita pÃ³stinn Ã¾inn, geturÃ°u nÃ¡lgast GPG-dreifilykil 
pÃ³stlistans"
+" meÃ° Ã¾vÃ aÃ° hafa samband viÃ° tor-security-send...@lists.torproject.org 
eÃ°a "
+"fengiÃ° hann af pool.sks-keyservers.net. HÃ©r er fingrafariÃ°:"
 
 #: templates/contact.html:100
 msgid "Email us"

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

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

2019-12-06 Thread translation

commit 1fb697c8b6716f79d9ffcad17cd1d5dbd6ed9805
Author: Translation commit bot 
Date:   Fri Dec 6 13:23:34 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+is.po | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/contents+is.po b/contents+is.po
index 2758953c9c..269202e6b3 100644
--- a/contents+is.po
+++ b/contents+is.po
@@ -5885,6 +5885,9 @@ msgid ""
 "list by contacting tor-security-send...@lists.torproject.org or from pool"
 ".sks-keyservers.net. Here is the fingerprint:"
 msgstr ""
+"Ef Ã¾Ãº vilt dulrita pÃ³stinn Ã¾inn, geturÃ°u nÃ¡lgast GPG-dreifilykil 
pÃ³stlistans"
+" meÃ° Ã¾vÃ aÃ° hafa samband viÃ° tor-security-send...@lists.torproject.org 
eÃ°a "
+"fengiÃ° hann af pool.sks-keyservers.net. HÃ©r er fingrafariÃ°:"
 
 #: https//support.torproject.org/misc/bug-or-feedback/
 #: (content/misc/bug-or-feedback/contents+en.lrquestion.description)
@@ -9002,7 +9005,7 @@ msgstr ""
 #: lego/templates/banner.html:2 lego/templates/banner.html:4
 #: templates/banner.html:2 templates/banner.html:4
 msgid "Close banner"
-msgstr ""
+msgstr "Loka borÃ°a"
 
 #: lego/templates/banner.html:10 templates/banner.html:10
 msgid "Tracking, surveillance, and censorship are widespread online."
@@ -9010,7 +9013,7 @@ msgstr "Eftirlit, ritskoÃ°un og njÃ³snir er Ãºtbreiddar 
hÃ¦ttur Ã¡ internetinu."
 
 #: lego/templates/banner.html:14 templates/banner.html:14
 msgid "TAKE BACK THE INTERNET WITH TOR"
-msgstr ""
+msgstr "TÃKUM INTERNETIÃ TIL BAKA MEÃ TOR"
 
 #: lego/templates/banner.html:18 templates/banner.html:18
 msgid "DONATE NOW"
@@ -9133,7 +9136,7 @@ msgstr "tor"
 #: lego/templates/secure-connections.html:32
 #: templates/secure-connections.html:32
 msgid "POTENTIALLY VISIBLE DATA"
-msgstr ""
+msgstr "MÃGULEGA SÃNILEG GÃGN"
 
 #: lego/templates/secure-connections.html:37
 #: templates/secure-connections.html:37

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

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

2019-12-06 Thread translation

commit f9e22bb9e0550185aa41b6b86619950830e53e1b
Author: Translation commit bot 
Date:   Fri Dec 6 13:21:24 2019 +


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

diff --git a/is/torbutton.dtd b/is/torbutton.dtd
index 6cc6b57d76..3f998e5c58 100644
--- a/is/torbutton.dtd
+++ b/is/torbutton.dtd
@@ -49,4 +49,4 @@
 
 
 
-
+

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

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

2019-12-06 Thread translation

commit 208bbb5f47a244fef17ac256fe860375039a41dc
Author: Translation commit bot 
Date:   Fri Dec 6 13:21:17 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties_completed
---
 is/torbutton.properties | 104 ++--
 1 file changed, 57 insertions(+), 47 deletions(-)

diff --git a/is/torbutton.properties b/is/torbutton.properties
index 410615df38..d83cae0ccf 100644
--- a/is/torbutton.properties
+++ b/is/torbutton.properties
@@ -1,60 +1,70 @@
-torbutton.circuit_display.internet = Internet
-torbutton.circuit_display.ip_unknown = ÃÃ¾ekkt IP-tala
-torbutton.circuit_display.onion_site = Onion-vefsvÃ¦Ã°i
-torbutton.circuit_display.this_browser = Ãessi vafri
-torbutton.circuit_display.relay = Relay
-torbutton.circuit_display.tor_bridge = BrÃº
-torbutton.circuit_display.unknown_country = ÃÃ¾ekkt land
-torbutton.circuit_display.guard = VÃ¶rÃ°ur (guard)
-torbutton.circuit_display.guard_note = VarÃ°arhnÃºturinn [Guard] breytist ekki 
endilega.
-torbutton.circuit_display.learn_more = LÃ¦ra meira
-torbutton.content_sizer.margin_tooltip = Tor-vafrinn setur inn Ã¾essa 
spÃ¡ssÃu til aÃ° gera hÃ¦Ã° og breidd gluggans minna einkennandi, og Ã¾ar meÃ° 
aÃ° gera erfiÃ°ara aÃ° fylgjast meÃ° Ã¾Ã©r Ã¡ netinu.
-torbutton.panel.tooltip.disabled = Smelltu til aÃ° virkja Tor
-torbutton.panel.tooltip.enabled = Smelltu til aÃ° afvirkja Tor
-torbutton.panel.label.disabled = Tor Ã³virkt
-torbutton.panel.label.enabled = Tor virkt
-extensions.torbut...@torproject.org.description = Torbutton ÃºtbÃ½r hnapp til 
uppsetningar Ã¡ stillingum Tor svo aÃ° einfalt og hraÃ°virkt sÃ© aÃ° hreinsa 
Ãºt Ã¶ll gÃ¶gn vegna einkavafurs.
-torbutton.popup.external.title = SÃ¦kja utanaÃ°komandi skrÃ¡artegund?
-torbutton.popup.external.app = Tor-vafrinn getur ekki birt Ã¾essa skrÃ¡. ÃÃº 
verÃ°ur aÃ° opna hana meÃ° Ã¶Ã°ru forriti.\n\n
-torbutton.popup.external.note = Sumar skrÃ¡artegundir geta lÃ¡tiÃ° forrit 
tengjast netinu Ã¡n Ã¾ess aÃ° fara Ã gegnum Tor.
-torbutton.popup.external.suggest = Til aÃ° vera Ã¶rugg(ur), Ã¦ttirÃ°u einungis 
aÃ° opna sÃ³ttar skrÃ¡r Ã¾egar netiÃ° er aftengt, eÃ°a meÃ° Ã¾vÃ aÃ° nota Tor 
Live CD keyrsludisk eins og Tails.\n
-torbutton.popup.launch = NÃ¡ Ã skrÃ¡
-torbutton.popup.cancel = HÃ¦tta viÃ°
-torbutton.popup.dontask = HlaÃ°a sjÃ¡lfkrafa inn skrÃ¡m hÃ©Ã°an Ã frÃ¡
-torbutton.popup.no_newnym = Torbutton getur ekki gefiÃ° Ã¾Ã©r nÃ½tt Ã¶ruggt 
auÃ°kenni. Hann er ekki meÃ° aÃ°gang aÃ° Tor-stÃ½rigÃ¡ttinni.\n\nErt Ã¾Ãº aÃ° 
keyra Tor-vafravÃ¶ndulinn (browser bundle)?
-torbutton.security_settings.menu.title = Ãryggisstillingar
-torbutton.title.prompt_torbrowser = MikilvÃ¦gar upplÃ½singar um Tor-hnappinn
-torbutton.popup.prompt_torbrowser = Torbutton-hnappurinn virkar nÃºna 
Ã¶Ã°ruvÃsi en Ã¡Ã°ur: ekki er lengur hÃ¦gt aÃ° slÃ¶kkva Ã¡ honum.\n\nViÃ° 
gerÃ°um Ã¾essa breytingu Ã¾vÃ Ã¾aÃ° er ekki Ã¶ruggt aÃ° nota Torbutton Ã 
vafra sem einnig er notaÃ°ur fyrir vafur Ã¡n Tor. ÃaÃ° voru allt of margar 
veilur sem ekki var hÃ¦gt aÃ° laga Ã¡ neinn annan hÃ¡tt.\n\nEf Ã¾ig langar til 
aÃ° halda Ã¡fram aÃ° nota Firefox eins og venjulega, Ã¾Ã¡ Ã¦ttirÃ°u aÃ° henda 
Torbutton Ãºt og nÃ¡ Ã¾Ã©r frekar Ã Tor-vafravÃ¶ndulinn (browser bundle). 
Gagnaverndareiginleikar Tor-vafrans eru lÃka mikiÃ° betri en Ã Firefox, 
jafnvel Ã¾egar Firefox er notaÃ°ur meÃ° Torbutton.\n\nTil aÃ° fjarlÃ¦gja 
Torbutton, farÃ°u Ã¾Ã¡ Ã VerkfÃ¦ri->ViÃ°bÃ¦tur->ViÃ°bÃ¦tur (enska: 
Tools->Addons->Extensions og smelltu Ã¡ fjarlÃ¦gingarhnappinn nÃ¦st 
Torbutton-fÃ¦rslunni.
-torbutton.popup.short_torbrowser = MikilvÃ¦gar upplÃ½singar um 
Tor-hnappinn!\n\nTor-hnappurinn er nÃºna alltaf virkur.\n\nSmelltu Ã¡ 
Tor-hnappinn til aÃ° sjÃ¡ nÃ¡nar.
+# torbutton.circuit_display.internet = Internet
+# torbutton.circuit_display.ip_unknown = IP unknown
+# torbutton.circuit_display.onion_site = Onion site
+# torbutton.circuit_display.this_browser = This browser
+# torbutton.circuit_display.relay = Relay
+# torbutton.circuit_display.tor_bridge = Bridge
+# torbutton.circuit_display.unknown_country = Unknown country
+# torbutton.circuit_display.guard = Guard
+# torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+# torbutton.circuit_display.learn_more = Learn more
+# torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to 
make the width and height of your window less distinctive, and thus reduces the 
ability of people to track you online.
+# torbutton.panel.tooltip.disabled = Click to enable Tor
+# torbutton.panel.tooltip.enabled = Click to disable Tor
+# torbutton.panel.label.disabled = Tor Disabled
+# torbutton.panel.label.enabled = Tor Enabled
+# extensions.torbut...@torproject.org.description = Torbutton provides a 
button to configure Tor settings and quickly and easily clear private browsing 
data.
+# torbutton.popup.external.title = Download an external file type?
+# torbutton.popup.external.app = Tor Browser cannot display this file. You 
will need to

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

2019-12-06 Thread translation

commit 4ac26f2157a6953d908d2d08ff4c6ff4edebbfde
Author: Translation commit bot 
Date:   Fri Dec 6 13:21:12 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
---
 is/torbutton.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/is/torbutton.properties b/is/torbutton.properties
index e17ffaef8a..d29cb71156 100644
--- a/is/torbutton.properties
+++ b/is/torbutton.properties
@@ -61,10 +61,10 @@ pageInfo_OnionEncryption=DulrituÃ° tenging 
(Onion-Ã¾jÃ³nusta)
 
 # Onion services strings.  Strings are kept here for ease of translation.
 # LOCALIZATION NOTE: %S will be replaced with the .onion address.
-onionServices.clientAuthMissing=Tor onion service missing client authorization
-onionServices.authPrompt.description=%S is requesting your private key.
-onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion 
service
+onionServices.clientAuthMissing=Tor onion-Ã¾jÃ³nustu vantar auÃ°kenningu frÃ¡ 
biÃ°laraforriti
+onionServices.authPrompt.description=%S er aÃ° biÃ°ja um einkalykilinn Ã¾inn.
+onionServices.authPrompt.keyPlaceholder=Settu inn einkalykilinn Ã¾inn fyrir 
Ã¾essa onion-Ã¾jÃ³nustu
 onionServices.authPrompt.done=LokiÃ°
 onionServices.authPrompt.doneAccessKey=d
-onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 
characters or 44 base64 characters)
-onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key
+onionServices.authPrompt.invalidKey=Settu inn gildan lykil (52 base32 stafir 
eÃ°a 44 base64 stafir)
+onionServices.authPrompt.failedToSetKey=Tekst ekki aÃ° setja upp Tor meÃ° 
lyklinum Ã¾Ãnum.

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

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

2019-12-06 Thread translation

commit 24d2e903799d2ea55a6efa4c9eefad2c44bd1659
Author: Translation commit bot 
Date:   Fri Dec 6 13:17:12 2019 +


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

diff --git a/is/messages.json b/is/messages.json
index 8547306fac..7c53a337fb 100644
--- a/is/messages.json
+++ b/is/messages.json
@@ -33,7 +33,7 @@
 "message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\; 
data-msgid=\"__MSG_docWiki__\">documentation wiki."
   },
   "docWiki": {
-"message": "documentation wiki"
+"message": "wiki-vefur meÃ° hjÃ¡lparskjÃ¶lum"
   },
   "browser": {
 "message": "Vafri"
@@ -69,7 +69,7 @@
 "message": "Please try to be as descriptive as possible with your ticket 
and if possible include log messages that will help us reproduce the bug. 
Consider adding keywords snowflake-webextension or 
snowflake-client to let us know how which part of the Snowflake system 
is experiencing problems."
   },
   "embed": {
-"message": "Embed"
+"message": "Ãvefja"
   },
   "possible": {
 "message": "NÃºna er einfalt aÃ° birta Snowflake-merki Ã¡ hvaÃ°a 
vefsvÃ¦Ã°i sem er:"

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

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

2019-12-06 Thread translation

commit 4d0d695217457f574ec46f1df0ecd1fb3f391f7d
Author: Translation commit bot 
Date:   Fri Dec 6 11:23:09 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
---
 contents+pt-BR.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 132b13cd5f..2042065275 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -14,7 +14,7 @@
 # m tk, 2019
 # Alexei GonÃ§alves de Oliveira , 2019
 # Communia , 2019
-# Chacal E., 2019
+# C. E., 2019
 # blueboy, 2019
 # Eduardo Addad de Oliveira , 2019
 # 

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

2019-12-06 Thread translation

commit 7ed2a843f514a0c5342ec266591d1668707c7746
Author: Translation commit bot 
Date:   Fri Dec 6 11:20:17 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
---
 contents+pt-BR.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index c26f6fa5bd..1a31b35f8f 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -5,7 +5,7 @@
 # erinm, 2019
 # blueboy, 2019
 # Anderson Santos , 2019
-# Chacal E., 2019
+# C. E., 2019
 # Eduardo Addad de Oliveira , 2019
 # m tk, 2019
 # Caio Volpato , 2019

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

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

2019-12-06 Thread translation

commit e1edec5f1af3487289c3d2d60bbffcb3f797863f
Author: Translation commit bot 
Date:   Fri Dec 6 11:18:37 2019 +

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

diff --git a/pt_BR.po b/pt_BR.po
index 297da586b6..be02f0ac00 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -6,8 +6,8 @@
 # Alexei GonÃ§alves de Oliveira , 2018
 # Communia , 2013-2018
 # carlo giusepe tadei valente sasaki , 2014
-# Chacal E., 2019
-# Chacal E., 2019
+# C. E., 2019
+# C. E., 2019
 # Danton Medrado, 2015
 # d fau , 2019
 # Eduardo Addad de Oliveira , 2018-2019

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

[tor-commits] [metrics-web/master] Update news.json to version 356 of doc/MetricsTimeline.

2019-12-06 Thread karsten

commit 36db10088331b7522e76f51e5e16793a5af32706
Author: Karsten Loesing 
Date:   Fri Dec 6 11:56:21 2019 +0100

Update news.json to version 356 of doc/MetricsTimeline.
---
 src/main/resources/web/json/news.json | 49 +++
 1 file changed, 49 insertions(+)

diff --git a/src/main/resources/web/json/news.json 
b/src/main/resources/web/json/news.json
index 1c07ca4..8f0a4ae 100644
--- a/src/main/resources/web/json/news.json
+++ b/src/main/resources/web/json/news.json
@@ -3959,6 +3959,55 @@
 "target" : "https://bugs.torproject.org/32129#comment:5;
   } ]
 }, {
+  "start" : "2019-11-13",
+  "protocols" : [ "snowflake" ],
+  "short_description" : "Restarted the broker with a new proxyâbroker 
protocol.",
+  "description" : "Restarted the broker with a new proxybroker 
protocol.",
+  "links" : [ {
+"label" : "comment",
+"target" : "https://bugs.torproject.org/29207#comment:31;
+  } ]
+}, {
+  "start" : "2019-11-13",
+  "protocols" : [ "snowflake" ],
+  "short_description" : "Released version 0.1.0 of the Snowflake extension for 
Firefox and Chrome, using a new proxyâbroker protocol.",
+  "description" : "Released version 0.1.0 of the Snowflake extension for 
Firefox and Chrome, using a new proxybroker protocol.",
+  "links" : [ {
+"label" : "comment",
+"target" : "https://bugs.torproject.org/29207#comment:32;
+  } ]
+}, {
+  "start" : "2019-11-14",
+  "protocols" : [ "snowflake" ],
+  "short_description" : "Deployed webext-0.1.0 of the Snowflake proxy",
+  "description" : "Deployed webext-0.1.0 of the Snowflake proxy (which uses a 
new proxybroker protocol) to snowflake.torproject.org.",
+  "links" : [ {
+"label" : "comment",
+"target" : "https://bugs.torproject.org/29207#comment:34;
+  } ]
+}, {
+  "start" : "2019-11-14",
+  "protocols" : [ "snowflake", "ipv6" ],
+  "short_description" : "Changed DNS to point to the IPv6-enabled Snowflake 
broker.",
+  "description" : "Changed DNS to point to the IPv6-enabled Snowflake broker.",
+  "links" : [ {
+"label" : "comment",
+"target" : "https://bugs.torproject.org/29258#comment:16;
+  } ]
+}, {
+  "start" : "2019-11-16",
+  "end" : "2019-11-23",
+  "places" : [ "ir" ],
+  "short_description" : "Internet blackout in Iran.",
+  "description" : "Internet blackout in Iran.",
+  "links" : [ {
+"label" : "report",
+"target" : "https://ooni.org/post/2019-iran-internet-blackout/;
+  }, {
+"label" : "NTC thread",
+"target" : "https://ntc.party/t/a-new-kind-of-censoship-in-iran/237;
+  } ]
+}, {
   "start" : "2014-06-01",
   "end" : "2014-06-19",
   "places" : [ "ru" ],

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

[tor-commits] [onionoo/master] Bump version to 7.0-1.23.0-dev.

2019-12-06 Thread karsten

commit a1ee6e9cffafb30f43bf0e615ea316e4a8affc02
Author: Karsten Loesing 
Date:   Fri Dec 6 11:39:49 2019 +0100

Bump version to 7.0-1.23.0-dev.
---
 CHANGELOG.md | 3 +++
 build.xml| 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a635f4..d34453a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# Changes in version 7.0-1.2?.? - 20??-??-??
+
+
 # Changes in version 7.0-1.23.0 - 2019-12-06
 
  * Medium changes
diff --git a/build.xml b/build.xml
index 85212e5..c8e336a 100644
--- a/build.xml
+++ b/build.xml
@@ -11,7 +11,7 @@
   
   
   
+value="${onionoo.protocol.version}-1.23.0-dev"/>
   
   
   https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [onionoo/release] Only write changed status and document files.

2019-12-06 Thread karsten

commit 4b7b13d37d2423f9b1dee865e203a524b8df488b
Author: Karsten Loesing 
Date:   Thu Dec 5 17:03:02 2019 +0100

Only write changed status and document files.

Fixes #32660.
---
 CHANGELOG.md   |  4 
 .../metrics/onionoo/docs/DocumentStore.java| 22 ++
 2 files changed, 26 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6060551..cd27f30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changes in version 7.0-1.2?.? - 2019-1?-??
 
+ * Medium changes
+   - Only write status files and document files if their content has
+ changed.
+
 
 # Changes in version 7.0-1.22.0 - 2019-11-28
 
diff --git 
a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java 
b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java
index 81b428a..ea7786e 100644
--- a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java
+++ b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java
@@ -8,6 +8,7 @@ import org.torproject.metrics.onionoo.util.FormattingUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import org.apache.commons.codec.digest.DigestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -20,7 +21,9 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -59,6 +62,10 @@ public class DocumentStore {
 
   private long storedBytes = 0L;
 
+  private long unchangedFiles = 0L;
+
+  private long unchangedBytes = 0L;
+
   private long retrievedFiles = 0L;
 
   private long retrievedBytes = 0L;
@@ -351,6 +358,17 @@ public class DocumentStore {
 documentString.length());
   }
   documentFile.getParentFile().mkdirs();
+  if (documentFile.exists()) {
+try (InputStream stream = Files.newInputStream(documentFile.toPath())) 
{
+  String existingFileDigest = DigestUtils.sha256Hex(stream);
+  String newFileDigest = DigestUtils.sha256Hex(documentString);
+  if (existingFileDigest.equals(newFileDigest)) {
+this.unchangedFiles++;
+this.unchangedBytes += documentString.length();
+return true;
+  }
+}
+  }
   File documentTempFile = new File(
   documentFile.getAbsolutePath() + ".tmp");
   writeToFile(documentTempFile, documentString);
@@ -820,6 +838,8 @@ public class DocumentStore {
 + "%s files listed\n"
 + "%s files stored\n"
 + "%s stored\n"
++ "%s files not rewritten\n"
++ "%s not rewritten\n"
 + "%s files retrieved\n"
 + "%s retrieved\n"
 + "%s files removed\n",
@@ -827,6 +847,8 @@ public class DocumentStore {
 FormattingUtils.formatDecimalNumber(listedFiles),
 FormattingUtils.formatDecimalNumber(storedFiles),
 FormattingUtils.formatBytes(storedBytes),
+FormattingUtils.formatDecimalNumber(unchangedFiles),
+FormattingUtils.formatBytes(unchangedBytes),
 FormattingUtils.formatDecimalNumber(retrievedFiles),
 FormattingUtils.formatBytes(retrievedBytes),
 FormattingUtils.formatDecimalNumber(removedFiles));



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

[tor-commits] [onionoo/release] Bump version to 7.0-1.22.0-dev.

2019-12-06 Thread karsten

commit d541382053582f32758c9773659aac468a574cbc
Author: Karsten Loesing 
Date:   Thu Nov 28 10:19:43 2019 +0100

Bump version to 7.0-1.22.0-dev.
---
 CHANGELOG.md | 3 +++
 build.xml| 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5683ca..6060551 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# Changes in version 7.0-1.2?.? - 2019-1?-??
+
+
 # Changes in version 7.0-1.22.0 - 2019-11-28
 
  * Medium changes
diff --git a/build.xml b/build.xml
index a0c856d..c3c8838 100644
--- a/build.xml
+++ b/build.xml
@@ -11,7 +11,7 @@
   
   
   
+value="${onionoo.protocol.version}-1.22.0-dev"/>
   
   
   https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [onionoo/master] Only write changed status and document files.

2019-12-06 Thread karsten

commit 4b7b13d37d2423f9b1dee865e203a524b8df488b
Author: Karsten Loesing 
Date:   Thu Dec 5 17:03:02 2019 +0100

Only write changed status and document files.

Fixes #32660.
---
 CHANGELOG.md   |  4 
 .../metrics/onionoo/docs/DocumentStore.java| 22 ++
 2 files changed, 26 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6060551..cd27f30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changes in version 7.0-1.2?.? - 2019-1?-??
 
+ * Medium changes
+   - Only write status files and document files if their content has
+ changed.
+
 
 # Changes in version 7.0-1.22.0 - 2019-11-28
 
diff --git 
a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java 
b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java
index 81b428a..ea7786e 100644
--- a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java
+++ b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java
@@ -8,6 +8,7 @@ import org.torproject.metrics.onionoo.util.FormattingUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import org.apache.commons.codec.digest.DigestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -20,7 +21,9 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -59,6 +62,10 @@ public class DocumentStore {
 
   private long storedBytes = 0L;
 
+  private long unchangedFiles = 0L;
+
+  private long unchangedBytes = 0L;
+
   private long retrievedFiles = 0L;
 
   private long retrievedBytes = 0L;
@@ -351,6 +358,17 @@ public class DocumentStore {
 documentString.length());
   }
   documentFile.getParentFile().mkdirs();
+  if (documentFile.exists()) {
+try (InputStream stream = Files.newInputStream(documentFile.toPath())) 
{
+  String existingFileDigest = DigestUtils.sha256Hex(stream);
+  String newFileDigest = DigestUtils.sha256Hex(documentString);
+  if (existingFileDigest.equals(newFileDigest)) {
+this.unchangedFiles++;
+this.unchangedBytes += documentString.length();
+return true;
+  }
+}
+  }
   File documentTempFile = new File(
   documentFile.getAbsolutePath() + ".tmp");
   writeToFile(documentTempFile, documentString);
@@ -820,6 +838,8 @@ public class DocumentStore {
 + "%s files listed\n"
 + "%s files stored\n"
 + "%s stored\n"
++ "%s files not rewritten\n"
++ "%s not rewritten\n"
 + "%s files retrieved\n"
 + "%s retrieved\n"
 + "%s files removed\n",
@@ -827,6 +847,8 @@ public class DocumentStore {
 FormattingUtils.formatDecimalNumber(listedFiles),
 FormattingUtils.formatDecimalNumber(storedFiles),
 FormattingUtils.formatBytes(storedBytes),
+FormattingUtils.formatDecimalNumber(unchangedFiles),
+FormattingUtils.formatBytes(unchangedBytes),
 FormattingUtils.formatDecimalNumber(retrievedFiles),
 FormattingUtils.formatBytes(retrievedBytes),
 FormattingUtils.formatDecimalNumber(removedFiles));



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

[tor-commits] [onionoo/master] Prepare for 7.0-1.23.0 release.

2019-12-06 Thread karsten

commit 596f2cbf732d6b0cbcda22e26809c3038137d1cd
Author: Karsten Loesing 
Date:   Fri Dec 6 08:48:51 2019 +0100

Prepare for 7.0-1.23.0 release.
---
 CHANGELOG.md | 2 +-
 build.xml| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd27f30..0a635f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changes in version 7.0-1.2?.? - 2019-1?-??
+# Changes in version 7.0-1.23.0 - 2019-12-06
 
  * Medium changes
- Only write status files and document files if their content has
diff --git a/build.xml b/build.xml
index c3c8838..85212e5 100644
--- a/build.xml
+++ b/build.xml
@@ -11,7 +11,7 @@
   
   
   
+value="${onionoo.protocol.version}-1.23.0"/>
   
   
   https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [onionoo/release] Prepare for 7.0-1.23.0 release.

2019-12-06 Thread karsten

commit 596f2cbf732d6b0cbcda22e26809c3038137d1cd
Author: Karsten Loesing 
Date:   Fri Dec 6 08:48:51 2019 +0100

Prepare for 7.0-1.23.0 release.
---
 CHANGELOG.md | 2 +-
 build.xml| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd27f30..0a635f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changes in version 7.0-1.2?.? - 2019-1?-??
+# Changes in version 7.0-1.23.0 - 2019-12-06
 
  * Medium changes
- Only write status files and document files if their content has
diff --git a/build.xml b/build.xml
index c3c8838..85212e5 100644
--- a/build.xml
+++ b/build.xml
@@ -11,7 +11,7 @@
   
   
   
+value="${onionoo.protocol.version}-1.23.0"/>
   
   
   https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2019-12-06 Thread translation

commit dbd906d65183ee0ce3db7266eb8ed529d81d030b
Author: Translation commit bot 
Date:   Fri Dec 6 09:50:19 2019 +

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

diff --git a/contents+hu.po b/contents+hu.po
index bd9f98c2b6..7563c205c0 100644
--- a/contents+hu.po
+++ b/contents+hu.po
@@ -3,6 +3,7 @@
 # IstvÃ¡n DÃ¡vid , 2019
 # vargaviktor , 2019
 # erinm, 2019
+# David Webb, 2019
 # 
 msgid ""
 msgstr ""
@@ -10,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-29 10:58+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: erinm, 2019\n"
+"Last-Translator: David Webb, 2019\n"
 "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -157,7 +158,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 msgid "Installation"
-msgstr ""
+msgstr "TelepÃtÃ©s"
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)

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

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

2019-12-06 Thread translation

commit 14fb7057a981d6f8ac47de93d95e0f648ba3e5d6
Author: Translation commit bot 
Date:   Fri Dec 6 09:47:16 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+pt_PT.po | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/code_of_conduct+pt_PT.po b/code_of_conduct+pt_PT.po
index 334458a159..3e76a67d6e 100644
--- a/code_of_conduct+pt_PT.po
+++ b/code_of_conduct+pt_PT.po
@@ -7,6 +7,7 @@
 # Translators:
 # A Russo , 2019
 # Manuela Silva , 2019
+# t g , 2019
 # 
 #, fuzzy
 msgid ""
@@ -14,7 +15,7 @@ msgstr ""
 "Project-Id-Version: Code of conduct of the Tor Project\n"
 "POT-Creation-Date: 2019-08-02 12:00+\n"
 "PO-Revision-Date: 2019-08-27 18:54+\n"
-"Last-Translator: Manuela Silva , 2019\n"
+"Last-Translator: t g , 2019\n"
 "Language-Team: Portuguese (Portugal) 
(https://www.transifex.com/otf/teams/1519/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,6 +85,13 @@ msgid ""
 "values. We understand that keeping a living document relevant and 
âpatchedâ "
 "involves sustained effort."
 msgstr ""
+"Este cÃ³digo de conduta nÃ£o Ã© exaustivo nem estÃ¡ completo. Ã um esforÃ§o "
+"contÃnuo para sumarizar o entendimento comum. Queremos prover um ambiente "
+"acolhedor e seguro, de maneira a trabalharmos juntos na busca de soluÃ§Ãµes "
+"poderosas. Reservamo-nos o direito de desvio da aplicaÃ§Ã£o deste cÃ³digo de "
+"forma estrita. Qualquer desvio deve produzir um resultado mais justo e "
+"alinhado com os nossos valores. Compreendemos que manter um documento activo"
+" relevante e \"remendado\" envolve um esforÃ§o sustentado."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:26
@@ -129,7 +137,7 @@ msgstr ""
 #: ../code_of_conduct.txt:38
 #, no-wrap
 msgid "  DO: Yield the floor. Listen. Make sure everyone gets heard.\n"
-msgstr ""
+msgstr "FAZ: DÃ¡ espaÃ§o. Ouve. Garante que todos sÃ£o ouvidos.\n"
 
 #. type: Plain text
 #: ../code_of_conduct.txt:40
@@ -165,6 +173,9 @@ msgid ""
 "questions or concerns. Public key:\n"
 "
https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact\n;
 msgstr ""
+"E FAZ: Escreve avidamente para: tor-community-coun...@lists.torproject.org 
com\n"
+"questÃµes ou preocupaÃ§Ãµes. Chave pÃºblica:\n"
+"https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact\n;
 
 #. type: Plain text
 #: ../code_of_conduct.txt:53

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

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

2019-12-06 Thread translation

commit ba4e9dce5decb48b3c0830d2195e1dea8aaf7496
Author: Translation commit bot 
Date:   Fri Dec 6 08:53:37 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+fa.po | 23 +++
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/contents+fa.po b/contents+fa.po
index 6d1bd7aa6d..46547a9c70 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -8,9 +8,9 @@
 # Goudarz Jafari , 2019
 # magnifico, 2019
 # b0b47d46632b78a09a40de799fda9a65, 2019
-# Emma Peel, 2019
 # Samaneh M , 2019
 # MYZJ, 2019
+# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
@@ -18,7 +18,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-14 16:04+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: MYZJ, 2019\n"
+"Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -4559,24 +4559,7 @@ msgstr ""
 #: (content/operators/offline-ed25519/contents+en.lrquestion.description)
 msgid "This feature is optional, you don't need to use it unless you want to."
 msgstr ""
-"Ø§ÛÙ ÙÛÚÚ¯Û Ø§Ø®ØªÛØ§Ø±Û Ø§Ø³Øª Ù Ø´ÙØ§ ÙÛâØªÙØ§ÙÛØ¯ Ø§Ú¯Ø± 
Ø¨Ø®ÙØ§ÙÛØ¯ Ø§Ø² Ø¢Ù Ø§Ø³ØªÙØ§Ø¯Ù Ú©ÙÛØ¯.\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-" "
+"Ø§ÛÙ ÙÛÚÚ¯Û Ø§Ø®ØªÛØ§Ø±Û Ø§Ø³Øª Ù Ø´ÙØ§ ÙÛâØªÙØ§ÙÛØ¯ Ø§Ú¯Ø± 
Ø¨Ø®ÙØ§ÙÛØ¯ Ø§Ø² Ø¢Ù Ø§Ø³ØªÙØ§Ø¯Ù Ú©ÙÛØ¯. "
 
 #: https//support.torproject.org/operators/offline-ed25519/
 #: (content/operators/offline-ed25519/contents+en.lrquestion.description)

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

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

2019-12-06 Thread translation

commit 802ca4307fedf1ad67c9073b70dd3a1cea7493cc
Author: Translation commit bot 
Date:   Fri Dec 6 08:23:31 2019 +

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

diff --git a/contents+fa.po b/contents+fa.po
index 0deb9ddc87..6d1bd7aa6d 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -1160,6 +1160,7 @@ msgstr ""
 msgid ""
 "gpg --auto-key-locate nodefault,wkd --locate-keys torbrow...@torproject.org"
 msgstr ""
+"gpg --auto-key-locate nodefault,wkd --locate-keys torbrow...@torproject.org"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)

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

78 matches

Mail list logo