January 2016 - tor-commits - lists.torproject.org

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 22 Jan '16

22 Jan '16

commit eff9fc84bb9ad62200302b84279ca374b05e1169 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 22 21:46:48 2016 +0000 Update translations for tails-openpgp-applet --- es_AR/openpgp-applet.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es_AR/openpgp-applet.pot b/es_AR/openpgp-applet.pot index f8b31b7..08f9a8b 100644 --- a/es_AR/openpgp-applet.pot +++ b/es_AR/openpgp-applet.pot @@ -23,7 +23,7 @@ msgstr "" #: bin/openpgp-applet:175 msgid "OpenPGP encryption applet" -msgstr "" +msgstr "Applet de cifrado OpenPGP" #: bin/openpgp-applet:178 msgid "Exit" @@ -35,7 +35,7 @@ msgstr "Acerca de" #: bin/openpgp-applet:235 msgid "Encrypt Clipboard with _Passphrase" -msgstr "" +msgstr "Cifrar el portapapeles con _Frase de contraseña" #: bin/openpgp-applet:238 msgid "Sign/Encrypt Clipboard with Public _Keys"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 22 Jan '16

22 Jan '16

commit afe4ce77206a7adb21ee5ea7a3418ea484d5e8e2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 22 21:45:47 2016 +0000 Update translations for tails-misc --- es_AR.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/es_AR.po b/es_AR.po index 81a4bf5..de35cae 100644 --- a/es_AR.po +++ b/es_AR.po @@ -4,13 +4,14 @@ # # Translators: # ezemelano <melanoeze(a)gmail.com>, 2014 +# Pablo Di Noto <pdinoto(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-04 11:56+0100\n" -"PO-Revision-Date: 2016-01-06 09:25+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2016-01-11 21:00+0100\n" +"PO-Revision-Date: 2016-01-22 21:45+0000\n" +"Last-Translator: Pablo Di Noto <pdinoto(a)gmail.com>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,38 +42,38 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "\n" -msgstr "" +msgstr "<h1>¡Ayúdenos a arreglar errores!</h1>\nPor favor lea <a href=\"%s\">nuestras instrucciones sobre como reportar errores</a>.\n¡No incluya más información personal que la mínima necesaria!\n<h2>Acerca de proporcionarnos una dirección de correo electrónico</h2>\n\nAl proporcionarnos una dirección de correo electrónico nos permite contactarlo para obtener más información acerca del problema. Esto es necesario en la gran mayoría de los reportes que nos envían, ya que muchos de ellos son inútiles sin mayor información. Por otro lado, permite a un observador entrometido, como su proveedor de correo electrónico, confirmar que esta utilizando Tails.\n\n" #: config/chroot_local-includes/usr/local/bin/electrum:14 msgid "Persistence is disabled for Electrum" -msgstr "" +msgstr "El modo persistencia de datos esa deshabilitado para Electrum" #: config/chroot_local-includes/usr/local/bin/electrum:16 msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your " "Bitcoin wallet. It is strongly recommended to only run Electrum when its " "persistence feature is activated." -msgstr "" +msgstr "Cuando reinicie el sistema Tails, todos los datos de Electrum, incluyendo su monedero Bitcoin, se perderán. Se recomienda utilizar Electrum unicamente cuando el modo persistencia de datos esta habilitado." #: config/chroot_local-includes/usr/local/bin/electrum:18 msgid "Do you want to start Electrum anyway?" -msgstr "" +msgstr "¿Desea utizar Electrum de todos modos?" #: config/chroot_local-includes/usr/local/bin/electrum:20 #: config/chroot_local-includes/usr/local/bin/icedove:22 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 msgid "_Launch" -msgstr "" +msgstr "_Iniciar" #: config/chroot_local-includes/usr/local/bin/electrum:21 #: config/chroot_local-includes/usr/local/bin/icedove:23 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37 msgid "_Exit" -msgstr "" +msgstr "_Salir" #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet" -msgstr "" +msgstr "Applet de cifrado OpenPGP" #: config/chroot_local-includes/usr/local/bin/gpgApplet:139 msgid "Exit"

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 22 Jan '16

22 Jan '16

commit f22642f0a01bd1c0dde4d38c640513318f0bb216 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 22 21:45:30 2016 +0000 Update translations for tails-greeter_completed --- es_AR/es_AR.po | 188 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po new file mode 100644 index 0000000..9a2282c --- /dev/null +++ b/es_AR/es_AR.po @@ -0,0 +1,188 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# ezemelano <melanoeze(a)gmail.com>, 2014 +# Pablo Di Noto <pdinoto(a)gmail.com>, 2016 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-01-11 15:05+0100\n" +"PO-Revision-Date: 2016-01-22 21:29+0000\n" +"Last-Translator: Pablo Di Noto <pdinoto(a)gmail.com>\n" +"Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_AR\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../glade/persistencewindow.glade.h:1 +msgid "Forward" +msgstr "Reeviar" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 +msgid "Login" +msgstr "Iniciar sesión" + +#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2 +msgid "Welcome to Tails" +msgstr "Bienvenido a Tails" + +#: ../glade/persistencewindow.glade.h:4 +msgid "Use persistence?" +msgstr "¿Habilitar persistencia de datos?" + +#: ../glade/persistencewindow.glade.h:5 +msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentación</a>" + +#: ../glade/persistencewindow.glade.h:6 +msgid "Yes" +msgstr "Si" + +#: ../glade/persistencewindow.glade.h:7 +msgid "No" +msgstr "No" + +#: ../glade/persistencewindow.glade.h:8 +msgid "Passphrase:" +msgstr "Frase de contraseña:" + +#: ../glade/persistencewindow.glade.h:9 +msgid "Read-Only?" +msgstr "¿Habilitar modo solo lectura?" + +#: ../glade/persistencewindow.glade.h:10 +msgid "Wrong passphrase. Please try again." +msgstr "Frase de contraseña incorrecta. Por favor intente nuevamente." + +#: ../glade/persistencewindow.glade.h:11 +msgid "More options?" +msgstr "Mas opciones?" + +#: ../glade/optionswindow.glade.h:3 +msgid "Administration password" +msgstr "Contraseña de administración" + +#: ../glade/optionswindow.glade.h:4 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentación</a>" + +#: ../glade/optionswindow.glade.h:5 +msgid "" +"Enter an administration password in case you need to perform administration tasks.\n" +"Otherwise it will be disabled for better security." +msgstr "Introduzca una contraseña de administración por si acaso necesita realizar alguna tarea administrativa.\nSi no lo hace, el usuario administrador será deshabilitado para mayor seguridad." + +#: ../glade/optionswindow.glade.h:7 +msgid "Password:" +msgstr "Contraseña:" + +#: ../glade/optionswindow.glade.h:8 +msgid "Verify Password:" +msgstr "Verificar contraseña:" + +#: ../glade/optionswindow.glade.h:9 +msgid "Passwords do not match" +msgstr "La contraseña no concuerda" + +#: ../glade/optionswindow.glade.h:10 +msgid "MAC address spoofing" +msgstr "Ocultar la dirección MAC" + +#: ../glade/optionswindow.glade.h:11 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentación</a>" + +#: ../glade/optionswindow.glade.h:12 +msgid "" +"Spoofing MAC addresses hides the serial number of your network cards to the " +"local networks. This can help you hide your geographical location." +msgstr "La opción de ocultar la dirección MAC utiliza una dirección alternativa para no revelar la dirección de fábrica de sus adaptadores de red. Esto puede evitar revelar su ubicación geográfica." + +#: ../glade/optionswindow.glade.h:13 +msgid "" +"It is generally safer to spoof MAC addresses, but it might also raise " +"suspicion or cause network connection problems." +msgstr "En general, es más seguro ocultar sus direcciones MAC, pero es posible que despierte sospechas o cause problemas de conexión en la red." + +#: ../glade/optionswindow.glade.h:14 +msgid "Spoof all MAC addresses" +msgstr "Ocultar todas las direcciones MAC" + +#: ../glade/optionswindow.glade.h:15 +msgid "Network configuration" +msgstr "Configuración de red" + +#: ../glade/optionswindow.glade.h:16 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentación</a>" + +#: ../glade/optionswindow.glade.h:17 +msgid "" +"This computer's Internet connection is clear of obstacles. You would like to" +" connect directly to the Tor network." +msgstr "Este computador esta conectado a Internet sin obstáculos Quizás quiera directamente a la red Tor." + +#: ../glade/optionswindow.glade.h:18 +msgid "" +"This computer's Internet connection is censored, filtered, or proxied. You " +"need to configure bridge, firewall, or proxy settings." +msgstr "Este computador esta conectado a Internet utilizando un servicio que esta censurado, tiene filtros o un servidor proxy. Debe configurar un bridge, cortafuegos o proxy." + +#: ../glade/optionswindow.glade.h:19 +msgid "Disable all networking" +msgstr "Deshabilitar toda forma de conexión a redes" + +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr " " + +#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43 +msgid "Language" +msgstr "Idioma" + +#: ../glade/langpanel.glade.h:3 +msgid "Locale" +msgstr "Ubicacion" + +#: ../glade/langpanel.glade.h:4 +msgid "Layout" +msgstr "Distribución" + +#: ../tailsgreeter/persistence.py:59 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stderr)s" +msgstr "live-persist ha fallado con código de error %(returncode)s:\n%(stderr)s" + +#: ../tailsgreeter/persistence.py:99 +#, python-format +msgid "" +"cryptsetup failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "cryptsetup ha fallado con código de error %(returncode)s:\n%(stdout)s\n%(stderr)s" + +#: ../tailsgreeter/persistence.py:124 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "live-persist ha fallado con código de error %(returncode)s:\n%(stdout)s\n%(stderr)s" + +#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167 +#: ../tailsgreeter/langpanel.py:200 +msgid "Other..." +msgstr "Otro..."

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 22 Jan '16

22 Jan '16

commit a6e24c930237f6655b0c35e48770f1ff83efec4b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 22 21:45:24 2016 +0000 Update translations for tails-greeter --- es_AR/es_AR.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po index 18b53db..9a2282c 100644 --- a/es_AR/es_AR.po +++ b/es_AR/es_AR.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-11 15:05+0100\n" -"PO-Revision-Date: 2016-01-22 21:15+0000\n" +"PO-Revision-Date: 2016-01-22 21:29+0000\n" "Last-Translator: Pablo Di Noto <pdinoto(a)gmail.com>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -57,7 +57,7 @@ msgstr "¿Habilitar modo solo lectura?" #: ../glade/persistencewindow.glade.h:10 msgid "Wrong passphrase. Please try again." -msgstr "" +msgstr "Frase de contraseña incorrecta. Por favor intente nuevamente." #: ../glade/persistencewindow.glade.h:11 msgid "More options?" @@ -77,11 +77,11 @@ msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.htm msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." -msgstr "" +msgstr "Introduzca una contraseña de administración por si acaso necesita realizar alguna tarea administrativa.\nSi no lo hace, el usuario administrador será deshabilitado para mayor seguridad." #: ../glade/optionswindow.glade.h:7 msgid "Password:" -msgstr "Constraseña:" +msgstr "Contraseña:" #: ../glade/optionswindow.glade.h:8 msgid "Verify Password:" @@ -99,7 +99,7 @@ msgstr "Ocultar la dirección MAC" msgid "" "<a " "href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentación</a>" #: ../glade/optionswindow.glade.h:12 msgid "" @@ -111,7 +111,7 @@ msgstr "La opción de ocultar la dirección MAC utiliza una dirección alternati msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " "suspicion or cause network connection problems." -msgstr "" +msgstr "En general, es más seguro ocultar sus direcciones MAC, pero es posible que despierte sospechas o cause problemas de conexión en la red." #: ../glade/optionswindow.glade.h:14 msgid "Spoof all MAC addresses" @@ -125,13 +125,13 @@ msgstr "Configuración de red" msgid "" "<a " "href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentación</a>" #: ../glade/optionswindow.glade.h:17 msgid "" "This computer's Internet connection is clear of obstacles. You would like to" " connect directly to the Tor network." -msgstr "Este computador esta conectado a Internet sin obstáculos ¿Desea conectarse directamente a la red Tor?" +msgstr "Este computador esta conectado a Internet sin obstáculos Quizás quiera directamente a la red Tor." #: ../glade/optionswindow.glade.h:18 msgid "" @@ -145,7 +145,7 @@ msgstr "Deshabilitar toda forma de conexión a redes" #: ../glade/langpanel.glade.h:1 msgid " " -msgstr "" +msgstr " " #: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43 msgid "Language" @@ -164,7 +164,7 @@ msgstr "Distribución" msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stderr)s" -msgstr "" +msgstr "live-persist ha fallado con código de error %(returncode)s:\n%(stderr)s" #: ../tailsgreeter/persistence.py:99 #, python-format @@ -172,7 +172,7 @@ msgid "" "cryptsetup failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "" +msgstr "cryptsetup ha fallado con código de error %(returncode)s:\n%(stdout)s\n%(stderr)s" #: ../tailsgreeter/persistence.py:124 #, python-format @@ -180,9 +180,9 @@ msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "" +msgstr "live-persist ha fallado con código de error %(returncode)s:\n%(stdout)s\n%(stderr)s" #: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167 #: ../tailsgreeter/langpanel.py:200 msgid "Other..." -msgstr "" +msgstr "Otro..."

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 22 Jan '16

22 Jan '16

commit 3d7aeb4ac1070d4e43606efadb2cf744537d25c0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 22 21:15:25 2016 +0000 Update translations for tails-greeter --- es_AR/es_AR.po | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po index e386d44..18b53db 100644 --- a/es_AR/es_AR.po +++ b/es_AR/es_AR.po @@ -4,13 +4,14 @@ # # Translators: # ezemelano <melanoeze(a)gmail.com>, 2014 +# Pablo Di Noto <pdinoto(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-16 18:12+0100\n" -"PO-Revision-Date: 2015-12-21 09:22+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2016-01-11 15:05+0100\n" +"PO-Revision-Date: 2016-01-22 21:15+0000\n" +"Last-Translator: Pablo Di Noto <pdinoto(a)gmail.com>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +33,7 @@ msgstr "Bienvenido a Tails" #: ../glade/persistencewindow.glade.h:4 msgid "Use persistence?" -msgstr "" +msgstr "¿Habilitar persistencia de datos?" #: ../glade/persistencewindow.glade.h:5 msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" @@ -52,7 +53,7 @@ msgstr "Frase de contraseña:" #: ../glade/persistencewindow.glade.h:9 msgid "Read-Only?" -msgstr "" +msgstr "¿Habilitar modo solo lectura?" #: ../glade/persistencewindow.glade.h:10 msgid "Wrong passphrase. Please try again." @@ -64,7 +65,7 @@ msgstr "Mas opciones?" #: ../glade/optionswindow.glade.h:3 msgid "Administration password" -msgstr "" +msgstr "Contraseña de administración" #: ../glade/optionswindow.glade.h:4 msgid "" @@ -92,7 +93,7 @@ msgstr "La contraseña no concuerda" #: ../glade/optionswindow.glade.h:10 msgid "MAC address spoofing" -msgstr "" +msgstr "Ocultar la dirección MAC" #: ../glade/optionswindow.glade.h:11 msgid "" @@ -104,7 +105,7 @@ msgstr "" msgid "" "Spoofing MAC addresses hides the serial number of your network cards to the " "local networks. This can help you hide your geographical location." -msgstr "" +msgstr "La opción de ocultar la dirección MAC utiliza una dirección alternativa para no revelar la dirección de fábrica de sus adaptadores de red. Esto puede evitar revelar su ubicación geográfica." #: ../glade/optionswindow.glade.h:13 msgid "" @@ -114,11 +115,11 @@ msgstr "" #: ../glade/optionswindow.glade.h:14 msgid "Spoof all MAC addresses" -msgstr "" +msgstr "Ocultar todas las direcciones MAC" #: ../glade/optionswindow.glade.h:15 msgid "Network configuration" -msgstr "" +msgstr "Configuración de red" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -130,17 +131,17 @@ msgstr "" msgid "" "This computer's Internet connection is clear of obstacles. You would like to" " connect directly to the Tor network." -msgstr "" +msgstr "Este computador esta conectado a Internet sin obstáculos ¿Desea conectarse directamente a la red Tor?" #: ../glade/optionswindow.glade.h:18 msgid "" "This computer's Internet connection is censored, filtered, or proxied. You " "need to configure bridge, firewall, or proxy settings." -msgstr "" +msgstr "Este computador esta conectado a Internet utilizando un servicio que esta censurado, tiene filtros o un servidor proxy. Debe configurar un bridge, cortafuegos o proxy." #: ../glade/optionswindow.glade.h:19 msgid "Disable all networking" -msgstr "" +msgstr "Deshabilitar toda forma de conexión a redes" #: ../glade/langpanel.glade.h:1 msgid " " @@ -148,15 +149,15 @@ msgstr "" #: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43 msgid "Language" -msgstr "Lenguaje" +msgstr "Idioma" #: ../glade/langpanel.glade.h:3 msgid "Locale" -msgstr "" +msgstr "Ubicacion" #: ../glade/langpanel.glade.h:4 msgid "Layout" -msgstr "" +msgstr "Distribución" #: ../tailsgreeter/persistence.py:59 #, python-format

1 0

[snowflake/master] Snowflake proxy successfully reset and bootstrap a new client (#15)
by serene＠torproject.org 22 Jan '16

22 Jan '16

commit 77fbfe0e667886945df0755d19edfca11712f840 Author: Serene Han <keroserene+git(a)gmail.com> Date: Fri Jan 22 12:22:09 2016 -0800 Snowflake proxy successfully reset and bootstrap a new client (#15) --- broker/snowflake-broker.go | 2 ++ proxy/broker.coffee | 1 - proxy/proxypair.coffee | 18 +++++++++++++++--- proxy/snowflake.coffee | 37 ++++++++++++++++--------------------- 4 files changed, 33 insertions(+), 25 deletions(-) diff --git a/broker/snowflake-broker.go b/broker/snowflake-broker.go index 13b0586..a6daa87 100644 --- a/broker/snowflake-broker.go +++ b/broker/snowflake-broker.go @@ -171,7 +171,9 @@ func proxyHandler(w http.ResponseWriter, r *http.Request) { w.Write(offer) case <-time.After(time.Second * 10): + // This snowflake is no longer available to serve clients. heap.Remove(snowflakes, snowflake.index) + delete(snowflakeMap, snowflake.id) w.WriteHeader(http.StatusGatewayTimeout) } } diff --git a/proxy/broker.coffee b/proxy/broker.coffee index 91a81d2..34b5a88 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -69,7 +69,6 @@ class Broker return xhr.onreadystatechange = -> return if xhr.DONE != xhr.readyState - log xhr switch xhr.status when STATUS_OK log 'Broker: Successfully replied with answer.' diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index f78e9f6..cd87208 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -19,7 +19,8 @@ class ProxyPair constructor: (@clientAddr, @relayAddr, @rateLimit) -> - connectClient: => + # Prepare a WebRTC PeerConnection and await for an SDP offer. + begin: -> @pc = new PeerConnection config, { optional: [ { DtlsSrtpKeyAgreement: true } @@ -44,6 +45,16 @@ class ProxyPair @prepareDataChannel channel @client = channel + receiveWebRTCOffer: (offer) -> + console.assert 'offer' == offer.type + try + err = @pc.setRemoteDescription offer + catch e + log 'Invalid SDP message.' + return false + log 'SDP ' + offer.type + ' successfully received.' + true + prepareDataChannel: (channel) => channel.onopen = => log 'Data channel opened!' @@ -56,8 +67,9 @@ class ProxyPair log 'Data channel closed.' snowflake.state = MODE.INIT $msglog.className = '' - channel.onerror = -> - log 'Data channel error!' + # Change this for multiplexing. + snowflake.reset() + channel.onerror = -> log 'Data channel error!' channel.onmessage = @onClientToRelayMessage # Assumes WebRTC datachannel is connected. diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index cc34f81..edf5e56 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -87,21 +87,17 @@ class Snowflake return false @relayAddr = addr log 'Using ' + relayAddr + ' as Relay.' - @beginWebRTC() - log 'Input offer from the snowflake client:' + log 'Input offer from the snowflake client:' if COPY_PASTE_ENABLED return true # Initialize WebRTC PeerConnection beginWebRTC: -> - log 'Starting up Snowflake...\n' @state = MODE.WEBRTC_CONNECTING for i in [1..CONNECTIONS_PER_CLIENT] @makeProxyPair @relayAddr @proxyPair = @proxyPairs[0] - - # Poll broker for clients. - findClients: -> - poll = => + # Poll broker for clients. + findClients = => recv = broker.getClientOffer() recv.then((desc) => offer = JSON.parse desc @@ -109,21 +105,15 @@ class Snowflake @receiveOffer offer , (err) -> log err - setTimeout(poll, 1000) + setTimeout(findClients, 1000) ) - poll() + findClients() - # Receive an SDP offer from client plugin. + # Receive an SDP offer from some client assigned by the Broker. receiveOffer: (desc) => sdp = new RTCSessionDescription desc - try - err = @proxyPair.pc.setRemoteDescription sdp - catch e - log 'Invalid SDP message.' - return false - log 'SDP ' + sdp.type + ' successfully received.' - @sendAnswer() if 'offer' == sdp.type - true + if @proxyPair.receiveWebRTCOffer sdp + @sendAnswer() if 'offer' == sdp.type sendAnswer: => next = (sdp) => @@ -132,7 +122,6 @@ class Snowflake promise = @proxyPair.pc.createAnswer next promise.then next if promise - makeProxyPair: (relay) -> pair = new ProxyPair null, relay, @rateLimit @proxyPairs.push pair @@ -141,7 +130,7 @@ class Snowflake @proxyPairs.splice(@proxyPairs.indexOf(pair), 1) @badge.endProxy() if @badge try - pair.connectClient() + pair.begin() catch err log 'ERROR: ProxyPair exception while connecting.' log err @@ -162,6 +151,12 @@ class Snowflake @cease() @badge.die() if @badge + # Close all existing ProxyPairs and begin finding new clients from scratch. + reset: -> + @cease() + log '\nSnowflake resetting...' + @beginWebRTC() + snowflake = null broker = null @@ -241,6 +236,6 @@ init = -> log 'Input desired relay address:' else snowflake.setRelayAddr DEFAULT_WEBSOCKET - snowflake.findClients() + snowflake.beginWebRTC() window.onload = init if window

1 0

[nyx/master] Cache manual when read from 'man tor'
by atagar＠torproject.org 22 Jan '16

22 Jan '16

commit 46cead2bc4439e227d65c410b461769c36948f4d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 22 09:23:38 2016 -0800 Cache manual when read from 'man tor' When available we run 'man tor' to get manual information about the user's specific version. This is a neat trick, but it takes over twice as long as reading our pre-parsed manual information. After parsing a manual caching the result to disk so running nyx in the future is a lot quicker. --- nyx/arguments.py | 4 ++-- nyx/config_panel.py | 23 +++++++++++++++++------ nyx/util/__init__.py | 1 + 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/nyx/arguments.py b/nyx/arguments.py index 4351974..7510057 100644 --- a/nyx/arguments.py +++ b/nyx/arguments.py @@ -10,7 +10,7 @@ import nyx import stem.util.connection -from nyx.util import tor_controller, msg +from nyx.util import DATA_DIR, tor_controller, msg DEFAULT_ARGS = { 'control_address': '127.0.0.1', @@ -18,7 +18,7 @@ DEFAULT_ARGS = { 'user_provided_port': False, 'control_socket': '/var/run/tor/control', 'user_provided_socket': False, - 'config': os.path.expanduser('~/.nyx/nyxrc'), + 'config': os.path.join(DATA_DIR, 'nyxrc'), 'debug_path': None, 'logged_events': 'N3', 'print_version': False, diff --git a/nyx/config_panel.py b/nyx/config_panel.py index 8f71861..2352fe7 100644 --- a/nyx/config_panel.py +++ b/nyx/config_panel.py @@ -4,6 +4,7 @@ and the resulting configuration files saved. """ import curses +import os import nyx.controller import nyx.popups @@ -11,7 +12,7 @@ import nyx.popups import stem.control import stem.manual -from nyx.util import panel, tor_controller, ui_tools +from nyx.util import DATA_DIR, panel, tor_controller, ui_tools from stem.util import conf, enum, log, str_tools @@ -122,11 +123,21 @@ class ConfigPanel(panel.Panel): self._sort_order = CONFIG['features.config.order'] self._show_all = False # show all options, or just the important ones - try: - manual = stem.manual.Manual.from_man() - except IOError as exc: - log.debug("Unable to use 'man tor' to get information about config options (%s), using bundled information instead" % exc) - manual = stem.manual.Manual.from_cache() + cached_manual_path = os.path.join(DATA_DIR, 'manual') + + if os.path.exists(cached_manual_path): + manual = stem.manual.Manual.from_cache(cached_manual_path) + else: + try: + manual = stem.manual.Manual.from_man() + + try: + manual.save(cached_manual_path) + except IOError as exc: + log.debug("Unable to cache manual information to '%s'. This is fine, but means starting Nyx takes a little longer than usual: " % (cached_manual_path, exc)) + except IOError as exc: + log.debug("Unable to use 'man tor' to get information about config options (%s), using bundled information instead" % exc) + manual = stem.manual.Manual.from_cache() try: for line in tor_controller().get_info('config/names').splitlines(): diff --git a/nyx/util/__init__.py b/nyx/util/__init__.py index c19b9c7..12b5ace 100644 --- a/nyx/util/__init__.py +++ b/nyx/util/__init__.py @@ -23,6 +23,7 @@ __all__ = [ TOR_CONTROLLER = None BASE_DIR = os.path.sep.join(__file__.split(os.path.sep)[:-2]) +DATA_DIR = os.path.expanduser('~/.nyx') TESTING = False try:

1 0

[stem/master] Have Config's save() make directories it needs
by atagar＠torproject.org 22 Jan '16

22 Jan '16

commit bb74233dd633e4bf3c90e3ab09efe3063b48cd30 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 22 09:01:34 2016 -0800 Have Config's save() make directories it needs Honestly it's always bugged me that write functions don't do this. Oh, directory foo doesn't exist? Then... umm, make it? I understand you gotta treat computers like a brain damaged infant but come on. It's 2016. Why don't standard libs have a reasonable default. </rant> Anyway, having our save() method do the sane thing. --- stem/util/conf.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stem/util/conf.py b/stem/util/conf.py index 18226d8..134766c 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -552,6 +552,9 @@ class Config(object): raise ValueError('Unable to save configuration: no path provided') with self._contents_lock: + if not os.path.exists(os.path.dirname(self._path)): + os.makedirs(os.path.dirname(self._path)) + with open(self._path, 'w') as output_file: for entry_key in self.keys(): for entry_value in self.get_value(entry_key, multiple = True):

1 0

[stem/master] Adjusting benchmark for parsing with compression
by atagar＠torproject.org 22 Jan '16

22 Jan '16

commit af08b679715d8046aafcea89494d5bc4e0e96407 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 22 08:46:56 2016 -0800 Adjusting benchmark for parsing with compression Earlier I adjusted Stem's benchmarks for when calling parse_file() rather than the DescriptorReader. This was a ~5% improvement but I didn't have a number for compression so I left it as-is. This, however, made it look like the compression delta for python is particularly bad. Subtracting the flat overhead for the DescriptorReader from that benchmark... uncompressed consensus: 876.09 -> 865.72 (-10.37ms) compressed consensus: 913.12 -> 902.75 --- docs/tutorials/mirror_mirror_on_the_wall.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorials/mirror_mirror_on_the_wall.rst b/docs/tutorials/mirror_mirror_on_the_wall.rst index e5b423e..3f80db0 100644 --- a/docs/tutorials/mirror_mirror_on_the_wall.rst +++ b/docs/tutorials/mirror_mirror_on_the_wall.rst @@ -310,7 +310,7 @@ Few things to note about these benchmarks... * Metrics-lib and Stem can both read from compressed tarballs at a small performance cost. For instance, Metrics-lib can read an `lzma compressed <../faq.html#how-do-i-read-tar-xz-descriptor-archives>`_ consensus in - **255.76 ms** and Stem can do it in **913.12 ms**. + **255.76 ms** and Stem can do it in **902.75 ms**. So what does code with each of these look like?

1 0

[tor-browser-bundle/maint-5.5] Changelog fixup
by gk＠torproject.org 22 Jan '16

22 Jan '16

commit f2681509eb0c5a62fce4bc60c28b9170e3b74c85 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 22 15:02:20 2016 +0000 Changelog fixup --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 6042c2f..d08a7bc 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -24,6 +24,7 @@ Tor Browser 5.5 -- January 26 2016 * Bug 16940: After update, load local change notes * Bug 17759: Apply whitelist to local fonts in @font-face (fix of #13313) * Bug 17009: Shift and Alt keys leak physical keyboard layout (fix of #15646) + * Bug 17790: Map the proper SHIFT characters to the digit keys (fix of #15646) * Bug 17369: Disable RC4 fallback * Bug 17442: Remove custom updater certificate pinning * Bug 16620: Move window.name handling into a Firefox patch

1 0