[tor-commits] [tor-browser-build/master] Bump sandboxed-tor-browser version
commit 712991345d023d987631a35998df6cf8736b5a2e Author: Georg Koppen Date: Fri Sep 29 08:55:41 2017 + Bump sandboxed-tor-browser version This is mainly for shipping a new version right after release as our alpha release broke 0.0.13 (see: #23692). --- projects/sandbox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/sandbox/config b/projects/sandbox/config index f9b0f76..0a79ac9 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.0.13 +version: 0.0.14 git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser git_hash: 'sandboxed-tor-browser-[% c("version") %]' tag_gpg_id: 1 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed
commit 102b5047552f7e4ab29bbb63666f8b72d0932cc7 Author: Translation commit bot Date: Fri Sep 29 11:45:16 2017 + Update translations for bridgedb_completed --- ca/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/LC_MESSAGES/bridgedb.po b/ca/LC_MESSAGES/bridgedb.po index 3817ea55d..56279a65a 100644 --- a/ca/LC_MESSAGES/bridgedb.po +++ b/ca/LC_MESSAGES/bridgedb.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2017-09-23 19:18+\n" +"PO-Revision-Date: 2017-09-29 11:35+\n" "Last-Translator: laia_\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit 31511cc1e49f11990de03ea073f9e759d0334f6b Author: Translation commit bot Date: Fri Sep 29 11:45:07 2017 + Update translations for bridgedb --- ca/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/LC_MESSAGES/bridgedb.po b/ca/LC_MESSAGES/bridgedb.po index 3817ea55d..56279a65a 100644 --- a/ca/LC_MESSAGES/bridgedb.po +++ b/ca/LC_MESSAGES/bridgedb.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2017-09-23 19:18+\n" +"PO-Revision-Date: 2017-09-29 11:35+\n" "Last-Translator: laia_\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Update tor browser sandbox version to 0.0.14
commit b12dbb9bf1af1aaf53fbcb9f137e18435a0bff51 Author: Nicolas Vigier Date: Fri Sep 29 14:02:44 2017 +0200 Update tor browser sandbox version to 0.0.14 --- include/versions.wmi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/versions.wmi b/include/versions.wmi index 28b623c7..403c1c72 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -25,7 +25,7 @@ 2017-09-28 7.5a5 2017-09-29 -0.0.13 +0.0.14 ../dist/torbrowser//tor-win32-.zip ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc] Update translations for tails-misc
commit 9ab474260e77f508eed0d894c341ea2509d9c2b3 Author: Translation commit bot Date: Fri Sep 29 12:47:10 2017 + Update translations for tails-misc --- fi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi.po b/fi.po index 95c4fe010..2b8a36b4b 100644 --- a/fi.po +++ b/fi.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-09-23 19:05+\n" +"PO-Revision-Date: 2017-09-29 12:46+\n" "Last-Translator: carolyn \n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit 2490b80677ce8a9e3e4e7eb45c860509559db402 Author: Translation commit bot Date: Fri Sep 29 13:15:06 2017 + Update translations for bridgedb --- he/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/he/LC_MESSAGES/bridgedb.po b/he/LC_MESSAGES/bridgedb.po index e3dba646d..301162608 100644 --- a/he/LC_MESSAGES/bridgedb.po +++ b/he/LC_MESSAGES/bridgedb.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2017-09-28 23:51+\n" +"PO-Revision-Date: 2017-09-29 13:02+\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" @@ -182,7 +182,7 @@ msgstr "×× × ××שר×× ×©××:" msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "×ר×ת ×××××ת ×ת××ר×ת. ×× × ×××! ×××× ××××¢×¨× ××× ×ש×××× ××××´× ××× × %s שע×ת. ×× ×ש××× ××××´× × ×סף ××××× ×¤×¨×§ ××× ×× ×××× ××תע×××ת ××רפת." +msgstr "×ר×ת ×××××ת ×קצ×. ×× × ×××! ×××× ××××¢×¨× ××× ××××´××× ××× %s שע×ת. ×× ×××××´××× ×× ×ספ×× ××××× ×¤×¨×§ ××× ×× ××תק×× ××תע×××ת." #: bridgedb/strings.py:50 msgid "" @@ -277,7 +277,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "××¨× × ×ספת ×ק×× ×¤×¨×× ×תקשר×ת ×©× ×שר×× ××× ×ש××× ××××´× ×-%s. ש××× ×× ×©×¢×××× ×ש××× ×ת ×××××´× ×××צע×ת ××× ××¡×¤×§× ×××××´× ××××× ××××:\n%s, %s ×× %s." +msgstr "××¨× × ×ספת ××ש×× ×שר×× ××× ×ש××× ××××´× ××%s. ×× × ×©×× ×× ×©××ª× ×××× ×ש××× ×ת ×××××´× ×¢\"× ×©×××ש ×××× ××¡×¤×§× ××××\"× ×××××:\n%s, %s ×× %s." #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/whisperback] Update translations for whisperback
commit 09693b65d06b160486ed7bd14fb776a151aaa696 Author: Translation commit bot Date: Fri Sep 29 13:15:27 2017 + Update translations for whisperback --- fi/fi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi/fi.po b/fi/fi.po index 3c6e1dba0..5db838393 100644 --- a/fi/fi.po +++ b/fi/fi.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+\n" -"PO-Revision-Date: 2017-09-23 18:51+\n" +"PO-Revision-Date: 2017-09-29 12:47+\n" "Last-Translator: carolyn \n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit 53743efba898604e85719f8f293b306acebe4ebe Author: Translation commit bot Date: Fri Sep 29 13:15:44 2017 + Update translations for https_everywhere --- ca/https-everywhere.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ca/https-everywhere.dtd b/ca/https-everywhere.dtd index 22afd3b5d..fc06a2e7c 100644 --- a/ca/https-everywhere.dtd +++ b/ca/https-everywhere.dtd @@ -12,10 +12,10 @@ - - + + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed
commit afb39270f4485791ff2a6d835bddca74e692b9f6 Author: Translation commit bot Date: Fri Sep 29 13:15:12 2017 + Update translations for bridgedb_completed --- he/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/he/LC_MESSAGES/bridgedb.po b/he/LC_MESSAGES/bridgedb.po index e3dba646d..301162608 100644 --- a/he/LC_MESSAGES/bridgedb.po +++ b/he/LC_MESSAGES/bridgedb.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2017-09-28 23:51+\n" +"PO-Revision-Date: 2017-09-29 13:02+\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" @@ -182,7 +182,7 @@ msgstr "×× × ××שר×× ×©××:" msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "×ר×ת ×××××ת ×ת××ר×ת. ×× × ×××! ×××× ××××¢×¨× ××× ×ש×××× ××××´× ××× × %s שע×ת. ×× ×ש××× ××××´× × ×סף ××××× ×¤×¨×§ ××× ×× ×××× ××תע×××ת ××רפת." +msgstr "×ר×ת ×××××ת ×קצ×. ×× × ×××! ×××× ××××¢×¨× ××× ××××´××× ××× %s שע×ת. ×× ×××××´××× ×× ×ספ×× ××××× ×¤×¨×§ ××× ×× ××תק×× ××תע×××ת." #: bridgedb/strings.py:50 msgid "" @@ -277,7 +277,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "××¨× × ×ספת ×ק×× ×¤×¨×× ×תקשר×ת ×©× ×שר×× ××× ×ש××× ××××´× ×-%s. ש××× ×× ×©×¢×××× ×ש××× ×ת ×××××´× ×××צע×ת ××× ××¡×¤×§× ×××××´× ××××× ××××:\n%s, %s ×× %s." +msgstr "××¨× × ×ספת ××ש×× ×שר×× ××× ×ש××× ××××´× ××%s. ×× × ×©×× ×× ×©××ª× ×××× ×ש××× ×ת ×××××´× ×¢\"× ×©×××ש ×××× ××¡×¤×§× ××××\"× ×××××:\n%s, %s ×× %s." #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup
commit 0ae9c36bca9208a92c68c215814099733c3d54a3 Author: Translation commit bot Date: Fri Sep 29 13:16:10 2017 + Update translations for tails-persistence-setup --- fi/fi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi/fi.po b/fi/fi.po index a814bec38..a726166b4 100644 --- a/fi/fi.po +++ b/fi/fi.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-09-23 18:48+\n" +"PO-Revision-Date: 2017-09-29 12:46+\n" "Last-Translator: carolyn \n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
commit c0fdfeea20d3680cbae8ec975e7fbfafb55ae880 Author: Translation commit bot Date: Fri Sep 29 13:18:55 2017 + Update translations for tails-openpgp-applet --- he/openpgp-applet.pot | 25 + 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/he/openpgp-applet.pot b/he/openpgp-applet.pot index 897cb1726..b3f571f2a 100644 --- a/he/openpgp-applet.pot +++ b/he/openpgp-applet.pot @@ -3,13 +3,14 @@ # This file is distributed under the same license as the OpenPGP_Applet package. # # Translators: +# ION, 2017 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: ta...@boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2017-09-28 21:53+\n" -"Last-Translator: Kunda\n" +"PO-Revision-Date: 2017-09-29 13:18+\n" +"Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -92,20 +93,20 @@ msgstr "×××עת ×צ××¢:" #: bin/openpgp-applet:436 msgid "User ID:" msgid_plural "User IDs:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "×××ת ×שת×ש:" +msgstr[1] "×××××ת ×שת×ש:" #: bin/openpgp-applet:465 msgid "None (Don't sign)" -msgstr "××£ ××× (×× ×ª×ת××)" +msgstr "×××× (×× ×ª×ת××)" #: bin/openpgp-applet:528 msgid "Select recipients:" -msgstr "××ר × ××¢× ××:" +msgstr "××ר ×ק××××:" #: bin/openpgp-applet:536 msgid "Hide recipients" -msgstr "×סתר × ××¢× ××" +msgstr "×סתר ×ק××××" #: bin/openpgp-applet:539 msgid "" @@ -115,7 +116,7 @@ msgstr "×סתר ×ת ×××××ת ××שת×ש×× ××× × ××¢× × ×××¡×¨× #: bin/openpgp-applet:545 msgid "Sign message as:" -msgstr "×ת×× ××××¢× ×ת×ר:" +msgstr "×ת×× ×¢× ××××¢× ×ת×ר:" #: bin/openpgp-applet:549 msgid "Choose keys" @@ -123,7 +124,7 @@ msgstr "××ר ×פת××ת" #: bin/openpgp-applet:589 msgid "Do you trust these keys?" -msgstr "××× ××ª× ×××× ××פת××ת ×××?" +msgstr "××× ××ª× ×××× ××פת××ת ×××?" #: bin/openpgp-applet:592 msgid "The following selected key is not fully trusted:" @@ -154,7 +155,7 @@ msgstr "××× ×פת××ת ×××× ××" #: bin/openpgp-applet:655 msgid "" "You need a private key to sign messages or a public key to encrypt messages." -msgstr "××× × × ×קק ×××¤×ª× ×¤×¨×× ×¢× ×× ×ª ××ת×× ×¢× ×סר×× ×× ×××¤×ª× ×¦××××¨× ×××¦×¤× ×ª ×סר××." +msgstr "××ª× ×¦×¨×× ××¤×ª× ×¤×¨×× ××× ××ת×× ×¢× ××××¢×ת ×× ××¤×ª× ×¦××××¨× ××× ××צפ×× ××××¢×ת." #: bin/openpgp-applet:783 msgid "GnuPG error" @@ -162,7 +163,7 @@ msgstr "ש×××ת GnuPG" #: bin/openpgp-applet:804 msgid "Therefore the operation cannot be performed." -msgstr "××× ×פע××× ×× × ××ª× ×ª ×××צ××¢." +msgstr "××× ×פע××× ××× × ××××× ××ת×צע." #: bin/openpgp-applet:854 msgid "GnuPG results" @@ -174,4 +175,4 @@ msgstr "פ×× ×©× GnuPG:" #: bin/openpgp-applet:885 msgid "Other messages provided by GnuPG:" -msgstr "××××¢×ת ××ר×ת ×שר ×ס×פק×ת ×¢× ××× GnuPG:" +msgstr "××××¢×ת ××ר×ת ××ס×פק×ת ×¢\"× GnuPG:" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
commit 419559477feee3c4ef0ccc6a8c4b374548a2927f Author: Translation commit bot Date: Fri Sep 29 13:19:20 2017 + Update translations for tails-onioncircuits_completed --- he/onioncircuits.pot | 87 1 file changed, 87 insertions(+) diff --git a/he/onioncircuits.pot b/he/onioncircuits.pot new file mode 100644 index 0..01da9f641 --- /dev/null +++ b/he/onioncircuits.pot @@ -0,0 +1,87 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# fishfurbanter , 2016 +# ION, 2017 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-08-03 13:00+\n" +"PO-Revision-Date: 2017-09-29 13:09+\n" +"Last-Translator: ION\n" +"Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: he\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../onioncircuits:81 +msgid "You are not connected to Tor yet..." +msgstr "××× × ××××ר ×¢××× ×× Tor..." + +#: ../onioncircuits:95 +msgid "Onion Circuits" +msgstr "××¢×× ×צ×" + +#: ../onioncircuits:125 +msgid "Circuit" +msgstr "××¢××" + +#: ../onioncircuits:126 +msgid "Status" +msgstr "××צ×" + +#: ../onioncircuits:142 +msgid "Click on a circuit for more detail about its Tor relays." +msgstr "×××¥ ×¢× ××¢×× ××¢×× ×¤×¨××× ××××ת ×××¡×¨× Tor ש××." + +#: ../onioncircuits:221 +msgid "The connection to Tor was lost..." +msgstr "×××××ר ×× Tor ×××..." + +#: ../onioncircuits:317 +msgid "..." +msgstr "..." + +#: ../onioncircuits:343 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" + +#: ../onioncircuits:554 +msgid "GeoIP database unavailable. No country information will be displayed." +msgstr "××¡× × ×ª×× ×× GeoIP ××× × ××××. ××××¢ ×¢× ×××× ×ת ×× ××צ×." + +#: ../onioncircuits:585 +#, c-format +msgid "%s (%s)" +msgstr "%s (%s)" + +#: ../onioncircuits:590 +#, c-format +msgid "%.2f Mb/s" +msgstr "%.2f ×\"×/ש" + +#: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594 +msgid "Unknown" +msgstr "×××ª× ××××¢" + +#: ../onioncircuits:607 +msgid "Fingerprint:" +msgstr "×××עת ×צ××¢:" + +#: ../onioncircuits:608 +msgid "Published:" +msgstr "פ×רס×:" + +#: ../onioncircuits:609 +msgid "IP:" +msgstr "IP:" + +#: ../onioncircuits:610 +msgid "Bandwidth:" +msgstr "ר××× ×¤×¡:" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-onioncircuits] Update translations for tails-onioncircuits
commit 226ecbfe98b4ebc1d776cf296ffc41f6fecbf902 Author: Translation commit bot Date: Fri Sep 29 13:19:14 2017 + Update translations for tails-onioncircuits --- he/onioncircuits.pot | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/he/onioncircuits.pot b/he/onioncircuits.pot index eeaaca7af..01da9f641 100644 --- a/he/onioncircuits.pot +++ b/he/onioncircuits.pot @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+\n" -"PO-Revision-Date: 2017-09-28 21:53+\n" +"PO-Revision-Date: 2017-09-29 13:09+\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" @@ -25,23 +25,23 @@ msgstr "××× × ××××ר ×¢××× ×× Tor..." #: ../onioncircuits:95 msgid "Onion Circuits" -msgstr "" +msgstr "××¢×× ×צ×" #: ../onioncircuits:125 msgid "Circuit" -msgstr "" +msgstr "××¢××" #: ../onioncircuits:126 msgid "Status" -msgstr "×צ×" +msgstr "××צ×" #: ../onioncircuits:142 msgid "Click on a circuit for more detail about its Tor relays." -msgstr "" +msgstr "×××¥ ×¢× ××¢×× ××¢×× ×¤×¨××× ××××ת ×××¡×¨× Tor ש××." #: ../onioncircuits:221 msgid "The connection to Tor was lost..." -msgstr "" +msgstr "×××××ר ×× Tor ×××..." #: ../onioncircuits:317 msgid "..." @@ -50,21 +50,21 @@ msgstr "..." #: ../onioncircuits:343 #, c-format msgid "%s: %s" -msgstr "" +msgstr "%s: %s" #: ../onioncircuits:554 msgid "GeoIP database unavailable. No country information will be displayed." -msgstr "" +msgstr "××¡× × ×ª×× ×× GeoIP ××× × ××××. ××××¢ ×¢× ×××× ×ת ×× ××צ×." #: ../onioncircuits:585 #, c-format msgid "%s (%s)" -msgstr "" +msgstr "%s (%s)" #: ../onioncircuits:590 #, c-format msgid "%.2f Mb/s" -msgstr "" +msgstr "%.2f ×\"×/ש" #: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594 msgid "Unknown" @@ -84,4 +84,4 @@ msgstr "IP:" #: ../onioncircuits:610 msgid "Bandwidth:" -msgstr "ר×××־פס:" +msgstr "ר××× ×¤×¡:" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit 0c858b3da8d8dd72d685b6a6c30f5926dd03ac2e Author: Translation commit bot Date: Fri Sep 29 13:45:50 2017 + Update translations for https_everywhere_completed --- ca/https-everywhere.dtd | 33 + 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/ca/https-everywhere.dtd b/ca/https-everywhere.dtd index 47e913083..cb0e1a375 100644 --- a/ca/https-everywhere.dtd +++ b/ca/https-everywhere.dtd @@ -2,42 +2,21 @@ - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - @@ -53,5 +32,3 @@ - - ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit 4c68b6909d678e206c04fc77ca984ca018b9b8b4 Author: Translation commit bot Date: Fri Sep 29 13:45:57 2017 + Update translations for liveusb-creator --- ca/ca.po | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ca/ca.po b/ca/ca.po index f5a2065db..f260f39db 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -6,6 +6,7 @@ # Albert , 2013 # Aleix Vidal i Gaya , 2014 # dartmalak , 2014 +# Ari Romero , 2017 # David Anglada , 2014 # F Xavier Castane , 2013 # Guillem Arias Fauste , 2015-2016 @@ -17,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-20 18:02+0200\n" -"PO-Revision-Date: 2017-09-23 18:36+\n" -"Last-Translator: carolyn \n" +"POT-Creation-Date: 2017-09-25 14:02+0200\n" +"PO-Revision-Date: 2017-09-29 13:16+\n" +"Last-Translator: Ari Romero \n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -330,7 +331,7 @@ msgstr "" #: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7 msgid "Install" -msgstr "" +msgstr "Instal·lar" #: ../tails_installer/gui.py:465 #, python-format ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-brandproperties] Update translations for torbutton-brandproperties
commit 73679003b69bf95c82b92b38583eb84ed64973a1 Author: Translation commit bot Date: Fri Sep 29 13:47:31 2017 + Update translations for torbutton-brandproperties --- he/brand.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/he/brand.properties b/he/brand.properties index f66d87613..baf4637ff 100644 --- a/he/brand.properties +++ b/he/brand.properties @@ -5,10 +5,10 @@ brandShorterName=×פ××¤× Tor brandShortName=×פ××¤× Tor brandFullName=×פ××¤× Tor -vendorShortName=פר×××§× Tor +vendorShortName=×××× Tor homePageSingleStartMain=Firefox Start, ××£ ××ת ×××ר ×¢× ××פ×ש ×××× × -homePageImport=××× ×ת ××£ ×××ת ש×× ×ת×× %S +homePageImport=×××× ×ת ××£ ×××ת ש×× ×-%S homePageMigrationPageTitle=×××רת ××£ ××ת homePageMigrationDescription=×× × ××ר ×ת ××£ ×××ת ש×רצ×× × ××שת×ש ××: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed
commit 2f4f6b43ee983238c47c65d4c7216e7a972ccc4e Author: Translation commit bot Date: Fri Sep 29 13:47:38 2017 + Update translations for torbutton-brandproperties_completed --- he/brand.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/he/brand.properties b/he/brand.properties index f66d87613..baf4637ff 100644 --- a/he/brand.properties +++ b/he/brand.properties @@ -5,10 +5,10 @@ brandShorterName=×פ××¤× Tor brandShortName=×פ××¤× Tor brandFullName=×פ××¤× Tor -vendorShortName=פר×××§× Tor +vendorShortName=×××× Tor homePageSingleStartMain=Firefox Start, ××£ ××ת ×××ר ×¢× ××פ×ש ×××× × -homePageImport=××× ×ת ××£ ×××ת ש×× ×ת×× %S +homePageImport=×××× ×ת ××£ ×××ת ש×× ×-%S homePageMigrationPageTitle=×××רת ××£ ××ת homePageMigrationDescription=×× × ××ר ×ת ××£ ×××ת ש×רצ×× × ××שת×ש ××: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-branddtd] Update translations for torbutton-branddtd
commit b5e18dbf0929449b29659727e003dc810984c343 Author: Translation commit bot Date: Fri Sep 29 13:47:44 2017 + Update translations for torbutton-branddtd --- he/brand.dtd | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/he/brand.dtd b/he/brand.dtd index bf25cd550..e58bb4d3a 100644 --- a/he/brand.dtd +++ b/he/brand.dtd @@ -5,11 +5,11 @@ - + - - - + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-branddtd_completed] Update translations for torbutton-branddtd_completed
commit e4707bb8fa2656539ae42863e5e48c1e7c92 Author: Translation commit bot Date: Fri Sep 29 13:47:50 2017 + Update translations for torbutton-branddtd_completed --- he/brand.dtd | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/he/brand.dtd b/he/brand.dtd index bf25cd550..e58bb4d3a 100644 --- a/he/brand.dtd +++ b/he/brand.dtd @@ -5,11 +5,11 @@ - + - - - + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
commit 7df1402bdf215b8b541ef2486d95c50363c4afec Author: Translation commit bot Date: Fri Sep 29 13:48:01 2017 + Update translations for torbutton-torbuttondtd --- he/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/torbutton.dtd b/he/torbutton.dtd index dc737c3db..a4b653672 100644 --- a/he/torbutton.dtd +++ b/he/torbutton.dtd @@ -38,7 +38,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
commit 4d75b247019a75a496b21b07b02fbb0420eee355 Author: Translation commit bot Date: Fri Sep 29 13:48:45 2017 + Update translations for torbutton-aboutdialogdtd --- he/aboutdialog.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/aboutdialog.dtd b/he/aboutdialog.dtd index cd81cc666..6633db23c 100644 --- a/he/aboutdialog.dtd +++ b/he/aboutdialog.dtd @@ -1,4 +1,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed
commit aedb248f663e07ee85b6ea88425fec3d04cd0bb1 Author: Translation commit bot Date: Fri Sep 29 13:48:50 2017 + Update translations for torbutton-aboutdialogdtd_completed --- he/aboutdialog.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/aboutdialog.dtd b/he/aboutdialog.dtd index cd81cc666..6633db23c 100644 --- a/he/aboutdialog.dtd +++ b/he/aboutdialog.dtd @@ -1,4 +1,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
commit edb0e6da8d9e6f99ae232f037a64b5651c777887 Author: Translation commit bot Date: Fri Sep 29 13:49:11 2017 + Update translations for tails-openpgp-applet_completed --- he/openpgp-applet.pot | 178 ++ 1 file changed, 178 insertions(+) diff --git a/he/openpgp-applet.pot b/he/openpgp-applet.pot new file mode 100644 index 0..2be0d415a --- /dev/null +++ b/he/openpgp-applet.pot @@ -0,0 +1,178 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the OpenPGP_Applet package. +# +# Translators: +# ION, 2017 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: ta...@boum.org\n" +"POT-Creation-Date: 2017-08-05 15:07-0400\n" +"PO-Revision-Date: 2017-09-29 13:40+\n" +"Last-Translator: ION\n" +"Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: he\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: bin/openpgp-applet:160 +msgid "You are about to exit OpenPGP Applet. Are you sure?" +msgstr "××ª× ×¢××× ×צ×ת ×××ש×××× OpenPGP. ××× ××ª× ××××?" + +#: bin/openpgp-applet:172 +msgid "OpenPGP encryption applet" +msgstr "××ש×××× ××¦×¤× ×ª OpenPGP" + +#: bin/openpgp-applet:175 +msgid "Exit" +msgstr "×צ×××" + +#: bin/openpgp-applet:177 +msgid "About" +msgstr "××××ת" + +#: bin/openpgp-applet:232 +msgid "Encrypt Clipboard with _Passphrase" +msgstr "××¦×¤× ××× ××¢×רת ××××× ×¡×ס××" + +#: bin/openpgp-applet:235 +msgid "Sign/Encrypt Clipboard with Public _Keys" +msgstr "×ת××/××¦×¤× ××× ××¢×רת ×פת××ת צ×××ר×××" + +#: bin/openpgp-applet:240 +msgid "_Decrypt/Verify Clipboard" +msgstr "_×¤×¢× ×/×××× ×××" + +#: bin/openpgp-applet:244 +msgid "_Manage Keys" +msgstr "_× ×× ×פת××ת" + +#: bin/openpgp-applet:248 +msgid "_Open Text Editor" +msgstr "_×¤×ª× ×¢××¨× ×קס×" + +#: bin/openpgp-applet:292 +msgid "The clipboard does not contain valid input data." +msgstr "×××× ××× × ×××× × ×ª×× × ×§×× ×ª×§×¤××." + +#: bin/openpgp-applet:337 bin/openpgp-applet:339 bin/openpgp-applet:341 +msgid "Unknown Trust" +msgstr "×××× ×××ª× ××××¢" + +#: bin/openpgp-applet:343 +msgid "Marginal Trust" +msgstr "×××× ××¢××" + +#: bin/openpgp-applet:345 +msgid "Full Trust" +msgstr "×××× ×××" + +#: bin/openpgp-applet:347 +msgid "Ultimate Trust" +msgstr "×××× ×××××" + +#: bin/openpgp-applet:400 +msgid "Name" +msgstr "ש×" + +#: bin/openpgp-applet:401 +msgid "Key ID" +msgstr "×××× ×פת×" + +#: bin/openpgp-applet:402 +msgid "Status" +msgstr "×צ×" + +#: bin/openpgp-applet:433 +msgid "Fingerprint:" +msgstr "×××עת ×צ××¢:" + +#: bin/openpgp-applet:436 +msgid "User ID:" +msgid_plural "User IDs:" +msgstr[0] "×××ת ×שת×ש:" +msgstr[1] "×××××ת ×שת×ש:" + +#: bin/openpgp-applet:465 +msgid "None (Don't sign)" +msgstr "×××× (×× ×ª×ת××)" + +#: bin/openpgp-applet:528 +msgid "Select recipients:" +msgstr "××ר ×ק××××:" + +#: bin/openpgp-applet:536 +msgid "Hide recipients" +msgstr "×סתר ×ק××××" + +#: bin/openpgp-applet:539 +msgid "" +"Hide the user IDs of all recipients of an encrypted message. Otherwise " +"anyone that sees the encrypted message can see who the recipients are." +msgstr "×סתר ×ת ×××××ת ××שת×ש ×©× ×× ×ק××× ××××¢× ×××¦×¤× ×ª. ××רת, ×× ××× ×©×ר×× ×ת ×××××¢× ××××¦×¤× ×ª ×××× ×× ×ר××ת ×× ××ק××××." + +#: bin/openpgp-applet:545 +msgid "Sign message as:" +msgstr "×ת×× ×¢× ××××¢× ×ת×ר:" + +#: bin/openpgp-applet:549 +msgid "Choose keys" +msgstr "××ר ×פת××ת" + +#: bin/openpgp-applet:589 +msgid "Do you trust these keys?" +msgstr "××× ××ª× ×××× ××פת××ת ×××?" + +#: bin/openpgp-applet:592 +msgid "The following selected key is not fully trusted:" +msgid_plural "The following selected keys are not fully trusted:" +msgstr[0] "×××¤×ª× ××× ×©× ××ר ××× × ×××× ××××××:" +msgstr[1] "××פת××ת ××××× ×©× ×××¨× ××× × ×××× ×× ××××××:" + +#: bin/openpgp-applet:610 +msgid "Do you trust this key enough to use it anyway?" +msgid_plural "Do you trust these keys enough to use them anyway?" +msgstr[0] "××× ××ª× ×××× ×ספ×ק ×××¤×ª× ×× ××× ××שת×ש ×× ××× ×קר×?" +msgstr[1] "××× ××ª× ×××× ×ספ×ק ××פת××ת ××× ××× ××שת×ש ××× ××× ×קר×?" + +#: bin/openpgp-applet:623 +msgid "No keys selected" +msgstr "×× × ×××¨× ×פת××ת" + +#: bin/openpgp-applet:625 +msgid "" +"You must select a private key to sign the message, or some public keys to " +"encrypt the message, or both." +msgstr "××ª× ×××× ××××ר ×××¤×ª× ×¤×¨×× ×
[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
commit 5a9715534db7ecb59bf1af0ff4ee4b33e688cd9a Author: Translation commit bot Date: Fri Sep 29 13:49:05 2017 + Update translations for tails-openpgp-applet --- he/openpgp-applet.pot | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/he/openpgp-applet.pot b/he/openpgp-applet.pot index b3f571f2a..2be0d415a 100644 --- a/he/openpgp-applet.pot +++ b/he/openpgp-applet.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: ta...@boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2017-09-29 13:18+\n" +"PO-Revision-Date: 2017-09-29 13:40+\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" #: bin/openpgp-applet:160 msgid "You are about to exit OpenPGP Applet. Are you sure?" -msgstr "" +msgstr "××ª× ×¢××× ×צ×ת ×××ש×××× OpenPGP. ××× ××ª× ××××?" #: bin/openpgp-applet:172 msgid "OpenPGP encryption applet" @@ -36,7 +36,7 @@ msgstr "××××ת" #: bin/openpgp-applet:232 msgid "Encrypt Clipboard with _Passphrase" -msgstr "××¦×¤× ××× ××××¨× ××¢×רת _×××רת ס×ס××" +msgstr "××¦×¤× ××× ××¢×רת ××××× ×¡×ס××" #: bin/openpgp-applet:235 msgid "Sign/Encrypt Clipboard with Public _Keys" @@ -44,7 +44,7 @@ msgstr "×ת××/××¦×¤× ××× ××¢×רת ×פת××ת צ×××ר×××" #: bin/openpgp-applet:240 msgid "_Decrypt/Verify Clipboard" -msgstr "_×¤×¢× ×/××ת ××× ×××ר×" +msgstr "_×¤×¢× ×/×××× ×××" #: bin/openpgp-applet:244 msgid "_Manage Keys" @@ -56,11 +56,11 @@ msgstr "_×¤×ª× ×¢××¨× ×קס×" #: bin/openpgp-applet:292 msgid "The clipboard does not contain valid input data." -msgstr "×××× ××× × ×××× × ×ª×× × ×§×× ××ק×××" +msgstr "×××× ××× × ×××× × ×ª×× × ×§×× ×ª×§×¤××." #: bin/openpgp-applet:337 bin/openpgp-applet:339 bin/openpgp-applet:341 msgid "Unknown Trust" -msgstr "×××× ×× ××××¢" +msgstr "×××× ×××ª× ××××¢" #: bin/openpgp-applet:343 msgid "Marginal Trust" @@ -72,7 +72,7 @@ msgstr "×××× ×××" #: bin/openpgp-applet:347 msgid "Ultimate Trust" -msgstr "×××× ×××××" +msgstr "×××× ×××××" #: bin/openpgp-applet:400 msgid "Name" @@ -112,7 +112,7 @@ msgstr "×סתר ×ק××××" msgid "" "Hide the user IDs of all recipients of an encrypted message. Otherwise " "anyone that sees the encrypted message can see who the recipients are." -msgstr "×סתר ×ת ×××××ת ××שת×ש×× ××× × ××¢× × ××סר×× ××××¦×¤× ××. ××רת, ×× ×× ×©××¦×¤× ××סר ×××¦×¤× ×××× ×× ×ר××ת ×ת ×××ת ×תר × ××¢× ××." +msgstr "×סתר ×ת ×××××ת ××שת×ש ×©× ×× ×ק××× ××××¢× ×××¦×¤× ×ª. ××רת, ×× ××× ×©×ר×× ×ת ×××××¢× ××××¦×¤× ×ª ×××× ×× ×ר××ת ×× ××ק××××." #: bin/openpgp-applet:545 msgid "Sign message as:" @@ -129,14 +129,14 @@ msgstr "××× ××ª× ×××× ××פת××ת ×××?" #: bin/openpgp-applet:592 msgid "The following selected key is not fully trusted:" msgid_plural "The following selected keys are not fully trusted:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "×××¤×ª× ××× ×©× ××ר ××× × ×××× ××××××:" +msgstr[1] "××פת××ת ××××× ×©× ×××¨× ××× × ×××× ×× ××××××:" #: bin/openpgp-applet:610 msgid "Do you trust this key enough to use it anyway?" msgid_plural "Do you trust these keys enough to use them anyway?" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "××× ××ª× ×××× ×ספ×ק ×××¤×ª× ×× ××× ××שת×ש ×× ××× ×קר×?" +msgstr[1] "××× ××ª× ×××× ×ספ×ק ××פת××ת ××× ××× ××שת×ש ××× ××× ×קר×?" #: bin/openpgp-applet:623 msgid "No keys selected" @@ -146,7 +146,7 @@ msgstr "×× × ×××¨× ×פת××ת" msgid "" "You must select a private key to sign the message, or some public keys to " "encrypt the message, or both." -msgstr "×¢××× ××××ר ×××¤×ª× ×¤×¨×× ××ת××ת ××סר, ×× ××פת××ת צ×××ר××× ××ש×× ×××¦×¤× ×ª ××סר, ×× ××©× ×××." +msgstr "××ª× ×××× ××××ר ×××¤×ª× ×¤×¨×× ××× ××ת×× ×¢× ×××××¢×, ×× ××פת××ת צ×××ר××× ××ש×× ××× ××צפ×× ×ת ×××××¢×, ×× ××©× ×××." #: bin/openpgp-applet:653 msgid "No keys available" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
commit dbbed083beca3aa2757c8aa8b52f06bb82b4f353 Author: Translation commit bot Date: Fri Sep 29 14:17:50 2017 + Update translations for torbutton-torbuttondtd --- he/torbutton.dtd | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/he/torbutton.dtd b/he/torbutton.dtd index a4b653672..0f9398cd3 100644 --- a/he/torbutton.dtd +++ b/he/torbutton.dtd @@ -39,13 +39,13 @@ - + - - - + + + ___ 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 'bug23690_028'
commit 8ccefa7b7afac9626a9e448c0cc4694f5fa51097 Merge: 4e6374c26 f7222e6d8 Author: Nick Mathewson Date: Fri Sep 29 10:28:33 2017 -0400 Merge branch 'bug23690_028' changes/bug23690 | 5 + src/or/circuitlist.c | 1 + 2 files changed, 6 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Make some assertions nonfatal to help prevent bug23690 recurrence.
commit b0ddaac07428a06b3167a3cf7be848d45bf3e406 Author: Nick Mathewson Date: Fri Sep 29 10:05:35 2017 -0400 Make some assertions nonfatal to help prevent bug23690 recurrence. --- changes/bug23690_additional_032 | 4 src/common/buffers.c| 8 ++-- src/common/buffers_tls.c| 8 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/changes/bug23690_additional_032 b/changes/bug23690_additional_032 new file mode 100644 index 0..218917dca --- /dev/null +++ b/changes/bug23690_additional_032 @@ -0,0 +1,4 @@ + o Minor features (robustness): +- Change several fatal assertions when flushing buffers into + non-fatal assertions, to prevent any recurrence of 23690. + diff --git a/src/common/buffers.c b/src/common/buffers.c index e9e448783..c45e13d55 100644 --- a/src/common/buffers.c +++ b/src/common/buffers.c @@ -648,8 +648,12 @@ buf_flush_to_socket(buf_t *buf, tor_socket_t s, size_t sz, size_t flushed = 0; tor_assert(buf_flushlen); tor_assert(SOCKET_OK(s)); - tor_assert(*buf_flushlen <= buf->datalen); - tor_assert(sz <= *buf_flushlen); + if (BUG(*buf_flushlen > buf->datalen)) { +*buf_flushlen = buf->datalen; + } + if (BUG(sz > *buf_flushlen)) { +sz = *buf_flushlen; + } check(); while (sz) { diff --git a/src/common/buffers_tls.c b/src/common/buffers_tls.c index 8dbd4bcc8..041f78b81 100644 --- a/src/common/buffers_tls.c +++ b/src/common/buffers_tls.c @@ -142,8 +142,12 @@ buf_flush_to_tls(buf_t *buf, tor_tls_t *tls, size_t flushlen, size_t flushed = 0; ssize_t sz; tor_assert(buf_flushlen); - tor_assert(*buf_flushlen <= buf->datalen); - tor_assert(flushlen <= *buf_flushlen); + if (BUG(*buf_flushlen > buf->datalen)) { +*buf_flushlen = buf->datalen; + } + if (BUG(flushlen > *buf_flushlen)) { +flushlen = *buf_flushlen; + } sz = (ssize_t) flushlen; /* we want to let tls write even if flushlen is zero, because it might ___ 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 'bug23690_additional_032'
commit fc6c0b46fb2741d58e4c8afc22800c76c304b0dc Merge: 8ccefa7b7 b0ddaac07 Author: Nick Mathewson Date: Fri Sep 29 10:29:40 2017 -0400 Merge branch 'bug23690_additional_032' changes/bug23690_additional_032 | 4 src/common/buffers.c| 8 ++-- src/common/buffers_tls.c| 8 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Clear outbuf_flushlen when we clear a connection's outbuf
commit f7222e6d8cf31ce0e2a4653477ab42645c045db6 Author: Nick Mathewson Date: Fri Sep 29 10:00:14 2017 -0400 Clear outbuf_flushlen when we clear a connection's outbuf When we added single_conn_free_bytes(), we cleared the outbuf on a connection without setting outbuf_flushlen() to 0. This could cause an assertion failure later on in flush_buf(). Fixes bug 23690; bugfix on 0.2.6.1-alpha. --- changes/bug23690 | 5 + src/or/circuitlist.c | 1 + 2 files changed, 6 insertions(+) diff --git a/changes/bug23690 b/changes/bug23690 new file mode 100644 index 0..36ff32e49 --- /dev/null +++ b/changes/bug23690 @@ -0,0 +1,5 @@ + o Major bugfixes (relay, crash, assertion failure): +- Fix a timing-based assertion failure that could occur when the + circuit out-of-memory handler freed a connection's output buffer. + Fixes bug 23690; bugfix on 0.2.6.1-alpha. + diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index d7dbfe574..b71048590 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1939,6 +1939,7 @@ single_conn_free_bytes(connection_t *conn) if (conn->outbuf) { result += buf_allocation(conn->outbuf); buf_clear(conn->outbuf); +conn->outbuf_flushlen = 0; } if (conn->type == CONN_TYPE_DIR) { dir_connection_t *dir_conn = TO_DIR_CONN(conn); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit 127e9cf38f2362f068ce2624f73b90153b4fb9c7 Author: Translation commit bot Date: Fri Sep 29 18:15:54 2017 + Update translations for liveusb-creator --- bg/bg.po | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bg/bg.po b/bg/bg.po index 7664eb1fb..929c78c82 100644 --- a/bg/bg.po +++ b/bg/bg.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-25 14:02+0200\n" -"PO-Revision-Date: 2017-09-28 17:33+\n" +"PO-Revision-Date: 2017-09-29 17:58+\n" "Last-Translator: Alex Alex \n" "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n" @@ -335,7 +335,7 @@ msgstr "ÐнÑÑалиÑане" #: ../tails_installer/gui.py:465 #, python-format msgid "%(size)s %(vendor)s %(model)s device (%(device)s)" -msgstr "" +msgstr "%(size)s %(vendor)s %(model)s ÑÑÑÑойÑÑво (%(device)s)" #: ../tails_installer/gui.py:476 msgid "No ISO image selected" @@ -403,24 +403,24 @@ msgid "" "%(size)s %(vendor)s %(model)s device (%(device)s)\n" "\n" "All data on this USB stick will be lost." -msgstr "" +msgstr "%(size)s %(vendor)s %(model)s ÑÑÑÑойÑÑво (%(device)s).\n ÐÑиÑки данни на USB памеÑÑа Ñе бÑÐ´Ð°Ñ Ð·Ð°Ð³Ñбени. " #: ../tails_installer/gui.py:717 #, python-format msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)" -msgstr "" +msgstr "%(parent_size)s %(vendor)s %(model)s ÑÑÑÑойÑÑво (%(device)s)" #: ../tails_installer/gui.py:725 msgid "" "\n" "\n" "The persistent storage on this USB stick will be preserved." -msgstr "" +msgstr "\n\nÐоÑÑоÑннаÑа Ð¿Ð°Ð¼ÐµÑ Ð½Ð° Ñази USB ÑлаÑка Ñе бÑде запазена." #: ../tails_installer/gui.py:726 #, python-format msgid "%(description)s%(persistence_message)s" -msgstr "" +msgstr "%(description)s%(persistence_message)s" #: ../tails_installer/gui.py:776 msgid "Download complete!" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
commit 7c1c4306965463039f4e199bded47259fbdd24f3 Author: Translation commit bot Date: Fri Sep 29 18:16:00 2017 + Update translations for liveusb-creator_completed --- bg/bg.po | 339 ++- 1 file changed, 137 insertions(+), 202 deletions(-) diff --git a/bg/bg.po b/bg/bg.po index 40d6e6075..929c78c82 100644 --- a/bg/bg.po +++ b/bg/bg.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Alex Alex , 2017 # aramaic , 2015 # Ivo, 2017 # Kaloyan Doichinov, 2014 @@ -16,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-09 17:50+0200\n" -"PO-Revision-Date: 2017-06-10 07:45+\n" -"Last-Translator: Ivo\n" +"POT-Creation-Date: 2017-09-25 14:02+0200\n" +"PO-Revision-Date: 2017-09-29 17:58+\n" +"Last-Translator: Alex Alex \n" "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,262 +27,262 @@ msgstr "" "Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../tails_installer/creator.py:100 +#: ../tails_installer/creator.py:101 msgid "You must run this application as root" msgstr "ТÑÑбва да изпÑлниÑе Ñова пÑиложение, какÑо root" -#: ../tails_installer/creator.py:146 +#: ../tails_installer/creator.py:147 msgid "Extracting live image to the target device..." msgstr "ÐзвлиÑане на жив обÑаз кÑм ÑелевоÑо ÑÑÑÑойÑÑво ..." -#: ../tails_installer/creator.py:153 +#: ../tails_installer/creator.py:154 #, python-format msgid "Wrote to device at %(speed)d MB/sec" msgstr "ÐиÑе ÑÑÑÑойÑÑвоÑо на %(speed)d MB/sec" -#: ../tails_installer/creator.py:183 +#: ../tails_installer/creator.py:184 msgid "Setting up OLPC boot file..." msgstr "СÑздаване на OLPC boot Ñайлове ..." -#: ../tails_installer/creator.py:302 +#: ../tails_installer/creator.py:321 #, python-format msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to '%(filename)s'." msgstr "ÐмаÑе пÑоблем пÑи изпÑлнениеÑо на ÑледнаÑа команда: `%(command)s`.â Ðо-подÑобен жÑÑнал за гÑеÑки е напиÑан '%(filename)s'." -#: ../tails_installer/creator.py:321 +#: ../tails_installer/creator.py:340 msgid "Verifying SHA1 checksum of LiveCD image..." msgstr "ÐÑовеÑка SHA1 конÑÑолна LiveCD на изобÑажениеÑо ..." -#: ../tails_installer/creator.py:325 +#: ../tails_installer/creator.py:344 msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "ÐÑовеÑка SHA256 конÑÑолна LiveCD на изобÑажениеÑо ..." -#: ../tails_installer/creator.py:341 +#: ../tails_installer/creator.py:360 msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." msgstr "ÐÑеÑка: SHA1 на живо CD е невалиден.ÐожеÑе да ÑÑаÑÑиÑаÑе Ñази пÑогÑама Ñ -- noverify аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð° пÑопÑÑнеÑе Ñази пÑовеÑка на пÑовеÑка." -#: ../tails_installer/creator.py:347 +#: ../tails_installer/creator.py:366 msgid "Unknown ISO, skipping checksum verification" msgstr "ÐеизвеÑÑно ISO, пÑеÑкаÑа конÑÑолна пÑовеÑка" -#: ../tails_installer/creator.py:358 +#: ../tails_installer/creator.py:377 #, python-format msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" msgstr "ÐÑма доÑÑаÑÑÑно Ñвободно мÑÑÑо на ÑÑÑÑойÑÑвоÑо.\n%dMB ISO + %dMB overlay > %dMB free space" -#: ../tails_installer/creator.py:365 +#: ../tails_installer/creator.py:384 #, python-format msgid "Creating %sMB persistent overlay" msgstr "СÑздаване %sMB ÑÑÑойÑиви наÑлагване" -#: ../tails_installer/creator.py:426 +#: ../tails_installer/creator.py:445 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" msgstr "ÐевÑзможноÑÑ Ð·Ð° копиÑане на %(infile)s до %(outfile)s: %(message)s" -#: ../tails_installer/creator.py:440 +#: ../tails_installer/creator.py:459 msgid "Removing existing Live OS" msgstr "ÐÑÐµÐ¼Ð°Ñ Ð²Ð°Ð½Ðµ на ÑÑÑеÑÑвÑваÑиÑе Live OS" -#: ../tails_installer/creator.py:449 ../tails_installer/creator.py:460 +#: ../tails_installer/creator.py:468 ../tails_installer/creator.py:479 #, python-format msgid "Unable to chmod %(file)s: %(message)s" msgstr "Ðе може да Ñе chmod %(file)s: %(message)s" -#: ../tails_installer/creator.py:453 +#: ../tails_installer/creator.py:472 #, python-
[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed
commit 879084c5cd3faf10ed313d44cf6ecd3eafd9cebc Author: Translation commit bot Date: Fri Sep 29 18:17:12 2017 + Update translations for tails-misc_completed --- bg.po | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bg.po b/bg.po index af49784fe..0c4974fe3 100644 --- a/bg.po +++ b/bg.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Alex Alex , 2017 # Etem Bavarian , 2014 # Gabriel Radev , 2015 # iliev.mb , 2015 @@ -18,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-05 11:57+0200\n" -"PO-Revision-Date: 2017-05-26 14:47+\n" -"Last-Translator: carolyn \n" +"POT-Creation-Date: 2017-09-13 20:10+0200\n" +"PO-Revision-Date: 2017-09-29 17:47+\n" +"Last-Translator: Alex Alex \n" "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -343,3 +344,7 @@ msgstr "ÐеÑигÑÑен Уеб ÐÑаÑзÑÑ" #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2 msgid "Tails specific tools" msgstr "СпеÑиÑиÑни за Tails инÑÑÑÑменÑи" + +#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in.h:1 +msgid "To start a Root Terminal, you need to authenticate." +msgstr "Ðа да полÑÑиÑе root пÑивилегии в ÑеÑминала, ÑÑÑбва пÑÑво да Ñе ÑдоÑÑовеÑиÑе." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc] Update translations for tails-misc
commit 1fb81c5985bd87faa052e2ee0c1d7f2707041a8d Author: Translation commit bot Date: Fri Sep 29 18:17:07 2017 + Update translations for tails-misc --- bg.po | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bg.po b/bg.po index c23efa97d..0c4974fe3 100644 --- a/bg.po +++ b/bg.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Alex Alex , 2017 # Etem Bavarian , 2014 # Gabriel Radev , 2015 # iliev.mb , 2015 @@ -19,8 +20,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-09-23 14:01+\n" -"Last-Translator: carolyn \n" +"PO-Revision-Date: 2017-09-29 17:47+\n" +"Last-Translator: Alex Alex \n" "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -346,4 +347,4 @@ msgstr "СпеÑиÑиÑни за Tails инÑÑÑÑменÑи" #: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in.h:1 msgid "To start a Root Terminal, you need to authenticate." -msgstr "" +msgstr "Ðа да полÑÑиÑе root пÑивилегии в ÑеÑминала, ÑÑÑбва пÑÑво да Ñе ÑдоÑÑовеÑиÑе." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
commit ac754491a74e503bc06077beba912eecef8afd13 Author: Translation commit bot Date: Fri Sep 29 18:18:46 2017 + Update translations for torbutton-abouttorproperties_completed --- bg/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bg/abouttor.properties b/bg/abouttor.properties index a379bda98..d4b98d8c4 100644 --- a/bg/abouttor.properties +++ b/bg/abouttor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=ÐаÑеÑе Ñега! -aboutTor.donationBanner.slogan=Tor: ÐоÑиво за дигиÑалнаÑа ÑÑпÑоÑива +aboutTor.donationBanner.slogan=Tor: ÐодкÑепа на дигиÑалнаÑа ÑÑпÑоÑива aboutTor.donationBanner.mozilla=ÐаÑеÑе Ð´Ð½ÐµÑ Ð¸ Mozilla Ñе даÑи ÑÑÑаÑа ÑÑма! aboutTor.donationBanner.tagline1=ÐаÑиÑа на жÑÑналиÑÑи, изÑоÑниÑи и ÐкÑивиÑÑи Ð¾Ñ 2006 наÑам ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
commit fdbfe858324edec0aa5a0e432a9837a27389b61d Author: Translation commit bot Date: Fri Sep 29 18:18:40 2017 + Update translations for torbutton-abouttorproperties --- bg/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bg/abouttor.properties b/bg/abouttor.properties index f6354e351..d4b98d8c4 100644 --- a/bg/abouttor.properties +++ b/bg/abouttor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=ÐаÑеÑе Ñега! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=Tor: ÐодкÑепа на дигиÑалнаÑа ÑÑпÑоÑива aboutTor.donationBanner.mozilla=ÐаÑеÑе Ð´Ð½ÐµÑ Ð¸ Mozilla Ñе даÑи ÑÑÑаÑа ÑÑма! aboutTor.donationBanner.tagline1=ÐаÑиÑа на жÑÑналиÑÑи, изÑоÑниÑи и ÐкÑивиÑÑи Ð¾Ñ 2006 наÑам ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] sched: Don't get KIST stuck in an infinite loop
commit 3ef7e6f1870bf6bc2c26076c6abb545a576f9a42 Author: Matt Traudt Date: Wed Sep 27 16:11:05 2017 -0400 sched: Don't get KIST stuck in an infinite loop When a channel is scheduled and flush cells returns 0 that is no cells to flush, we flag it back in waiting for cells so it doesn't get stuck in a possible infinite loop. It has been observed on moria1 where a closed channel end up in the scheduler where the flush process returned 0 cells but it was ultimately kept in the scheduling loop forever. We suspect that this is due to a more deeper problem in tor where the channel_more_to_flush() is actually looking at the wrong queue and was returning 1 for an empty channel thus putting the channel in the "Case 4" of the scheduler which is to go back in pending state thus re-considered at the next iteration. This is a fix that allows the KIST scheduler to recover properly from a not entirelly diagnosed problem in tor. Fixes #23676 Signed-off-by: David Goulet --- changes/bug23676| 6 ++ src/or/scheduler_kist.c | 17 - 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/changes/bug23676 b/changes/bug23676 new file mode 100644 index 0..90f9e3180 --- /dev/null +++ b/changes/bug23676 @@ -0,0 +1,6 @@ + o Major bugfixes (scheduler): +If a channel is put into the scheduler's pending list, then it starts +closing, and then if the scheduler runs before it finishes closing, the +scheduler will get stuck trying to flush its cells while the lower layers +refuse to cooperate. Fix that race condition by given the scheduler an +escape method. Fixes bug 23676; bugfix on 0.3.2.1-alpha diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index 9e960cdef..23e9a 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -591,8 +591,23 @@ kist_scheduler_run(void) if (flush_result > 0) { update_socket_written(&socket_table, chan, flush_result * (CELL_MAX_NETWORK_SIZE + TLS_PER_CELL_OVERHEAD)); + } else { +/* XXX: This can happen because tor sometimes does flush in an + * opportunistic way cells from the circuit to the outbuf so the + * channel can end up here without having anything to flush nor needed + * to write to the kernel. Hopefully we'll fix that soon but for now + * we have to handle this case which happens kind of often. */ +log_debug(LD_SCHED, + "We didn't flush anything on a chan that we think " + "can write and wants to write. The channel's state is '%s' " + "and in scheduler state %d. We're going to mark it as " + "waiting_for_cells (as that's most likely the issue) and " + "stop scheduling it this round.", + channel_state_to_string(chan->state), + chan->scheduler_state); +chan->scheduler_state = SCHED_CHAN_WAITING_FOR_CELLS; +continue; } - /* XXX What if we didn't flush? */ } /* Decide what to do with the channel now */ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Don't package cells onto marked circuits.
commit d256d4c0a6c6a258c4f6c6839dd53c7e304fa94f Author: Nick Mathewson Date: Fri Sep 29 09:26:16 2017 -0400 Don't package cells onto marked circuits. This caused a BUG log when we noticed that the circuit had no channel. The likeliest culprit for exposing that behavior is d769cab3e5097980, where we made circuit_mark_for_close() NULL out the n_chan and p_chan fields of the circuit. Fixes bug 8185; bugfix on 0.2.5.4-alpha, I think. --- changes/bug8185_025 | 6 ++ src/or/relay.c | 11 +++ 2 files changed, 17 insertions(+) diff --git a/changes/bug8185_025 b/changes/bug8185_025 new file mode 100644 index 0..1bfc12b1e --- /dev/null +++ b/changes/bug8185_025 @@ -0,0 +1,6 @@ + o Minor bugfixes (logging, relay shutdown, annoyance): +- When a circuit is marked for close, do not attempt to package any cells + for channels on that circuit. Previously, we would detect this + condition lower in the call stack, when we noticed that the circuit had + no attached channel, and log an annoying message. Fixes bug 8185; + bugfix on 0.2.5.4-alpha. diff --git a/src/or/relay.c b/src/or/relay.c index daf354c34..48c823423 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -390,6 +390,11 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ, { channel_t *chan; /* where to send the cell */ + if (circ->marked_for_close) { +/* Circuit is marked; send nothing. */ +return 0; + } + if (cell_direction == CELL_DIRECTION_OUT) { crypt_path_t *thishop; /* counter for repeated crypts */ chan = circ->n_chan; @@ -703,6 +708,12 @@ connection_edge_send_command(edge_connection_t *fromconn, return -1; } + if (circ->marked_for_close) { +/* The circuit has been marked, but not freed yet. When it's freed, it + * will mark this connection for close. */ +return -1; + } + return relay_send_command_from_edge(fromconn->stream_id, circ, relay_command, payload, payload_len, cpath_layer); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branches 'bug8185_031' and 'bug8185_diagnostic_032'
commit ca2e7eabc293791bb6d4664f851fb2a6374bbfb6 Merge: 3ef7e6f18 1a5746f8e 1b6ccb52e Author: Nick Mathewson Date: Fri Sep 29 17:26:40 2017 -0400 Merge branches 'bug8185_031' and 'bug8185_diagnostic_032' changes/8185_diagnostic | 4 changes/bug8185_025 | 6 ++ src/or/relay.c | 21 - 3 files changed, 30 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'bug8185_025' into bug8185_031
commit 1a5746f8e1a392f0b67e36083019534bf97f1fa6 Merge: 82f109c2b d256d4c0a Author: Nick Mathewson Date: Fri Sep 29 09:37:01 2017 -0400 Merge branch 'bug8185_025' into bug8185_031 changes/bug8185_025 | 6 ++ src/or/relay.c | 11 +++ 2 files changed, 17 insertions(+) diff --cc src/or/relay.c index cb1a0692b,48c823423..81942af1e --- a/src/or/relay.c +++ b/src/or/relay.c @@@ -824,16 -708,12 +829,22 @@@ connection_edge_send_command(edge_conne return -1; } + if (circ->marked_for_close) { + /* The circuit has been marked, but not freed yet. When it's freed, it + * will mark this connection for close. */ + return -1; + } + +#ifdef MEASUREMENTS_21206 + /* Keep track of the number of RELAY_DATA cells sent for directory + * connections. */ + connection_t *linked_conn = TO_CONN(fromconn)->linked_conn; + + if (linked_conn && linked_conn->type == CONN_TYPE_DIR) { +++(TO_DIR_CONN(linked_conn)->data_cells_sent); + } +#endif + return relay_send_command_from_edge(fromconn->stream_id, circ, relay_command, payload, payload_len, cpath_layer); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] changes tweak.
commit 9ae18b8a91b6706d0da1db730269ff7c12e7e7a3 Author: Nick Mathewson Date: Fri Sep 29 17:27:21 2017 -0400 changes tweak. --- changes/8185_diagnostic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/8185_diagnostic b/changes/8185_diagnostic index b809c4f3e..5e4cb1f8c 100644 --- a/changes/8185_diagnostic +++ b/changes/8185_diagnostic @@ -1,4 +1,4 @@ o Minor features (logging diagnostic): - Log more circuit information whenever we are about to try to package a relay cell on a circuit with a nonexistent n_chan. - Attempt to diagnose bug 8185. + Attempt to diagnose ticket 8185. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Log more information when bug8185 is about to trigger.
commit 1b6ccb52eab139cd836e01316c46252e8c143288 Author: Nick Mathewson Date: Fri Sep 29 09:24:01 2017 -0400 Log more information when bug8185 is about to trigger. My current theory is that this is just a marked circuit that hasn't closed yet, but let's gather more information in case that theory is wrong. Diagnostic for 8185. --- changes/8185_diagnostic | 4 src/or/relay.c | 10 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changes/8185_diagnostic b/changes/8185_diagnostic new file mode 100644 index 0..b809c4f3e --- /dev/null +++ b/changes/8185_diagnostic @@ -0,0 +1,4 @@ + o Minor features (logging diagnostic): +- Log more circuit information whenever we are about to try to + package a relay cell on a circuit with a nonexistent n_chan. + Attempt to diagnose bug 8185. diff --git a/src/or/relay.c b/src/or/relay.c index 2bfec342d..ef4b1f423 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -500,7 +500,15 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ, chan = circ->n_chan; if (!chan) { log_warn(LD_BUG,"outgoing relay cell sent from %s:%d has n_chan==NULL." - " Dropping.", filename, lineno); + " Dropping. Circuit is in state %s (%d), and is " + "%smarked for close. (%s:%d, %d)", filename, lineno, + circuit_state_to_string(circ->state), circ->state, + circ->marked_for_close ? "" : "not ", + circ->marked_for_close_file?circ->marked_for_close_file:"", + circ->marked_for_close, circ->marked_for_close_reason); + if (CIRCUIT_IS_ORIGIN(circ)) { +circuit_log_path(LOG_WARN, LD_BUG, TO_ORIGIN_CIRCUIT(circ)); + } log_backtrace(LOG_WARN,LD_BUG,""); return 0; /* just drop it */ } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] sched: Always initialize scheduler_last_run to now
commit 070064de899901daaf98aefc3335bc9f21acb5c6 Author: David Goulet Date: Fri Sep 29 14:07:55 2017 -0400 sched: Always initialize scheduler_last_run to now Because our monotonic time interface doesn't play well with value set to 0, always initialize to now() the scheduler_last_run at init() of the KIST scheduler. Fixes #23696 Signed-off-by: David Goulet --- changes/bug23696| 3 +++ src/or/scheduler_kist.c | 10 ++ 2 files changed, 13 insertions(+) diff --git a/changes/bug23696 b/changes/bug23696 new file mode 100644 index 0..d447815c8 --- /dev/null +++ b/changes/bug23696 @@ -0,0 +1,3 @@ + o Minor bugfixes (scheduler, kist): +- Properly initialize the scheduler last run time counter so it is not 0 + at the first tick. Fixes bug 23696; bugfix on 0.3.2.1-alpha. diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index 9e960cdef..5856cbea4 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -490,6 +490,16 @@ kist_scheduler_on_new_options(void) static void kist_scheduler_init(void) { + /* When initializing the scheduler, the last run could be 0 because it is + * declared static or a value in the past that was set when it was last + * used. In both cases, we want to initialize it to now so we don't risk + * using the value 0 which doesn't play well with our monotonic time + * interface. + * + * One side effect is that the first scheduler run will be at the next tick + * that is in now + 10 msec (KIST_SCHED_RUN_INTERVAL_DEFAULT) by default. */ + monotime_get(&scheduler_last_run); + kist_scheduler_on_new_options(); IF_BUG_ONCE(sched_run_interval == 0) { log_warn(LD_SCHED, "We are initing the KIST scheduler and noticed the " ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket23696_032_01'
commit dddae36f5e0e9e088cd9aa98c6e4a6c904e1efa4 Merge: 9ae18b8a9 070064de8 Author: Nick Mathewson Date: Fri Sep 29 17:46:50 2017 -0400 Merge remote-tracking branch 'dgoulet/ticket23696_032_01' changes/bug23696| 3 +++ src/or/scheduler_kist.c | 10 ++ 2 files changed, 13 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc] Update translations for tails-misc
commit 05cf9a94e3889b32a173b8aacc532648b21ac435 Author: Translation commit bot Date: Sat Sep 30 00:17:05 2017 + Update translations for tails-misc --- tk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tk.po b/tk.po index 2088836e1..11f4bd000 100644 --- a/tk.po +++ b/tk.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-09-19 19:57+\n" +"PO-Revision-Date: 2017-09-30 00:06+\n" "Last-Translator: carolyn \n" "Language-Team: Turkmen (http://www.transifex.com/otf/torproject/language/tk/)\n" "MIME-Version: 1.0\n" @@ -171,7 +171,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:25 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28 msgid "Error" -msgstr "" +msgstr "Säwlik" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:45 msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-perl5lib] Update translations for tails-perl5lib
commit b94da0811a472171a8e188cf3cfed6457d5ac452 Author: Translation commit bot Date: Sat Sep 30 00:18:01 2017 + Update translations for tails-perl5lib --- tk.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tk.po b/tk.po index 27c26282c..649e08076 100644 --- a/tk.po +++ b/tk.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" -"POT-Creation-Date: 2016-01-11 15:40+0100\n" -"PO-Revision-Date: 2016-01-12 08:13+\n" +"POT-Creation-Date: 2017-05-20 10:59+0200\n" +"PO-Revision-Date: 2017-09-30 00:06+\n" "Last-Translator: carolyn \n" "Language-Team: Turkmen (http://www.transifex.com/otf/torproject/language/tk/)\n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ msgstr "" #: ../lib/Tails/RunningSystem.pm:159 msgid "Error" -msgstr "" +msgstr "Säwlik" #: ../lib/Tails/RunningSystem.pm:161 msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup
commit ada46a466f90b1b59eef81f6860b30d51618a5b0 Author: Translation commit bot Date: Sat Sep 30 00:16:04 2017 + Update translations for tails-persistence-setup --- tk/tk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tk/tk.po b/tk/tk.po index 3b6722f58..7ca815b65 100644 --- a/tk/tk.po +++ b/tk/tk.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-05-17 03:09+\n" +"PO-Revision-Date: 2017-09-30 00:06+\n" "Last-Translator: carolyn \n" "Language-Team: Turkmen (http://www.transifex.com/otf/torproject/language/tk/)\n" "MIME-Version: 1.0\n" @@ -128,7 +128,7 @@ msgstr "" #: ../lib/Tails/Persistence/Setup.pm:312 ../lib/Tails/Persistence/Setup.pm:459 msgid "Error" -msgstr "" +msgstr "Säwlik" #: ../lib/Tails/Persistence/Setup.pm:344 #, perl-format ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit c8a602a4bb378e1fca6709840de34182278690ba Author: Translation commit bot Date: Sat Sep 30 02:16:52 2017 + Update translations for https_everywhere --- ach/https-everywhere.dtd | 1 + ady/https-everywhere.dtd | 1 + af/https-everywhere.dtd | 1 + ak/https-everywhere.dtd | 1 + am/https-everywhere.dtd | 1 + ar/https-everywhere.dtd | 1 + arn/https-everywhere.dtd | 1 + ast/https-everywhere.dtd | 1 + az/https-everywhere.dtd | 1 + ba/https-everywhere.dtd | 1 + be/https-everywhere.dtd | 1 + bg/https-everywhere.dtd | 1 + bn/https-everywhere.dtd | 1 + bn_BD/https-everywhere.dtd | 1 + bn_IN/https-everywhere.dtd | 1 + bo/https-everywhere.dtd | 1 + br/https-everywhere.dtd | 1 + brx/https-everywhere.dtd | 1 + bs/https-everywhere.dtd | 1 + ca/https-everywhere.dtd | 3 ++- ceb/https-everywhere.dtd | 1 + cs/https-everywhere.dtd | 1 + csb/https-everywhere.dtd | 1 + cv/https-everywhere.dtd | 1 + cy/https-everywhere.dtd | 1 + da/https-everywhere.dtd | 1 + de/https-everywhere.dtd | 1 + dz/https-everywhere.dtd | 1 + el/https-everywhere.dtd | 1 + en_GB/https-everywhere.dtd | 1 + eo/https-everywhere.dtd | 1 + es/https-everywhere.dtd | 1 + es_AR/https-everywhere.dtd | 1 + es_CL/https-everywhere.dtd | 1 + es_CO/https-everywhere.dtd | 1 + es_MX/https-everywhere.dtd | 1 + et/https-everywhere.dtd | 1 + eu/https-everywhere.dtd | 1 + fa/https-everywhere.dtd | 1 + fi/https-everywhere.dtd | 1 + fil/https-everywhere.dtd | 1 + fo/https-everywhere.dtd | 1 + fr/https-everywhere.dtd | 1 + fr_CA/https-everywhere.dtd | 1 + fur/https-everywhere.dtd | 1 + fy/https-everywhere.dtd | 1 + ga/https-everywhere.dtd | 1 + gd/https-everywhere.dtd | 1 + gl/https-everywhere.dtd | 1 + gu/https-everywhere.dtd | 1 + gu_IN/https-everywhere.dtd | 1 + gun/https-everywhere.dtd | 1 + ha/https-everywhere.dtd | 1 + he/https-everywhere.dtd | 1 + hi/https-everywhere.dtd | 1 + hr/https-everywhere.dtd | 1 + hr_HR/https-everywhere.dtd | 1 + ht/https-everywhere.dtd | 1 + hu/https-everywhere.dtd | 1 + hy/https-everywhere.dtd | 1 + ia/https-everywhere.dtd | 1 + id/https-everywhere.dtd | 1 + is/https-everywhere.dtd | 1 + it/https-everywhere.dtd | 1 + ja/https-everywhere.dtd | 1 + jv/https-everywhere.dtd | 1 + ka/https-everywhere.dtd | 1 + kk/https-everywhere.dtd | 1 + km/https-everywhere.dtd | 1 + kn/https-everywhere.dtd | 1 + ko/https-everywhere.dtd | 1 + ko_KR/https-everywhere.dtd | 1 + ku/https-everywhere.dtd | 1 + ku_IQ/https-everywhere.dtd | 1 + kw/https-everywhere.dtd | 1 + ky/https-everywhere.dtd | 1 + la/https-everywhere.dtd | 1 + lb/https-everywhere.dtd | 1 + lg/https-everywhere.dtd | 1 + ln/https-everywhere.dtd | 1 + lo/https-everywhere.dtd | 1 + lt/https-everywhere.dtd | 1 + lv/https-everywhere.dtd | 1 + mg/https-everywhere.dtd | 1 + mi/https-everywhere.dtd | 1 + mk/https-everywhere.dtd | 1 + ml/https-everywhere.dtd | 1 + mn/https-everywhere.dtd | 1 + mr/https-everywhere.dtd | 1 + ms_MY/https-everywhere.dtd | 1 + mt/https-everywhere.dtd | 1 + my/https-everywhere.dtd | 1 + nah/https-everywhere.dtd | 1 + nap/https-everywhere.dtd | 1 + nb/https-everywhere.dtd | 1 + nds/https-everywhere.dtd | 1 + ne/https-everywhere.dtd | 1 + nl/https-everywhere.dtd | 1 + nl_BE/https-everywhere.dtd | 1 + nn/https-everywhere.dtd | 1 + nso/https-everywhere.dtd | 1 + oc/https-everywhere.dtd | 1 + om/https-everywhere.dtd | 1 + or/https-everywhere.dtd | 1 + pa/https-everywhere.dtd | 1 + pap/https-everywhere.dtd | 1 + pl/https-everywhere.dtd | 1 + pms/https-everywhere.dtd | 1 + ps/https-everywhere.dtd | 1 + pt/https-everywhere.dtd | 1 + pt_BR/https-everywhere.dtd | 1 + ro/https-everywhere.dtd | 1 + ru/https-everywhere.dtd | 1 + ru@petr1708/https-everywhere.dtd | 1 + scn/https-everywhere.dtd | 1 + sco/https-everywhere.dtd | 1 + si_LK/https-everywhere.dtd | 1 + sk/https-everywhere.dtd | 1 + sk_SK/https-everywhere.dtd | 1 + sl/https-everywhere.dtd | 1 + sl_SI/https-everywhere.dtd
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit 970e6ea33c83c9c2ed952a251d1e3778518c27c3 Author: Translation commit bot Date: Sat Sep 30 02:17:05 2017 + Update translations for https_everywhere_completed --- bg/https-everywhere.dtd| 1 + templates/https-everywhere.dtd | 1 + 2 files changed, 2 insertions(+) diff --git a/bg/https-everywhere.dtd b/bg/https-everywhere.dtd index bcbd7d21b..e25edafe4 100644 --- a/bg/https-everywhere.dtd +++ b/bg/https-everywhere.dtd @@ -11,6 +11,7 @@ + diff --git a/templates/https-everywhere.dtd b/templates/https-everywhere.dtd index 611426ac4..e8752886b 100644 --- a/templates/https-everywhere.dtd +++ b/templates/https-everywhere.dtd @@ -11,6 +11,7 @@ + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit bebfbf29f1de9aa3c9d8640c71f02b5c3ec3685e Author: Translation commit bot Date: Sat Sep 30 04:15:55 2017 + Update translations for https_everywhere_completed --- tr/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/tr/https-everywhere.dtd b/tr/https-everywhere.dtd index e948d121b..c4afd7fe5 100644 --- a/tr/https-everywhere.dtd +++ b/tr/https-everywhere.dtd @@ -11,6 +11,7 @@ + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit 2b152616b8827831537844fe06dabb65598c340d Author: Translation commit bot Date: Sat Sep 30 04:15:42 2017 + Update translations for https_everywhere --- tr/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/https-everywhere.dtd b/tr/https-everywhere.dtd index 4a6056090..c4afd7fe5 100644 --- a/tr/https-everywhere.dtd +++ b/tr/https-everywhere.dtd @@ -11,7 +11,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits