- tor-commits - lists.torproject.org

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 15 Mar '16

15 Mar '16

commit 74e890f86d20b38ada57ff58b9eee1f9c61ef483 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 15 09:45:46 2016 +0000 Update translations for tor-launcher-progress --- ca/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/progress.dtd b/ca/progress.dtd index 331193c..06eba3a 100644 --- a/ca/progress.dtd +++ b/ca/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estat de Tor"> <!ENTITY torprogress.openSettings "Obrir preferències."> <!ENTITY torprogress.heading "S'està connectant a la xarxa Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Per favor, esperi mentre establim la connexió amb la red de Tor.  L'acció pot durar varis minuts.">

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 15 Mar '16

15 Mar '16

commit f5f12d85c462cfe11d08724b84dbe17e6c95470e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 15 09:45:31 2016 +0000 Update translations for tails-persistence-setup_completed --- ca/ca.po | 74 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/ca/ca.po b/ca/ca.po index c06632e..2058661 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-12-16 17:55+0100\n" -"PO-Revision-Date: 2015-12-29 18:19+0000\n" +"POT-Creation-Date: 2016-01-25 17:34+0100\n" +"PO-Revision-Date: 2016-03-15 09:38+0000\n" "Last-Translator: laia_\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n" @@ -53,69 +53,69 @@ msgid "Pidgin profiles and OTR keyring" msgstr "Perfils de Pidgin i clauer d'OTR" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Icedove" +msgstr "Icedove" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Icedove profiles and locally stored email" +msgstr "Perfils de l'Icedove i correu emmagatzemat localment." + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "GNOME Keyring" msgstr "Clauer de GNOME" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 msgid "Secrets stored by GNOME Keyring" msgstr "Secrets emmagatzemats pel clauer de GNOME" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 msgid "Network Connections" msgstr "Connexions en xarxa" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 msgid "Configuration of network devices and connections" msgstr "Configuració de dispositius en xarxa i connexions" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" msgstr "Marques del navegador" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Bookmarks saved in the Tor Browser" msgstr "Adreces d'interès desades al Navegador Tor" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "Printers" msgstr "Impressores" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 msgid "Printers configuration" msgstr "Configuració d'impressores" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "Bitcoin client" msgstr "Client de Bitcoin" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Electrum's bitcoin wallet and configuration" msgstr "Moneder de Bitcoin d'Electrum i configuració" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Packages" msgstr "Paquets APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Packages downloaded by APT" msgstr "Paquets descarregats per APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 msgid "APT Lists" msgstr "Llistes APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 msgid "Lists downloaded by APT" msgstr "Llistes descarregades per APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 -msgid "Icedove" -msgstr "Icedove" - -#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 -msgid "Icedove profiles and locally stored email" -msgstr "Perfils de l'Icedove i correu emmagatzemat localment." - #: ../lib/Tails/Persistence/Configuration/Presets.pm:168 msgid "Dotfiles" msgstr "Dotfiles" @@ -129,67 +129,67 @@ msgstr "Symlink a $HOME tot arxiu o carpeta trobat al directori 'dotfiles'" msgid "Setup Tails persistent volume" msgstr "Configura el volum persistent de Tails" -#: ../lib/Tails/Persistence/Setup.pm:311 ../lib/Tails/Persistence/Setup.pm:458 +#: ../lib/Tails/Persistence/Setup.pm:312 ../lib/Tails/Persistence/Setup.pm:459 msgid "Error" msgstr "Error" -#: ../lib/Tails/Persistence/Setup.pm:343 +#: ../lib/Tails/Persistence/Setup.pm:344 #, perl-format msgid "Device %s already has a persistent volume." msgstr "El dispositiu %s ja té un volum persistent." -#: ../lib/Tails/Persistence/Setup.pm:351 +#: ../lib/Tails/Persistence/Setup.pm:352 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "El dispositiu %s no té prou espai lliure." -#: ../lib/Tails/Persistence/Setup.pm:359 ../lib/Tails/Persistence/Setup.pm:373 +#: ../lib/Tails/Persistence/Setup.pm:360 ../lib/Tails/Persistence/Setup.pm:374 #, perl-format msgid "Device %s has no persistent volume." msgstr "El dispositiu %s no té un volum persistent." -#: ../lib/Tails/Persistence/Setup.pm:365 +#: ../lib/Tails/Persistence/Setup.pm:366 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "No es pot eliminar un volum persistent mentre es troba en us. Cal reiniciar Tails sense persistència." -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:385 msgid "Persistence volume is not unlocked." msgstr "El volum persistent no està desbloquejat." -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:390 msgid "Persistence volume is not mounted." msgstr "El volum persistent no està muntat." -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:395 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "El volum persistent és il·legible. Potser hi ha problemes de permisos o propietat." -#: ../lib/Tails/Persistence/Setup.pm:399 +#: ../lib/Tails/Persistence/Setup.pm:400 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "El volum persistent no es pot escriure. Potser ha estat muntat en mode de només lectura." -#: ../lib/Tails/Persistence/Setup.pm:408 +#: ../lib/Tails/Persistence/Setup.pm:409 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails s'està executant des d'un dispositiu %s no-USB / no-SDIO" -#: ../lib/Tails/Persistence/Setup.pm:414 +#: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format msgid "Device %s is optical." msgstr "El dispositiu %s és òptic." -#: ../lib/Tails/Persistence/Setup.pm:421 +#: ../lib/Tails/Persistence/Setup.pm:422 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "El dispositiu %s no va ser creat usant Tails Installer" -#: ../lib/Tails/Persistence/Setup.pm:667 +#: ../lib/Tails/Persistence/Setup.pm:668 msgid "Persistence wizard - Finished" msgstr "Assistent de persistència - Acabat" -#: ../lib/Tails/Persistence/Setup.pm:670 +#: ../lib/Tails/Persistence/Setup.pm:671 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 15 Mar '16

15 Mar '16

commit 60db1e8a9be625084f63531aedf68d81b0024f00 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 15 09:45:26 2016 +0000 Update translations for tails-persistence-setup --- ca/ca.po | 74 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/ca/ca.po b/ca/ca.po index c06632e..2058661 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-12-16 17:55+0100\n" -"PO-Revision-Date: 2015-12-29 18:19+0000\n" +"POT-Creation-Date: 2016-01-25 17:34+0100\n" +"PO-Revision-Date: 2016-03-15 09:38+0000\n" "Last-Translator: laia_\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n" @@ -53,69 +53,69 @@ msgid "Pidgin profiles and OTR keyring" msgstr "Perfils de Pidgin i clauer d'OTR" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Icedove" +msgstr "Icedove" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Icedove profiles and locally stored email" +msgstr "Perfils de l'Icedove i correu emmagatzemat localment." + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "GNOME Keyring" msgstr "Clauer de GNOME" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 msgid "Secrets stored by GNOME Keyring" msgstr "Secrets emmagatzemats pel clauer de GNOME" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 msgid "Network Connections" msgstr "Connexions en xarxa" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 msgid "Configuration of network devices and connections" msgstr "Configuració de dispositius en xarxa i connexions" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" msgstr "Marques del navegador" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Bookmarks saved in the Tor Browser" msgstr "Adreces d'interès desades al Navegador Tor" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "Printers" msgstr "Impressores" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 msgid "Printers configuration" msgstr "Configuració d'impressores" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "Bitcoin client" msgstr "Client de Bitcoin" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Electrum's bitcoin wallet and configuration" msgstr "Moneder de Bitcoin d'Electrum i configuració" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Packages" msgstr "Paquets APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Packages downloaded by APT" msgstr "Paquets descarregats per APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 msgid "APT Lists" msgstr "Llistes APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 msgid "Lists downloaded by APT" msgstr "Llistes descarregades per APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 -msgid "Icedove" -msgstr "Icedove" - -#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 -msgid "Icedove profiles and locally stored email" -msgstr "Perfils de l'Icedove i correu emmagatzemat localment." - #: ../lib/Tails/Persistence/Configuration/Presets.pm:168 msgid "Dotfiles" msgstr "Dotfiles" @@ -129,67 +129,67 @@ msgstr "Symlink a $HOME tot arxiu o carpeta trobat al directori 'dotfiles'" msgid "Setup Tails persistent volume" msgstr "Configura el volum persistent de Tails" -#: ../lib/Tails/Persistence/Setup.pm:311 ../lib/Tails/Persistence/Setup.pm:458 +#: ../lib/Tails/Persistence/Setup.pm:312 ../lib/Tails/Persistence/Setup.pm:459 msgid "Error" msgstr "Error" -#: ../lib/Tails/Persistence/Setup.pm:343 +#: ../lib/Tails/Persistence/Setup.pm:344 #, perl-format msgid "Device %s already has a persistent volume." msgstr "El dispositiu %s ja té un volum persistent." -#: ../lib/Tails/Persistence/Setup.pm:351 +#: ../lib/Tails/Persistence/Setup.pm:352 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "El dispositiu %s no té prou espai lliure." -#: ../lib/Tails/Persistence/Setup.pm:359 ../lib/Tails/Persistence/Setup.pm:373 +#: ../lib/Tails/Persistence/Setup.pm:360 ../lib/Tails/Persistence/Setup.pm:374 #, perl-format msgid "Device %s has no persistent volume." msgstr "El dispositiu %s no té un volum persistent." -#: ../lib/Tails/Persistence/Setup.pm:365 +#: ../lib/Tails/Persistence/Setup.pm:366 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "No es pot eliminar un volum persistent mentre es troba en us. Cal reiniciar Tails sense persistència." -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:385 msgid "Persistence volume is not unlocked." msgstr "El volum persistent no està desbloquejat." -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:390 msgid "Persistence volume is not mounted." msgstr "El volum persistent no està muntat." -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:395 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "El volum persistent és il·legible. Potser hi ha problemes de permisos o propietat." -#: ../lib/Tails/Persistence/Setup.pm:399 +#: ../lib/Tails/Persistence/Setup.pm:400 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "El volum persistent no es pot escriure. Potser ha estat muntat en mode de només lectura." -#: ../lib/Tails/Persistence/Setup.pm:408 +#: ../lib/Tails/Persistence/Setup.pm:409 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails s'està executant des d'un dispositiu %s no-USB / no-SDIO" -#: ../lib/Tails/Persistence/Setup.pm:414 +#: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format msgid "Device %s is optical." msgstr "El dispositiu %s és òptic." -#: ../lib/Tails/Persistence/Setup.pm:421 +#: ../lib/Tails/Persistence/Setup.pm:422 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "El dispositiu %s no va ser creat usant Tails Installer" -#: ../lib/Tails/Persistence/Setup.pm:667 +#: ../lib/Tails/Persistence/Setup.pm:668 msgid "Persistence wizard - Finished" msgstr "Assistent de persistència - Acabat" -#: ../lib/Tails/Persistence/Setup.pm:670 +#: ../lib/Tails/Persistence/Setup.pm:671 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 15 Mar '16

15 Mar '16

commit 9dd46bb87815f6e0c7633c899e988c0a149812ee Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 15 09:45:16 2016 +0000 Update translations for https_everywhere --- ca/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/https-everywhere.dtd b/ca/https-everywhere.dtd index c547f3a..6b012d6 100644 --- a/ca/https-everywhere.dtd +++ b/ca/https-everywhere.dtd @@ -3,7 +3,7 @@ <!ENTITY https-everywhere.about.ext_description "Xifra la Web! Fes servir automàticament la seguretat HTTPS a molts llocs."> <!ENTITY https-everywhere.about.version "Versió"> <!ENTITY https-everywhere.about.created_by "Creat per"> -<!ENTITY https-everywhere.about.and ", and"> +<!ENTITY https-everywhere.about.and ", i"> <!ENTITY https-everywhere.about.librarians "Bibliotecaris de normes"> <!ENTITY https-everywhere.about.thanks "Gràcies a"> <!ENTITY https-everywhere.about.many_contributors "Many many contributors, including">

1 0

[tor-messenger-build/master] Remove upstreamed patch in ESR45
by arlo＠torproject.org 15 Mar '16

15 Mar '16

commit 60682d0e969831342fe013a7c104d9a3f8f02948 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Mar 14 22:23:01 2016 -0700 Remove upstreamed patch in ESR45 --- projects/instantbird/config | 1 - projects/instantbird/trac-17552.patch | 92 ----------------------------------- 2 files changed, 93 deletions(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 67672bb..abc8610 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -71,7 +71,6 @@ input_files: - filename: xmppRegister.js - filename: xmppRegister.xul - filename: xmpp-gtalk-resource.patch - - filename: trac-17552.patch - filename: trac-16489.patch - filename: trac-17896.patch - filename: trac-17494.patch diff --git a/projects/instantbird/trac-17552.patch b/projects/instantbird/trac-17552.patch deleted file mode 100644 index 442bbe9..0000000 --- a/projects/instantbird/trac-17552.patch +++ /dev/null @@ -1,92 +0,0 @@ -# HG changeset patch -# User Arlo Breault <arlolra(a)gmail.com> -# Date 1446953889 28800 -# Sat Nov 07 19:38:09 2015 -0800 -# Node ID a42c96a62dee7a73910de738a9809d8247aede8c -# Parent 492c769c46c9ea9e54fab00d6f0310afd100885a -Ensure isMuc when attempting a subject change - -diff --git a/chat/protocols/xmpp/xmpp.jsm b/chat/protocols/xmpp/xmpp.jsm ---- a/chat/protocols/xmpp/xmpp.jsm -+++ b/chat/protocols/xmpp/xmpp.jsm -@@ -1343,16 +1343,17 @@ const XMPPAccountPrototype = { - - return null; - }, - - /* Called when a message stanza is received */ - onMessageStanza: function(aStanza) { - let from = aStanza.attributes["from"]; - let norm = this.normalize(from); -+ let isMuc = this._mucs.has(norm); - - let type = aStanza.attributes["type"]; - let body; - let b = aStanza.getElement(["body"]); - if (b) { - // If there's a <body> child we have more than just typing notifications. - // Prefer HTML (in <html><body>) and use plain text (<body>) as fallback. - let htmlBody = aStanza.getElement(["html", "body"]); -@@ -1362,17 +1363,21 @@ const XMPPAccountPrototype = { - // Even if the message is in plain text, the prplIMessage - // should contain a string that's correctly escaped for - // insertion in an HTML document. - body = TXTToHTML(b.innerText); - } - } - - let subject = aStanza.getElement(["subject"]); -- if (subject) { -+ // Ignore subject when !isMuc. We're being permissive about subject changes -+ // in the comment below, so we need to be careful about where that makes -+ // sense. Psi+'s OTR plugin includes a subject and body in its message -+ // stanzas. -+ if (subject && isMuc) { - // XEP-0045 (7.2.16): Check for a subject element in the stanza and update - // the topic if it exists. - // We are breaking the spec because only a message that contains a - // <subject/> but no <body/> element shall be considered a subject change - // for MUC, but we ignore that to be compatible with ejabberd versions - // before 15.06. - let muc = this._mucs.get(norm); - let nick = this._parseJID(from).resource; -@@ -1386,18 +1391,18 @@ const XMPPAccountPrototype = { - let delay = aStanza.getElement(["delay"]); - if (delay && delay.uri == Stanza.NS.delay) { - if (delay.attributes["stamp"]) - date = new Date(delay.attributes["stamp"]); - } - if (date && isNaN(date)) - date = undefined; - if (type == "groupchat" || -- (type == "error" && this._mucs.has(norm) && !this._conv.has(from))) { -- if (!this._mucs.has(norm)) { -+ (type == "error" && isMuc && !this._conv.has(from))) { -+ if (!isMuc) { - this.WARN("Received a groupchat message for unknown MUC " + norm); - return; - } - let muc = this._mucs.get(norm); - muc.incomingMessage(body, aStanza, date); - return; - } - -@@ -1454,17 +1459,17 @@ const XMPPAccountPrototype = { - if (state) { - this.DEBUG(state); - if (state == "composing") - typingState = Ci.prplIConvIM.TYPING; - else if (state == "paused") - typingState = Ci.prplIConvIM.TYPED; - } - let convName = norm; -- if (this._mucs.has(norm)) -+ if (isMuc) - convName = from; - let conv = this._conv.get(convName); - if (!conv) - return; - conv.updateTyping(typingState, conv.shortName); - conv.supportChatStateNotifications = !!state; - }, -

1 0

[snowflake/master] Update proxy readme for npm
by arlo＠torproject.org 15 Mar '16

15 Mar '16

commit 422717f36f0e4463085166545b939457786387ea Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Mar 14 20:46:52 2016 -0700 Update proxy readme for npm --- proxy/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/README.md b/proxy/README.md index 5b5761d..0398d3d 100644 --- a/proxy/README.md +++ b/proxy/README.md @@ -11,9 +11,9 @@ See [keroserene.net/snowflake](http://keroserene.net/snowflake) for more info: Unit testing with Jasmine are available with: ``` -cake test +npm install +npm test ``` -Requires jasmine. (`npm install -g jasmine`) To run locally, either: - Navigate to `proxy/build/embed.html`

1 0

[snowflake/master] Run client tests in travis too
by arlo＠torproject.org 15 Mar '16

15 Mar '16

commit 9867730e34ae1105ee98274de7ce2e37ecbc7b14 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Mar 14 18:16:51 2016 -0700 Run client tests in travis too --- .travis.yml | 40 +++++++++++++++++++++++++++------------- proxy/package.json | 22 ++++++++++++++++++++++ 2 files changed, 49 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec7038a..0f72040 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,22 +1,36 @@ language: go +sudo: required +dist: trusty + +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-5 + - gcc-5 + go: - - 1.5 - - 1.6 + - 1.6 env: - - TRAVIS_NODE_VERSION="4.1" + - TRAVIS_NODE_VERSION="4.2" CC="gcc-5" CXX="g++-5" -install: - - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION - - go get -u github.com/smartystreets/goconvey +before_install: + - nvm install $TRAVIS_NODE_VERSION -before_script: - npm install -g coffee-script coffeelint jasmine +install: + - go get -u github.com/smartystreets/goconvey + - go get -u github.com/keroserene/go-webrtc + - go get -u git.torproject.org/pluggable-transports/goptlib.git + - pushd proxy + - npm install + - popd script: - - make check - - go test -v -race ./broker - - cd proxy - - cake lint - - cake test + - make check + - go test -v -race ./broker ./client + - cd proxy + - npm run-script lint + - npm test diff --git a/proxy/package.json b/proxy/package.json new file mode 100644 index 0000000..0a23eb4 --- /dev/null +++ b/proxy/package.json @@ -0,0 +1,22 @@ +{ + "name": "snowflake-pt", + "version": "0.0.0-git", + "description": "WebRTC Pluggable Transport", + "main": "snowflake.coffee", + "directories": { + "test": "test" + }, + "scripts": { + "test": "cake test", + "lint": "cake lint" + }, + "author": "Serene Han", + "license": "BSD-3-Clause", + "devDependencies": { + "coffeelint": "^1.15.0", + "jasmine": "^2.4.1" + }, + "dependencies": { + "coffee-script": "^1.10.0" + } +}

1 0

[snowflake/master] prepare for multiplexed snowflake (#11)
by arlo＠torproject.org 15 Mar '16

15 Mar '16

commit 5e318b62199401b5ee82f8ce3ba3c05198f0ba8c Author: Serene Han <keroserene+git(a)gmail.com> Date: Sat Mar 12 22:29:56 2016 -0800 prepare for multiplexed snowflake (#11) --- proxy/broker.coffee | 2 +- proxy/proxypair.coffee | 11 +++++++---- proxy/snowflake.coffee | 20 +++++++++----------- proxy/spec/snowflake.spec.coffee | 6 +++--- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/proxy/broker.coffee b/proxy/broker.coffee index 71c3186..78577e7 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -33,7 +33,7 @@ class Broker @url += '/' if '/' != @url.substr -1 # Promises some client SDP Offer. - # Registers this Snowfalke with the broker using an HTTP POST request, and + # Registers this Snowflake with the broker using an HTTP POST request, and # waits for a response containing some client offer that the Broker chooses # for this proxy.. # TODO: Actually support multiple clients. diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index b8db513..c6478cb 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -8,15 +8,17 @@ Represents a single: class ProxyPair MAX_BUFFER: 10 * 1024 * 1024 - pc: null + pc: null c2rSchedule: [] r2cSchedule: [] - client: null # WebRTC Data channel - relay: null # websocket - running: true + client: null # WebRTC Data channel + relay: null # websocket + running: true + active: false # Whether serving a client. flush_timeout_id: null constructor: (@clientAddr, @relayAddr, @rateLimit) -> + @active = false # Prepare a WebRTC PeerConnection and await for an SDP offer. begin: -> @@ -51,6 +53,7 @@ class ProxyPair log 'Invalid SDP message.' return false dbg 'SDP ' + offer.type + ' successfully received.' + @active = true true prepareDataChannel: (channel) => diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 4a98472..31a553f 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -51,10 +51,7 @@ CONFIRMATION_MESSAGE = "You're currently serving a Tor user via Snowflake." class Snowflake relayAddr: null - # TODO: Actually support multiple ProxyPairs. (makes more sense once meek- - # signalling is ready) proxyPairs: [] - proxyPair: null rateLimit: null state: MODE.INIT @@ -86,7 +83,6 @@ class Snowflake @state = MODE.WEBRTC_CONNECTING for i in [1..CONNECTIONS_PER_CLIENT] @makeProxyPair @relayAddr - @proxyPair = @proxyPairs[0] return if COPY_PASTE_ENABLED timer = null # Temporary countdown. @@ -114,17 +110,19 @@ class Snowflake findClients() - # Receive an SDP offer from some client assigned by the Broker. + # Receive an SDP offer from some client assigned by the Broker, receiveOffer: (desc) => sdp = new RTCSessionDescription desc - if @proxyPair.receiveWebRTCOffer sdp - @sendAnswer() if 'offer' == sdp.type + # Use the first proxyPair that's available. + pair = @proxyPairs.find (pp, i, arr) -> return !pp.active + if pair.receiveWebRTCOffer sdp + @sendAnswer pair if 'offer' == sdp.type - sendAnswer: => - next = (sdp) => + sendAnswer: (pair) -> + next = (sdp) -> dbg 'webrtc: Answer ready.' - @proxyPair.pc.setLocalDescription sdp - promise = @proxyPair.pc.createAnswer next + pair.pc.setLocalDescription sdp + promise = pair.pc.createAnswer next promise.then next if promise makeProxyPair: (relay) -> diff --git a/proxy/spec/snowflake.spec.coffee b/proxy/spec/snowflake.spec.coffee index 9b63419..ca7661b 100644 --- a/proxy/spec/snowflake.spec.coffee +++ b/proxy/spec/snowflake.spec.coffee @@ -49,10 +49,10 @@ describe 'Snowflake', -> it 'receives SDP offer', -> s = new Snowflake(new FakeBroker(), fakeUI) - s.proxyPair = { receiveWebRTCOffer: -> } - spyOn(s.proxyPair, 'receiveWebRTCOffer').and.returnValue true + s.proxyPairs[0] = { receiveWebRTCOffer: -> } + spyOn(s.proxyPairs[0], 'receiveWebRTCOffer').and.returnValue true spyOn(s, 'sendAnswer') - s.receiveOffer 'foo' + s.receiveOffer { 'type': 'offer', 'sdp': 'foo' } expect(s.sendAnswer).toHaveBeenCalled() it 'can make a proxypair', ->

1 0

[snowflake/master] simplify proxypair relay onclose
by arlo＠torproject.org 15 Mar '16

15 Mar '16

commit 3339b9f172c742cf9fbdaf64cb61bf32fb0070d0 Author: Serene Han <keroserene+git(a)gmail.com> Date: Sun Mar 13 22:58:11 2016 -0700 simplify proxypair relay onclose --- proxy/proxypair.coffee | 51 ++++++++++++++++++++++---------------------------- proxy/snowflake.coffee | 8 ++------ 2 files changed, 24 insertions(+), 35 deletions(-) diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index c6478cb..db53612 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -16,6 +16,7 @@ class ProxyPair running: true active: false # Whether serving a client. flush_timeout_id: null + onCleanup: null constructor: (@clientAddr, @relayAddr, @rateLimit) -> @active = false @@ -56,6 +57,7 @@ class ProxyPair @active = true true + # Given a WebRTC DataChannel, prepare callbacks. prepareDataChannel: (channel) => channel.onopen = => log 'WebRTC DataChannel opened!' @@ -64,12 +66,14 @@ class ProxyPair # This is the point when the WebRTC datachannel is done, so the next step # is to establish websocket to the server. @connectRelay() - channel.onclose = -> + channel.onclose = => log 'WebRTC DataChannel closed.' snowflake.ui.setStatus 'disconnected by webrtc.' snowflake.ui.setActive false snowflake.state = MODE.INIT - # Change this for multiplexing. + @flush() + @close() + # TODO: Change this for multiplexing. snowflake.reset() channel.onerror = -> log 'Data channel error!' channel.onmessage = @onClientToRelayMessage @@ -82,7 +86,14 @@ class ProxyPair @relay.onopen = => log @relay.label + ' connected!' snowflake.ui.setStatus 'connected' - @relay.onclose = @onClose + @relay.onclose = (event) => + ws = event.target + log ws.label + ' closed.' + snowflake.ui.setStatus 'disconnected.' + snowflake.ui.setActive false + snowflake.state = MODE.INIT + @flush() + @close() @relay.onerror = @onError @relay.onmessage = @onRelayToClientMessage @@ -105,47 +116,25 @@ class ProxyPair # log 'websocket-->WebRTC data: ' + event.data @flush() - onClose: (event) => - ws = event.target - log ws.label + ' closed.' - snowflake.ui.setStatus 'disconnected.' - snowflake.ui.setActive false - snowflake.state = MODE.INIT - @flush() - @maybeCleanup() - onError: (event) => ws = event.target log ws.label + ' error.' @close() - # we can't rely on onclose_callback to cleanup, since one common error - # case is when the client fails to connect and the relay never starts. - # in that case close() is a NOP and onclose_callback is never called. - @maybeCleanup() - webrtcIsReady: -> null != @client && 'open' == @client.readyState - relayIsReady: -> (null != @relay) && (WebSocket.OPEN == @relay.readyState) - isClosed: (ws) -> undefined == ws || WebSocket.CLOSED == ws.readyState + # Close both WebRTC and websocket. close: -> + @running = false @client.close() if @webrtcIsReady() @relay.close() if @relayIsReady() relay = null - maybeCleanup: => - if @running - @running = false - # TODO: Call external callback - true - false - - # Send as much data as the rate limit currently allows. + # Send as much data in both directions as the rate limit currently allows. flush: => clearTimeout @flush_timeout_id if @flush_timeout_id @flush_timeout_id = null busy = true checkChunks = => busy = false - # WebRTC --> websocket if @relayIsReady() && @relay.bufferedAmount < @MAX_BUFFER && @@ -154,7 +143,6 @@ class ProxyPair @rateLimit.update chunk.length @relay.send chunk busy = true - # websocket --> WebRTC if @webrtcIsReady() && @client.bufferedAmount < @MAX_BUFFER && @@ -170,3 +158,8 @@ class ProxyPair (@relayIsReady() && @relay.bufferedAmount > 0) || (@webrtcIsReady() && @client.bufferedAmount > 0) @flush_timeout_id = setTimeout @flush, @rateLimit.when() * 1000 + + webrtcIsReady: -> null != @client && 'open' == @client.readyState + relayIsReady: -> (null != @relay) && (WebSocket.OPEN == @relay.readyState) + isClosed: (ws) -> undefined == ws || WebSocket.CLOSED == ws.readyState + diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 31a553f..e8c00aa 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -131,13 +131,9 @@ class Snowflake pair.onCleanup = (event) => # Delete from the list of active proxy pairs. @proxyPairs.splice(@proxyPairs.indexOf(pair), 1) - try - pair.begin() - catch err - log 'ERROR: ProxyPair exception while connecting.' - log err - return + pair.begin() + # Stop all proxypairs. cease: -> while @proxyPairs.length > 0 @proxyPairs.pop().close()

1 0

[snowflake/master] clarify webRTCConn errorChannel and error handling
by arlo＠torproject.org 15 Mar '16

15 Mar '16

commit ba7b59f80e544bc8518366495c94040c3425c04c Author: Serene Han <keroserene+git(a)gmail.com> Date: Thu Mar 10 17:14:36 2016 -0800 clarify webRTCConn errorChannel and error handling --- client/webrtc.go | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/client/webrtc.go b/client/webrtc.go index d4c0272..af32ddd 100644 --- a/client/webrtc.go +++ b/client/webrtc.go @@ -81,6 +81,8 @@ func NewWebRTCConnection(config *webrtc.Configuration, connection.broker = broker connection.offerChannel = make(chan *webrtc.SessionDescription, 1) connection.answerChannel = make(chan *webrtc.SessionDescription, 1) + // Error channel is mostly for reporting during the initial SDP offer + // creation & local description setting, which happens asynchronously. connection.errorChannel = make(chan error, 1) connection.reset = make(chan struct{}, 1) @@ -103,8 +105,12 @@ func (c *webRTCConn) ConnectLoop() { log.Println("Establishing WebRTC connection...") // TODO: When go-webrtc is more stable, it's possible that a new // PeerConnection won't need to be re-prepared each time. - c.preparePeerConnection() - err := c.establishDataChannel() + err := c.preparePeerConnection() + if err != nil { + log.Println("WebRTC: Could not create PeerConnection.") + break + } + err = c.establishDataChannel() if err != nil { log.Println("WebRTC: Could not establish DataChannel.") } else { @@ -115,18 +121,19 @@ func (c *webRTCConn) ConnectLoop() { <-time.After(time.Second * 1) c.cleanup() } + log.Println("WebRTC cannot connect.") } // Create and prepare callbacks on a new WebRTC PeerConnection. -func (c *webRTCConn) preparePeerConnection() { +func (c *webRTCConn) preparePeerConnection() error { if nil != c.pc { c.pc.Close() c.pc = nil } pc, err := webrtc.NewPeerConnection(c.config) if err != nil { - log.Printf("NewPeerConnection: %s", err) - c.errorChannel <- err + log.Printf("NewPeerConnection ERROR: %s", err) + return err } // Prepare PeerConnection callbacks. pc.OnNegotiationNeeded = func() { @@ -162,6 +169,7 @@ func (c *webRTCConn) preparePeerConnection() { } c.pc = pc log.Println("WebRTC: PeerConnection created.") + return nil } // Create a WebRTC DataChannel locally. @@ -174,7 +182,7 @@ func (c *webRTCConn) establishDataChannel() error { // an SDP offer while other goroutines operating on this struct handle the // signaling. Eventually fires "OnOpen". if err != nil { - log.Printf("CreateDataChannel: %s", err) + log.Printf("CreateDataChannel ERROR: %s", err) return err } dc.OnOpen = func() { @@ -276,8 +284,8 @@ func (c *webRTCConn) exchangeSDP() error { log.Printf("Received Answer:\n\n%s\n", answer.Sdp) err := c.pc.SetRemoteDescription(answer) if nil != err { - log.Println("webrtc: Unable to SetRemoteDescription:", err) - // c.errorChannel <- err + log.Println("WebRTC: Unable to SetRemoteDescription:", err) + return err } return nil }

1 0