- tor-commits - lists.torproject.org

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 08 Feb '16

08 Feb '16

commit d0e5bfd983b369f286d53d3c83dc3d0e0c02db79 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 8 21:15:07 2016 +0000 Update translations for bridgedb --- es_AR/LC_MESSAGES/bridgedb.po | 336 +++++++++++++++++++++--------------------- ka/LC_MESSAGES/bridgedb.po | 4 +- 2 files changed, 171 insertions(+), 169 deletions(-) diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po index 676f222..8c2aa0c 100644 --- a/es_AR/LC_MESSAGES/bridgedb.po +++ b/es_AR/LC_MESSAGES/bridgedb.po @@ -9,17 +9,19 @@ # Daniel Gray, 2015 # José Fabián <ar.jfabian+transifex(a)gmail.com>, 2014 # 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: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-08-19 04:04+0000\n" -"Last-Translator: Alfredo Chaves <achaves.blg(a)gmail.com>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2016-02-05 14:24+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" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: es_AR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -34,57 +36,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "¡Lo sentimos! Algo salió mal con su solicitud." -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "Reportar un error" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "Código fuente" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "Log de cambios" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "Contacto" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "Seleccionar Todos" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "Mostrar Código QR" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "Código QR para sus líneas de puentes de red" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "¡Oh, sonamos!" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "Ha ocurrido un error al obtener su código QR." + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Este código QR contiene sus lineas de puente de red. Escaneelo con un lector de códigos QR hacia su dispositivo móvil y otros." + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "En este momento no existen puentes de red disponibles..." + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Tal vez debería %s volver %s y escoger otro tipo de puente de red." + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Paso %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Descargar %s Tor Browser %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Paso %s2%s" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "Obtener %s puentes de red %s" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Paso %s3%s" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Ahora %s agregue los puentes de red al Buscador Tor %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sS%solamente deme puentes de red!" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "Opciones avanzadas" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "No" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "ninguno" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "%sS%si!" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "%sO%sbtener puentes de red" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "[Este es un mensaje automático; por favor, no responda.]" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "Aquí están sus puentes de red:" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format 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 "Se ha excedido el límite de la tasa. Por favor, vaya más despacio! El tiempo mínimo entre emails es %s horas. Todos los emails siguientes en este lapso de tiempo serán ignorados." -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "COMMANDs: (combine COMMANDs para especificar opciones múltiples simultáneamente)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "Bienvenido a BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "TYPEs de transporte comunmente soportados" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "¡Eh, %s!" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "Hola amigo!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "Llaves públicas" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -95,7 +222,7 @@ msgstr "Este email fue generado con arcoiris, unicornios y destellos para %s sob #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor". #. TRANSLATORS: Please DO NOT translate "Tor Network". -#: lib/bridgedb/strings.py:47 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -106,7 +233,7 @@ msgid "" msgstr "BridgeDB puede proveerle puentes de red con varios %stipos de Transportes Conectables%s, que pueden ayudar a ofuscar sus conexiones a la Red de Tor, haciendo más difícil que alguien que observe su tráfico de internet determine que usted está usando Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -118,7 +245,7 @@ msgstr "Algunos puentes de red con direcciones IPv6 también están disponibles, #. regular, or unexciting". Like vanilla ice cream. It refers to bridges #. which do not have Pluggable Transports, and only speak the regular, #. boring Tor protocol. Translate it as you see fit. Have fun with it. -#: lib/bridgedb/strings.py:63 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -127,20 +254,20 @@ msgid "" "\n" msgstr "Adicionalmente, BridgeDB tiene varios puentes de red comunes y corrientes %s sin Transportes Conectables %s que tal vez no suenen tan genial, pero aún pueden ayudar a burlar la censura de internet en muchos casos.\n" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "¿Qué son los puentes de red?" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "%s Los Puentes de Red %s son nodos de retransmisión de Tor que le ayudan a evitar la censura." -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "¡Necesito una manera alternativa de obtener puentes!" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -148,12 +275,12 @@ msgid "" "%s, %s or %s." msgstr "Otra manera de obtener puentes de red es enviando un correo electrónico a %s. Por favor note que debe enviar el correo usando una dirección de uno de los siguientes proveedores de correo electrónico: %s, %s o %s." -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "¡Mis puentes no funcionan! Necesito ayuda!" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "Si Tor no funciona, envíe un mensaje a %s." @@ -161,48 +288,48 @@ msgstr "Si Tor no funciona, envíe un mensaje a %s." #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:96 +#: bridgedb/strings.py:121 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "Intente incluir toda la información posible sobre su caso, incluyendo la lista de puentes de red y Transportes Conectables que intentó usar, la versión de su Navegador Tor, y cualquier mensaje que Tor haya presentado, etc." -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "Aquí están sus líneas de puentes de red:" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "Obtenga Puentes de Red!" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "Por favor seleccione opciones para su tipo de puente de red:" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "¿Necesita direcciones IPv6?" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "Necesita una %s?" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "Su navegador no muestra las imágenes correctamente." -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "Ingrese los caracteres de la imagen..." -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "Cómo comenzar a usar sus puentes de red" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -211,21 +338,21 @@ msgid "" msgstr "Para introducir puentes de red a su Navegador Tor, primeramente vaya a %s la página de descarga del Navegador Tor %s y siga las instrucciones ahí para descargar y ejecutar el Navegador Tor." #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Cuando el diálogo de 'Configuración de Red de Tor' aparezca, haga click en 'Configurar' y continúe con los pasos del asistente hasta que pregunte:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "¿Su Proveedor de Servicios de Internet (ISP) bloquea o de algún modo censura conexiones a la red Tor?" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:134 +#: bridgedb/strings.py:159 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -233,153 +360,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Seleccione 'Sí' y luego haga click en 'Siguiente'. Para configurar sus nuevos puentes, copie y pegue las líneas de sus puentes de red al cuadro de texto. Finalmente, haga click en 'Conectar' y, ¡eso debería de ser todo! Si experimenta algún problema, intenté hacer click en el botón 'Ayuda' del asistente de 'Configuración de la Red Tor' para recibir más asistencia." -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 msgid "Displays this message." msgstr "Mostrar el mensaje." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: lib/bridgedb/strings.py:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "Pedir puentes de red normales." -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "Solicitar puentes de red IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "Pedir un Transporte Conectable por TIPO." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Obtener una copia de la llave pública GnuPG de BridgeDB." - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "Reportar un error" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "Código fuente" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "Log de cambios" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "Contacto" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "Seleccionar Todos" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "Mostrar Código QR" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "Código QR para sus líneas de puentes de red" - -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:115 -#: lib/bridgedb/templates/bridges.html:175 -msgid "Uh oh, spaghettios!" -msgstr "Vaya, vaya, que rollo..." - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "Ha ocurrido un error al obtener su código QR." - -#: lib/bridgedb/templates/bridges.html:121 -msgid "" -"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" -" your bridge lines onto mobile and other devices." -msgstr "Este código QR contiene sus lineas de puente de red. Escaneelo con un lector de códigos QR hacia su dispositivo móvil y otros." - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "En este momento no existen puentes de red disponibles..." - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "Tal vez debería %s volver %s y escoger otro tipo de puente de red." - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "Paso %s1%s" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "Descargar %s Tor Browser %s" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "Paso %s2%s" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "Obtener %s puentes de red %s" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "Paso %s3%s" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Ahora %s agregue los puentes de red al Buscador Tor %s" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. (These are used to insert HTML5 underlining tags, to mark accesskeys -#. for disabled users.) -#: lib/bridgedb/templates/options.html:38 -#, python-format -msgid "%sJ%sust give me bridges!" -msgstr "%sS%solamente deme puentes de red!" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "Opciones avanzadas" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "No" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "ninguno" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:127 -#, python-format -msgid "%sY%ses!" -msgstr "%sS%si!" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:151 -#, python-format -msgid "%sG%set Bridges" -msgstr "%sO%sbtener puentes de red" diff --git a/ka/LC_MESSAGES/bridgedb.po b/ka/LC_MESSAGES/bridgedb.po index 2ee7c30..c4ff08f 100644 --- a/ka/LC_MESSAGES/bridgedb.po +++ b/ka/LC_MESSAGES/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-10-18 17:27+0000\n" +"PO-Revision-Date: 2016-02-06 12:31+0000\n" "Last-Translator: Shanidze <sandro.shanidze(a)gmail.com>\n" "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n" "MIME-Version: 1.0\n" @@ -138,7 +138,7 @@ msgstr "" #: bridgedb/https/templates/options.html:86 msgid "No" -msgstr "" +msgstr "არა" #: bridgedb/https/templates/options.html:87 msgid "none"

1 0

[tor-browser-bundle/hardened-builds] Bug 18198: Building the hardened series on Wheezy fails
by gk＠torproject.org 08 Feb '16

08 Feb '16

commit 00eca1bfd413174856b5eacfc97fd183a762f5da Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 1 20:27:16 2016 +0000 Bug 18198: Building the hardened series on Wheezy fails It seems using our own binutils for our utils leads to the breakage. Let's skip that for now. --- gitian/descriptors/linux/gitian-utils.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index a742c4e..1e3102f 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -60,7 +60,6 @@ script: | make $MAKEOPTS make install cd .. - export PATH=$INSTDIR/binutils/bin:$PATH # Building GCC tar xjf gcc.tar.bz2

1 0

[tor-browser-bundle/hardened-builds] Bump Gitian tag for building on Wheezy
by gk＠torproject.org 08 Feb '16

08 Feb '16

commit 1df2c463289264e9b6a44d7435ca26c69906c6bd Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 1 20:40:32 2016 +0000 Bump Gitian tag for building on Wheezy --- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 3f2df43..98881d5 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -40,7 +40,7 @@ GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux +GITIAN_TAG=tor-browser-builder-3.x-9 OPENSSL_VER=1.0.1q GMP_VER=5.1.3 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 66ad9d1..876d00b 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -43,7 +43,7 @@ GO_X_NET_TAG=master OBFS4_TAG=master NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux +GITIAN_TAG=tor-browser-builder-3.x-9 OPENSSL_VER=1.0.1q GMP_VER=5.1.3

1 0

[exonerator/master] Fix query that took almost forever.
by karsten＠torproject.org 08 Feb '16

08 Feb '16

commit 155cfffbb1b7f969bb1331a07da0a95a3de409cf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Nov 19 12:20:58 2015 +0100 Fix query that took almost forever. Queries that match one or more exit list entries took almost forever, because avoided all the fine indexes we created for it. The workaround is to search by /24 of the requested IP address (or /48 in case of IPv6) which we already have in the database. We should want to do this anyway to avoid making subsequent queries if there's no hit for the exact IP address that was requested. Fixes #17488. Thanks, starlight, for all the feedback! --- db/exonerator.sql | 63 +++++++---- .../torproject/exonerator/ExoneraTorServlet.java | 121 ++++++++++++++------- 2 files changed, 119 insertions(+), 65 deletions(-) diff --git a/db/exonerator.sql b/db/exonerator.sql index fda9071..04dc528 100755 --- a/db/exonerator.sql +++ b/db/exonerator.sql @@ -68,6 +68,11 @@ CREATE INDEX statusentry_oraddress24_validafterdate CREATE INDEX statusentry_oraddress48_validafterdate ON statusentry (oraddress48, DATE(validafter)); +-- The index on fingerprint and valid-after time speeds up joins with +-- exitlistentry. +CREATE INDEX statusentry_fingerprint_validafter_fingerprint + ON statusentry (fingerprint, validafter); + -- The exitlistentry table stores the results of the active testing, -- DNS-based exit list for exit nodes. An entry in this table means that -- a relay was scanned at a given time and found to be exiting to the @@ -187,48 +192,40 @@ CREATE OR REPLACE FUNCTION insert_exitlistentry ( END; $$ LANGUAGE 'plpgsql'; --- Search for status entries with the given IP address as onion routing --- address, plus status entries of relays having an exit list entry with --- the given IP address as exit address. -CREATE OR REPLACE FUNCTION search_statusentries_by_address_date ( - select_address TEXT, +-- Search for status entries with an IPv4 onion routing address in the +-- same /24 network as the given hex-encoded IP address prefix and with a +-- valid-after date within a day of the given date, plus status entries of +-- relays having an exit list entry with an exit address in the same /24 +-- network as the given hex-encoded IP address prefix and with a scan time +-- within a day of the given date. +CREATE OR REPLACE FUNCTION search_by_address24_date ( + select_address24 TEXT, select_date DATE) RETURNS TABLE(rawstatusentry BYTEA, - descriptor CHARACTER(40), validafter TIMESTAMP WITHOUT TIME ZONE, fingerprint CHARACTER(40), - oraddress TEXT, - exitaddress TEXT, - scanned TIMESTAMP WITHOUT TIME ZONE) AS $$ + exitaddress TEXT) AS $$ -- The first select finds all status entries of relays with the given -- IP address as onion routing address. SELECT rawstatusentry, - descriptor, validafter, fingerprint, - HOST(oraddress), - NULL, NULL FROM statusentry - WHERE oraddress = $1::INET + WHERE oraddress24 = $1 AND DATE(validafter) >= $2 - 1 AND DATE(validafter) <= $2 + 1 UNION -- The second select finds status entries of relays having an exit list -- entry with the provided IP address as the exit address. - SELECT statusentry.rawstatusentry, - statusentry.descriptor, + SELECT DISTINCT statusentry.rawstatusentry, statusentry.validafter, statusentry.fingerprint, - HOST(statusentry.oraddress), - HOST(exitlistentry.exitaddress), - -- Pick only the last scan result that took place in the 24 hours - -- before the valid-after time. - MAX(exitlistentry.scanned) + HOST(exitlistentry.exitaddress) FROM statusentry JOIN exitlistentry ON statusentry.fingerprint = exitlistentry.fingerprint - WHERE exitlistentry.exitaddress = $1::INET + WHERE exitlistentry.exitaddress24 = $1 -- Focus on a time period from 1 day before and 1 day after the -- given date. Also include a second day before the given date -- for exit lists, because it can take up to 24 hours to scan a @@ -242,8 +239,28 @@ CREATE OR REPLACE FUNCTION search_statusentries_by_address_date ( AND statusentry.validafter >= exitlistentry.scanned AND statusentry.validafter - exitlistentry.scanned <= '1 day'::INTERVAL - GROUP BY 1, 2, 3, 4, 5, 6 - ORDER BY 3, 4, 6; + ORDER BY 2, 3, 4; +$$ LANGUAGE SQL; + +-- Search for status entries with an IPv6 onion routing address in the +-- same /48 network as the given hex-encoded IP address prefix and with a +-- valid-after date within a day of the given date. +CREATE OR REPLACE FUNCTION search_by_address48_date ( + select_address48 TEXT, + select_date DATE) + RETURNS TABLE(rawstatusentry BYTEA, + validafter TIMESTAMP WITHOUT TIME ZONE, + fingerprint CHARACTER(40), + exitaddress TEXT) AS $$ + SELECT rawstatusentry, + validafter, + fingerprint, + NULL::TEXT + FROM statusentry + WHERE oraddress48 = $1 + AND DATE(validafter) >= $2 - 1 + AND DATE(validafter) <= $2 + 1 + ORDER BY 2, 3; $$ LANGUAGE SQL; -- Look up all IPv4 OR and exit addresses in the /24 network of a given diff --git a/src/org/torproject/exonerator/ExoneraTorServlet.java b/src/org/torproject/exonerator/ExoneraTorServlet.java index d2b1c97..66793dd 100644 --- a/src/org/torproject/exonerator/ExoneraTorServlet.java +++ b/src/org/torproject/exonerator/ExoneraTorServlet.java @@ -196,42 +196,14 @@ public class ExoneraTorServlet extends HttpServlet { if (statusEntries.isEmpty()) { addressesInSameNetwork = new ArrayList<String>(); if (!relayIP.contains(":")) { - String[] relayIPParts = relayIP.split("\\."); - byte[] address24Bytes = new byte[3]; - address24Bytes[0] = (byte) Integer.parseInt(relayIPParts[0]); - address24Bytes[1] = (byte) Integer.parseInt(relayIPParts[1]); - address24Bytes[2] = (byte) Integer.parseInt(relayIPParts[2]); - String address24 = Hex.encodeHexString(address24Bytes); - addressesInSameNetwork = this.queryAddressesInSame24(conn, - address24, timestamp); - } else { - StringBuilder addressHex = new StringBuilder(); - int start = relayIP.startsWith("::") ? 1 : 0; - int end = relayIP.length() - (relayIP.endsWith("::") ? 1 : 0); - String[] parts = relayIP.substring(start, end).split(":", -1); - for (int i = 0; i < parts.length; i++) { - String part = parts[i]; - if (part.length() == 0) { - addressHex.append("x"); - } else if (part.length() <= 4) { - addressHex.append(String.format("%4s", part)); - } else { - addressHex = null; - break; - } - } - String address48 = null; - if (addressHex != null) { - String addressHexString = addressHex.toString(); - addressHexString = addressHexString.replaceFirst("x", - String.format("%" + (33 - addressHexString.length()) - + "s", "0")); - if (!addressHexString.contains("x") && - addressHexString.length() == 32) { - address48 = addressHexString.replaceAll(" ", "0"). - toLowerCase().substring(0, 12); - } + String address24 = this.convertIPv4ToHex(relayIP).substring(0, 6); + if (address24 != null) { + addressesInSameNetwork = this.queryAddressesInSame24(conn, + address24, timestamp); } + } else { + String address48 = this.convertIPv6ToHex(relayIP).substring( + 0, 12); if (address48 != null) { addressesInSameNetwork = this.queryAddressesInSame48(conn, address48, timestamp); @@ -315,6 +287,50 @@ public class ExoneraTorServlet extends HttpServlet { return relayIP; } + private String convertIPv4ToHex(String relayIP) { + String[] relayIPParts = relayIP.split("\\."); + byte[] address24Bytes = new byte[4]; + for (int i = 0; i < address24Bytes.length; i++) { + address24Bytes[i] = (byte) Integer.parseInt(relayIPParts[i]); + } + String address24 = Hex.encodeHexString(address24Bytes); + return address24; + } + + private String convertIPv6ToHex(String relayIP) { + if (relayIP.startsWith("[") && relayIP.endsWith("]")) { + relayIP = relayIP.substring(1, relayIP.length() - 1); + } + StringBuilder addressHex = new StringBuilder(); + int start = relayIP.startsWith("::") ? 1 : 0; + int end = relayIP.length() - (relayIP.endsWith("::") ? 1 : 0); + String[] parts = relayIP.substring(start, end).split(":", -1); + for (int i = 0; i < parts.length; i++) { + String part = parts[i]; + if (part.length() == 0) { + addressHex.append("x"); + } else if (part.length() <= 4) { + addressHex.append(String.format("%4s", part)); + } else { + addressHex = null; + break; + } + } + String address48 = null; + if (addressHex != null) { + String addressHexString = addressHex.toString(); + addressHexString = addressHexString.replaceFirst("x", + String.format("%" + (33 - addressHexString.length()) + + "s", "0")); + if (!addressHexString.contains("x") && + addressHexString.length() == 32) { + address48 = addressHexString.replaceAll(" ", "0"). + toLowerCase(); + } + } + return address48; + } + private String parseTimestampParameter( String passedTimestampParameter) { String timestampStr = ""; @@ -396,20 +412,32 @@ public class ExoneraTorServlet extends HttpServlet { String relayIP, long timestamp, SimpleDateFormat validAfterTimeFormat) { List<String[]> statusEntries = new ArrayList<String[]>(); + String addressHex = !relayIP.contains(":") + ? this.convertIPv4ToHex(relayIP) : this.convertIPv6ToHex(relayIP); + if (addressHex == null) { + return null; + } + String address24Or48Hex = !relayIP.contains(":") + ? addressHex.substring(0, 6) : addressHex.substring(0, 12); try { - CallableStatement cs = conn.prepareCall( - "{call search_statusentries_by_address_date(?, ?)}"); - cs.setString(1, relayIP); + CallableStatement cs; + if (!relayIP.contains(":")) { + cs = conn.prepareCall("{call search_by_address24_date(?, ?)}"); + } else { + cs = conn.prepareCall("{call search_by_address48_date(?, ?)}"); + } + cs.setString(1, address24Or48Hex); Calendar utcCalendar = Calendar.getInstance( TimeZone.getTimeZone("UTC")); cs.setDate(2, new java.sql.Date(timestamp), utcCalendar); ResultSet rs = cs.executeQuery(); while (rs.next()) { byte[] rawstatusentry = rs.getBytes(1); - SortedSet<String> addresses = new TreeSet<String>(); - long validafter = rs.getTimestamp(3, utcCalendar).getTime(); + SortedSet<String> addresses = new TreeSet<String>(), + addressesHex = new TreeSet<String>(); + long validafter = rs.getTimestamp(2, utcCalendar).getTime(); String validAfterString = validAfterTimeFormat.format(validafter); - String fingerprint = rs.getString(4).toUpperCase(); + String fingerprint = rs.getString(3).toUpperCase(); String nickname = null; String exit = "U"; for (String line : new String(rawstatusentry).split("\n")) { @@ -417,17 +445,26 @@ public class ExoneraTorServlet extends HttpServlet { String[] parts = line.split(" "); nickname = parts[1]; addresses.add(parts[6]); + addressesHex.add(this.convertIPv4ToHex(parts[6])); } else if (line.startsWith("a ")) { String address = line.substring("a ".length(), line.lastIndexOf(":")); addresses.add(address); + String orAddressHex = !address.contains(":") + ? this.convertIPv4ToHex(address) + : this.convertIPv6ToHex(address); + addressesHex.add(orAddressHex); } else if (line.startsWith("p ")) { exit = line.equals("p reject 1-65535") ? "N" : "Y"; } } - String exitaddress = rs.getString(6); + String exitaddress = rs.getString(4); if (exitaddress != null && exitaddress.length() > 0) { addresses.add(exitaddress); + addressesHex.add(this.convertIPv4ToHex(exitaddress)); + } + if (!addressesHex.contains(addressHex)) { + continue; } StringBuilder sb = new StringBuilder(); int writtenAddresses = 0;

1 0

[exonerator/master] Switch to dynamic SQL queries for performance reasons.
by karsten＠torproject.org 08 Feb '16

08 Feb '16

commit 235de0e46625142627992bbf650a432e1daa6212 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Nov 19 14:37:38 2015 +0100 Switch to dynamic SQL queries for performance reasons. We're using PostgreSQL 9.1 which, apparently, optimizes functions only once rather than for each call. From the 9.2 release notes: """ Allow the planner to generate custom plans for specific parameter values even when using prepared statements (Tom Lane) In the past, a prepared statement always had a single "generic" plan that was used for all parameter values, which was frequently much inferior to the plans used for non-prepared statements containing explicit constant values. Now, the planner attempts to generate custom plans for specific parameter values. A generic plan will only be used after custom plans have repeatedly proven to provide no benefit. This change should eliminate the performance penalties formerly seen from use of prepared statements (including non-dynamic statements in PL/pgSQL). """ This is rather ugly, so maybe we can take this out when upgrading to 9.2 or higher. Still related to #17488. --- db/exonerator.sql | 64 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 26 deletions(-) diff --git a/db/exonerator.sql b/db/exonerator.sql index 04dc528..934dd6e 100755 --- a/db/exonerator.sql +++ b/db/exonerator.sql @@ -205,19 +205,29 @@ CREATE OR REPLACE FUNCTION search_by_address24_date ( validafter TIMESTAMP WITHOUT TIME ZONE, fingerprint CHARACTER(40), exitaddress TEXT) AS $$ + BEGIN + RETURN QUERY EXECUTE -- The first select finds all status entries of relays with the given -- IP address as onion routing address. - SELECT rawstatusentry, + -- + -- The second select finds status entries of relays having an exit list + -- entry with the provided IP address as the exit address. + -- In the second select, + -- - Focus on a time period from 1 day before and 1 day after the + -- given date. Also include a second day before the given date + -- for exit lists, because it can take up to 24 hours to scan a + -- relay again. We should not miss exit list entries here. + -- - Consider only exit list scans that took place in the 24 hours + -- before the relay was listed in a consensus. + 'SELECT rawstatusentry, validafter, fingerprint, NULL FROM statusentry - WHERE oraddress24 = $1 - AND DATE(validafter) >= $2 - 1 - AND DATE(validafter) <= $2 + 1 + WHERE oraddress24 = ''' || select_address24 || ''' + AND DATE(validafter) >= ''' || select_date || '''::DATE - 1 + AND DATE(validafter) <= ''' || select_date || '''::DATE + 1 UNION - -- The second select finds status entries of relays having an exit list - -- entry with the provided IP address as the exit address. SELECT DISTINCT statusentry.rawstatusentry, statusentry.validafter, statusentry.fingerprint, @@ -225,22 +235,21 @@ CREATE OR REPLACE FUNCTION search_by_address24_date ( FROM statusentry JOIN exitlistentry ON statusentry.fingerprint = exitlistentry.fingerprint - WHERE exitlistentry.exitaddress24 = $1 - -- Focus on a time period from 1 day before and 1 day after the - -- given date. Also include a second day before the given date - -- for exit lists, because it can take up to 24 hours to scan a - -- relay again. We shouldn't miss exit list entries here. - AND DATE(exitlistentry.scanned) >= $2 - 2 - AND DATE(exitlistentry.scanned) <= $2 + 1 - AND DATE(statusentry.validafter) >= $2 - 1 - AND DATE(statusentry.validafter) <= $2 + 1 - -- Consider only exit list scans that took place in the 24 hours - -- before the relay was listed in a consensus. + WHERE exitlistentry.exitaddress24 = ''' || select_address24 || ''' + AND DATE(exitlistentry.scanned) >= ''' || select_date + || '''::DATE - 2 + AND DATE(exitlistentry.scanned) <= ''' || select_date + || '''::DATE + 1 + AND DATE(statusentry.validafter) >= ''' || select_date + || '''::DATE - 1 + AND DATE(statusentry.validafter) <= ''' || select_date + || '''::DATE + 1 AND statusentry.validafter >= exitlistentry.scanned AND statusentry.validafter - exitlistentry.scanned <= - '1 day'::INTERVAL - ORDER BY 2, 3, 4; -$$ LANGUAGE SQL; + ''1 day''::INTERVAL + ORDER BY 2, 3, 4'; + END; +$$ LANGUAGE plpgsql; -- Search for status entries with an IPv6 onion routing address in the -- same /48 network as the given hex-encoded IP address prefix and with a @@ -252,16 +261,19 @@ CREATE OR REPLACE FUNCTION search_by_address48_date ( validafter TIMESTAMP WITHOUT TIME ZONE, fingerprint CHARACTER(40), exitaddress TEXT) AS $$ - SELECT rawstatusentry, + BEGIN + RETURN QUERY EXECUTE + 'SELECT rawstatusentry, validafter, fingerprint, NULL::TEXT FROM statusentry - WHERE oraddress48 = $1 - AND DATE(validafter) >= $2 - 1 - AND DATE(validafter) <= $2 + 1 - ORDER BY 2, 3; -$$ LANGUAGE SQL; + WHERE oraddress48 = ''' || select_address48 || ''' + AND DATE(validafter) >= ''' || select_date || '''::DATE - 1 + AND DATE(validafter) <= ''' || select_date || '''::DATE + 1 + ORDER BY 2, 3'; + END; +$$ LANGUAGE plpgsql; -- Look up all IPv4 OR and exit addresses in the /24 network of a given -- address to suggest other addresses the user may be looking for.

1 0

[exonerator/master] Set content type, or the page doesn't render in Chrome.
by karsten＠torproject.org 08 Feb '16

08 Feb '16

commit fe5ff3b983b77d4b627a6298b797655a2e4ee90e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Feb 8 21:05:33 2016 +0100 Set content type, or the page doesn't render in Chrome. Fixes #18281. --- src/org/torproject/exonerator/ExoneraTorServlet.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/org/torproject/exonerator/ExoneraTorServlet.java b/src/org/torproject/exonerator/ExoneraTorServlet.java index 66793dd..68d79a3 100644 --- a/src/org/torproject/exonerator/ExoneraTorServlet.java +++ b/src/org/torproject/exonerator/ExoneraTorServlet.java @@ -62,6 +62,9 @@ public class ExoneraTorServlet extends HttpServlet { HttpServletResponse response) throws IOException, ServletException { + /* Set content type, or the page doesn't render in Chrome. */ + response.setContentType("text/html"); + /* Start writing response. */ PrintWriter out = response.getWriter(); this.writeHeader(out);

1 0

[torbutton/maint-1.9.4] Bug 18144: about:tor update arrow position is wrong (Retina and zoom)
by gk＠torproject.org 08 Feb '16

08 Feb '16

commit 3ccbfe38c767fb5d85ea37168ae08c297997b5ac Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Feb 1 14:48:22 2016 -0500 Bug 18144: about:tor update arrow position is wrong (Retina and zoom) For the about:tor content window, use nsIDOMWindowUtils.screenPixelsPerCSSPixel instead of window.devicePixelRatio to compensate for a retina display and for content zoom (devicePixelRatio always returns 1.0 for content windows due to the fix for bug 13875). --- src/chrome/content/aboutTor/aboutTor.xhtml | 7 +------ src/chrome/content/torbutton.js | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 6fdbe50..dbb8a89 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>  @@ -59,11 +59,6 @@ function adjustToolbarIconArrow() return; } - // Account for content zoom and retina displays by converting to device - // independent units. - if ("devicePixelRatio" in window) // FF18+ - tbXpos /= window.devicePixelRatio; - const kArrowMargin = 6; // Horizontal margin between line and text. const kArrowHeadExtraWidth = 9; // Horizontal margin to the line. const kArrowLineThickness = 11; diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 0d1cfe8..25b61fb 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1023,7 +1023,8 @@ function torbutton_adjust_abouttor_fontsizes(aDoc, aContainerName) } // Determine X position of torbutton toolbar item and pass it through -// to the xhtml document. +// to the xhtml document by setting a torbutton-xpos attribute on the body. +// The value that is set takes retina displays and content zoom into account. function torbutton_update_abouttor_arrow(aDoc) { try { let tbXpos = -1; @@ -1033,15 +1034,22 @@ function torbutton_update_abouttor_arrow(aDoc) { let contentElem = document.getElementById("content"); let contentRect = contentElem.getBoundingClientRect(); if (tbItemRect.top < contentRect.top) { - tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - - contentElem.getBoundingClientRect().left; + tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - contentRect.left; } } - if (tbXpos >= 0) { - if ("devicePixelRatio" in window) // FF18+ - tbXpos *= window.devicePixelRatio; // Convert to device pixels. - tbXpos = Math.round(tbXpos); + if (tbXpos >= 0) { + // Convert to device-independent units, compensating for retina display + // and content zoom that may be in effect on the about:tor page. + // Because window.devicePixelRatio always returns 1.0 for non-Chrome + // windows (see bug 13875), we use screenPixelsPerCSSPixel for the + // content window. + tbXpos *= window.devicePixelRatio; + let pixRatio = gBrowser.contentWindow + .QueryInterface(Ci.nsIInterfaceRequestor) + .getInterface(Ci.nsIDOMWindowUtils) + .screenPixelsPerCSSPixel; + tbXpos = Math.round(tbXpos / pixRatio); aDoc.body.setAttribute("torbutton-xpos", tbXpos); } else { aDoc.body.removeAttribute("torbutton-xpos");

1 0

[torbutton/master] Bug 18144: about:tor update arrow position is wrong (Retina and zoom)
by gk＠torproject.org 08 Feb '16

08 Feb '16

commit b195514c21e5809f9afc8ec606e716d0e67865cc Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Feb 1 14:48:22 2016 -0500 Bug 18144: about:tor update arrow position is wrong (Retina and zoom) For the about:tor content window, use nsIDOMWindowUtils.screenPixelsPerCSSPixel instead of window.devicePixelRatio to compensate for a retina display and for content zoom (devicePixelRatio always returns 1.0 for content windows due to the fix for bug 13875). --- src/chrome/content/aboutTor/aboutTor.xhtml | 7 +------ src/chrome/content/torbutton.js | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 6fdbe50..dbb8a89 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>  @@ -59,11 +59,6 @@ function adjustToolbarIconArrow() return; } - // Account for content zoom and retina displays by converting to device - // independent units. - if ("devicePixelRatio" in window) // FF18+ - tbXpos /= window.devicePixelRatio; - const kArrowMargin = 6; // Horizontal margin between line and text. const kArrowHeadExtraWidth = 9; // Horizontal margin to the line. const kArrowLineThickness = 11; diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 0d1cfe8..25b61fb 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1023,7 +1023,8 @@ function torbutton_adjust_abouttor_fontsizes(aDoc, aContainerName) } // Determine X position of torbutton toolbar item and pass it through -// to the xhtml document. +// to the xhtml document by setting a torbutton-xpos attribute on the body. +// The value that is set takes retina displays and content zoom into account. function torbutton_update_abouttor_arrow(aDoc) { try { let tbXpos = -1; @@ -1033,15 +1034,22 @@ function torbutton_update_abouttor_arrow(aDoc) { let contentElem = document.getElementById("content"); let contentRect = contentElem.getBoundingClientRect(); if (tbItemRect.top < contentRect.top) { - tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - - contentElem.getBoundingClientRect().left; + tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - contentRect.left; } } - if (tbXpos >= 0) { - if ("devicePixelRatio" in window) // FF18+ - tbXpos *= window.devicePixelRatio; // Convert to device pixels. - tbXpos = Math.round(tbXpos); + if (tbXpos >= 0) { + // Convert to device-independent units, compensating for retina display + // and content zoom that may be in effect on the about:tor page. + // Because window.devicePixelRatio always returns 1.0 for non-Chrome + // windows (see bug 13875), we use screenPixelsPerCSSPixel for the + // content window. + tbXpos *= window.devicePixelRatio; + let pixRatio = gBrowser.contentWindow + .QueryInterface(Ci.nsIInterfaceRequestor) + .getInterface(Ci.nsIDOMWindowUtils) + .screenPixelsPerCSSPixel; + tbXpos = Math.round(tbXpos / pixRatio); aDoc.body.setAttribute("torbutton-xpos", tbXpos); } else { aDoc.body.removeAttribute("torbutton-xpos");

1 0

[tor/master] changes file for bug18051
by nickm＠torproject.org 08 Feb '16

08 Feb '16

commit 0c4fa4a9234e8aae56a2a10c45ad0ff3c2bf91cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 8 08:35:43 2016 -0500 changes file for bug18051 --- changes/bug18051 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug18051 b/changes/bug18051 new file mode 100644 index 0000000..1b11867 --- /dev/null +++ b/changes/bug18051 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When generating a URL for a directory server on an IPv6 address, + wrap the IPv6 address in square brackets. Fixes bug 18051; + bugfix on ?. Patch from Malek.

1 0

[tor/master] Add missing consts; my fault.
by nickm＠torproject.org 08 Feb '16

08 Feb '16

commit 92048a1b43024d338e0b3fd1fd36d5255b98358e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 8 08:34:18 2016 -0500 Add missing consts; my fault. --- src/or/router.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index ff21f41..6d3582f 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1739,7 +1739,7 @@ router_upload_dir_desc_to_dirservers(int force) int router_compare_to_my_exit_policy(const tor_addr_t *addr, uint16_t port) { - routerinfo_t *me = router_get_my_routerinfo(); + const routerinfo_t *me = router_get_my_routerinfo(); if (!me) /* make sure routerinfo exists */ return -1; @@ -1836,7 +1836,7 @@ const char * router_get_my_descriptor(void) { const char *body; - routerinfo_t *me = router_get_my_routerinfo(); + const routerinfo_t *me = router_get_my_routerinfo(); if (! me) return NULL; tor_assert(me->cache_info.saved_location == SAVED_NOWHERE);

1 0