May 2013 - tor-commits - lists.torproject.org

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 09 May '13

09 May '13

commit 17dc6d7b22b3a05c932c5f03d9e101ec3c709008 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 9 06:45:43 2013 +0000 Update translations for vidalia_help --- fi/bridges.po | 5 +++-- fi/config.po | 5 +++-- fi/services.po | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/fi/bridges.po b/fi/bridges.po index ea8f060..2cdfb6b 100644 --- a/fi/bridges.po +++ b/fi/bridges.po @@ -1,12 +1,13 @@ # # Translators: # DJHasis <djhasis(a)example.com>, 2008 +# mikkoharhanen <gitti(a)mikkoharhanen.fi>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2013-05-08 09:47+0000\n" +"PO-Revision-Date: 2013-05-09 06:31+0000\n" "Last-Translator: mikkoharhanen <gitti(a)mikkoharhanen.fi>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n" @@ -78,7 +79,7 @@ msgid "" " of their Relay page. Unlike running an exit relay, running a bridge relay " "just passes data to and from the Tor network, so it shouldn't expose the " "operator to any abuse complaints." -msgstr "Jotta voisit hyödyntää yksityistä siltaa, pyydä ystäviäsi käyttämään Vidaliaa ja Toria sensuroimattomalla Internet-alueella ja napsauttamaan Auta sensuroinnista kärsiviä käyttäjiä pääsemään Tor-verkkoon Vidalian <a href=\"server.html\">reititinasetuksista</a>. Sitten heidän tulisi lähettää sinulle yksityisesti sillan osoite reititinsivun alaosasta. Poistumisreitittimestä (engl. exit relay) poiketen siltareititin siirtää tietoa vain Tor-verkon sisällä, jolloin ylläpitäjän pitäisi välttyä väärinkäytössyytöksiltä." +msgstr "Jotta voisit hyödyntää yksityistä siltaa, pyydä ystäviäsi käyttämään Vidaliaa ja Toria sensuroimattomalla Internet-alueella ja napsauttamaan Auta sensuroinnista kärsiviä käyttäjiä pääsemään Tor-verkkoon Vidalian <a href=\"server.html\">reititinasetuksista</a>. Sitten heidän tulisi lähettää sinulle yksityisesti sillan osoite reititinsivun alaosasta. Poistumisreitittimestä (engl. exit relay) poiketen siltareititin siirtää tietoa vain Tor-verkon sisällä, jolloin ylläpitäjän pitäisi välttyä väärinkäytössyytöksiltä." #. type: Content of: <html><body> #: en/bridges.html:52 diff --git a/fi/config.po b/fi/config.po index 29aa668..0140c45 100644 --- a/fi/config.po +++ b/fi/config.po @@ -1,12 +1,13 @@ # # Translators: # DJHasis <djhasis(a)example.com>, 2008 +# mikkoharhanen <gitti(a)mikkoharhanen.fi>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2013-05-08 09:45+0000\n" +"PO-Revision-Date: 2013-05-09 06:33+0000\n" "Last-Translator: mikkoharhanen <gitti(a)mikkoharhanen.fi>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n" @@ -281,7 +282,7 @@ msgid "" " a value for Run as User, Tor will setuid to this user when it" " starts. If you enter a value for Run as Group, Tor will " "setgid to this group when it starts." -msgstr "Oikeudet (valinnainen, ei ole käytössä Windowsissa): Jos syötät arvon kohtaan Suorita käyttäjänä, käynnistyessään Tor käyttää tämän käyttäjän kohdalla setuid-komentoa. Jos syötät arvon kohtaan Suorita ryhmänä, käynnistyessään Tor käyttää tämän ryhmän kohdalla setgid-komentoa." +msgstr "Oikeudet (valinnainen, ei ole käytössä Windowsissa): Jos syötät arvon kohtaan Suorita käyttäjänä, käynnistyessään Tor käyttää tämän käyttäjän kohdalla setuid-komentoa. Jos syötät arvon kohtaan Suorita ryhmänä, käynnistyessään Tor käyttää tämän ryhmän kohdalla setgid-komentoa." #. type: Content of: <html><body> #: en/config.html:189 diff --git a/fi/services.po b/fi/services.po index c2ca8a6..e6e7897 100644 --- a/fi/services.po +++ b/fi/services.po @@ -1,12 +1,13 @@ # # Translators: # DJHasis <djhasis(a)example.com>, 2008 +# mikkoharhanen <gitti(a)mikkoharhanen.fi>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-05-08 09:44+0000\n" +"PO-Revision-Date: 2013-05-09 06:34+0000\n" "Last-Translator: mikkoharhanen <gitti(a)mikkoharhanen.fi>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n" @@ -154,7 +155,7 @@ msgid "" "Vidalia and save the configuration. Then move the directory on your hard " "disk to the new place. Finally, change the directory in Vidalia to the new " "location, enable the service again, and save the new configuration." -msgstr "Palvelun kansio (vaaditaan): Torin täytyy säilyttää jotain piilopalveluiden tiedostoja, kuten yksityistä avainta ja paikallisen palvelimen tiedostoa onion-osoitteista, erillisessä kansiossa. Tämä kansio tulisi erottaa kansiosta, jossa on palvelun tarjoamaa sisältöä. Yksi hyvä mahdollinen sijainti on alakansio Torin datakansiossa. Huomaa, että et voi muuttaa käynnissä olevan palvelun kansiota (eikä siinä olisi järkeäkään, sillä Vidalian ei ole tarkoitus siirtää levysi kansioita!). Jos haluat siirtää piilopalvelun toiseen kansioon, noudata seuraavia ohjeita: Ensimmäiseksi ota Vidalialla palvelu pois käytöstä ja tallenna asetukset. Toiseksi siirrä levyllä oleva kansio uuteen sijaintiin. Kolmanneksi muuta Vidaliassa kansion sijainti vastaamaan uutta sijaintia, ota palvelu taas käyttöön ja tallenna asetukset." +msgstr "Palvelun kansio (vaaditaan): Torin täytyy säilyttää jotain piilopalveluiden tiedostoja, kuten yksityistä avainta ja paikallisen palvelimen tiedostoa onion-osoitteista, erillisessä kansiossa. Tämä kansio tulisi erottaa kansiosta, jossa on palvelun tarjoamaa sisältöä. Yksi hyvä mahdollinen sijainti on alakansio Torin datakansiossa. Huomaa, että et voi muuttaa käynnissä olevan palvelun kansiota (eikä siinä olisi järkeäkään, sillä Vidalian ei ole tarkoitus siirtää levysi kansioita!). Jos haluat siirtää piilopalvelun toiseen kansioon, noudata seuraavia ohjeita: Ensimmäiseksi ota Vidalialla palvelu pois käytöstä ja tallenna asetukset. Toiseksi siirrä levyllä oleva kansio uuteen sijaintiin. Kolmanneksi muuta Vidaliassa kansion sijainti vastaamaan uutta sijaintia, ota palvelu taas käyttöön ja tallenna asetukset." #. type: Content of: <html><body><ul><li> #: en/services.html:95

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 08 May '13

08 May '13

commit 3835b16b753ec312320bcb914c3eb8b4f08899f3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 21:46:10 2013 +0000 Update translations for https_everywhere_completed --- es/https-everywhere.dtd | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index 861751e..b82b623 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.dtd @@ -1,16 +1,16 @@ -<!ENTITY https-everywhere.about.title "Acerca de HTTPS Everywhere"> +<!ENTITY https-everywhere.about.title "Acerca de HTTPS Everywhere (HTTPS en cualquier sitio)"> <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "¡Cifre la Web! Utilice automáticamente la seguridad HTTPS en muchos sitios."> <!ENTITY https-everywhere.about.version "Versión"> <!ENTITY https-everywhere.about.created_by "Creado por"> <!ENTITY https-everywhere.about.librarians "Bibliotecarios de las reglas"> -<!ENTITY https-everywhere.about.thanks "Agradecimientos a"> -<!ENTITY https-everywhere.about.contribute "Si le agrada HTTPS Everywhere, podría considerar"> +<!ENTITY https-everywhere.about.thanks "Agradecimientos para"> +<!ENTITY https-everywhere.about.contribute "Si le agrada HTTPS Everywhere (HTTPS en cualquier sitio), podría considerar"> <!ENTITY https-everywhere.about.donate_tor "donar a Tor"> <!ENTITY https-everywhere.about.tor_lang_code "es"> -<!ENTITY https-everywhere.about.donate_eff "donar a EFF"> +<!ENTITY https-everywhere.about.donate_eff "donar a la Fundación Fronteras Electrónicas (EFF)"> -<!ENTITY https-everywhere.menu.about "Acerca de HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.about "Acerca de HTTPS Everywhere (HTTPS en cualquier sitio)"> <!ENTITY https-everywhere.menu.observatory "Opciones del Observatorio SSL"> <!ENTITY https-everywhere.menu.globalEnable "Activar HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "Desactivar HTTPS Everywhere"> @@ -31,7 +31,7 @@ <!ENTITY https-everywhere.prefs.view_xml_source "Ver código XML"> <!ENTITY https-everywhere.source.downloading "Descargando"> -<!ENTITY https-everywhere.source.filename "Nombre del archivo"> +<!ENTITY https-everywhere.source.filename "Nombre de fichero"> <!ENTITY https-everywhere.source.unable_to_download "No fue posible descargar el código.">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 08 May '13

08 May '13

commit 2db9d9c7acf3df9677515ea1aaef93a7cfb5fd26 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 21:46:05 2013 +0000 Update translations for https_everywhere --- es/https-everywhere.dtd | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index 861751e..b82b623 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.dtd @@ -1,16 +1,16 @@ -<!ENTITY https-everywhere.about.title "Acerca de HTTPS Everywhere"> +<!ENTITY https-everywhere.about.title "Acerca de HTTPS Everywhere (HTTPS en cualquier sitio)"> <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "¡Cifre la Web! Utilice automáticamente la seguridad HTTPS en muchos sitios."> <!ENTITY https-everywhere.about.version "Versión"> <!ENTITY https-everywhere.about.created_by "Creado por"> <!ENTITY https-everywhere.about.librarians "Bibliotecarios de las reglas"> -<!ENTITY https-everywhere.about.thanks "Agradecimientos a"> -<!ENTITY https-everywhere.about.contribute "Si le agrada HTTPS Everywhere, podría considerar"> +<!ENTITY https-everywhere.about.thanks "Agradecimientos para"> +<!ENTITY https-everywhere.about.contribute "Si le agrada HTTPS Everywhere (HTTPS en cualquier sitio), podría considerar"> <!ENTITY https-everywhere.about.donate_tor "donar a Tor"> <!ENTITY https-everywhere.about.tor_lang_code "es"> -<!ENTITY https-everywhere.about.donate_eff "donar a EFF"> +<!ENTITY https-everywhere.about.donate_eff "donar a la Fundación Fronteras Electrónicas (EFF)"> -<!ENTITY https-everywhere.menu.about "Acerca de HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.about "Acerca de HTTPS Everywhere (HTTPS en cualquier sitio)"> <!ENTITY https-everywhere.menu.observatory "Opciones del Observatorio SSL"> <!ENTITY https-everywhere.menu.globalEnable "Activar HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "Desactivar HTTPS Everywhere"> @@ -31,7 +31,7 @@ <!ENTITY https-everywhere.prefs.view_xml_source "Ver código XML"> <!ENTITY https-everywhere.source.downloading "Descargando"> -<!ENTITY https-everywhere.source.filename "Nombre del archivo"> +<!ENTITY https-everywhere.source.filename "Nombre de fichero"> <!ENTITY https-everywhere.source.unable_to_download "No fue posible descargar el código.">

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 08 May '13

08 May '13

commit 73d6a6a606007f47321dc7e297e71c65384f1d6d Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 21:16:02 2013 +0000 Update translations for torcheck_completed --- es/torcheck.po | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/es/torcheck.po b/es/torcheck.po index 7857808..0eebfc5 100644 --- a/es/torcheck.po +++ b/es/torcheck.po @@ -3,6 +3,7 @@ # # Translators: # cronayu <itacronayu(a)hotmail.com>, 2012 +# Envite <envite(a)rolamasao.org>, 2013 # Shyish <jgongarrido(a)hotmail.com>, 2011 # strel <strelnic(a)gmail.com>, 2013 # strel <strelnic(a)gmail.com>, 2012 @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-04-29 08:18+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-05-08 21:07+0000\n" +"Last-Translator: Envite <envite(a)rolamasao.org>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,13 +23,13 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Congratulations. Your browser is configured to use Tor." -msgstr "Felicidades. Su navegador está configurado para usar Tor." +msgstr "Felicidades, su navegador está configurado para usar Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Visite el <a href=\"https://www.torproject.org/\">sitio web de Tor</a> para más información sobre cómo usar Tor de forma segura. Ahora tiene la oportunidad de navegar por Internet anónimamente." +msgstr "Visite el <a href=\"https://www.torproject.org/\">sitio web de Tor</a> para obtener más información sobre cómo usar Tor de forma segura. Ahora tiene la oportunidad de navegar por Internet anónimamente." msgid "There is a security update available for the Tor Browser Bundle." msgstr "Hay una actualización de seguridad disponible para el Paquete de Navegador Tor." @@ -36,17 +37,17 @@ msgstr "Hay una actualización de seguridad disponible para el Paquete de Navega msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Haga clic aquí para ir a la página de descarga</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Pulse aquí para ir a la página de descargas</a>" msgid "Sorry. You are not using Tor." -msgstr "Lo sentimos. No está usando Tor." +msgstr "Lo sentimos, no está usando Tor." msgid "" "If you are attempting to use a Tor client, please refer to the <a " "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "Si está intentando usar el cliente Tor, visite el <a href=\"https://www.torproject.org/\">sitio web de Tor</a> y específicamente las <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instrucciones para configurar su cliente Tor</a>." +msgstr "Si está intentando utilizar el cliente Tor, visite el <a href=\"https://www.torproject.org/\">sitio web de Tor</a> y específicamente las <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instrucciones para configurar su cliente Tor</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Lo sentimos, su consulta falló o se recibió una respuesta inesperada." @@ -54,7 +55,7 @@ msgstr "Lo sentimos, su consulta falló o se recibió una respuesta inesperada." msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "Una caída temporal del servicio no nos permite determinar si su dirección IP de origen es un nodo de <a href=\"https://www.torproject.org/\">Tor</a>." +msgstr "Un fallo temporal del servicio no nos permite determinar si su dirección IP de origen es un nodo <a href=\"https://www.torproject.org/\">Tor</a>." msgid "Your IP address appears to be: " msgstr "Su dirección IP parece ser: "

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 08 May '13

08 May '13

commit 486cefdbfbadbcb6a89d04e3b60ab76205509ca2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 21:15:59 2013 +0000 Update translations for torcheck --- es/torcheck.po | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/es/torcheck.po b/es/torcheck.po index 7857808..0eebfc5 100644 --- a/es/torcheck.po +++ b/es/torcheck.po @@ -3,6 +3,7 @@ # # Translators: # cronayu <itacronayu(a)hotmail.com>, 2012 +# Envite <envite(a)rolamasao.org>, 2013 # Shyish <jgongarrido(a)hotmail.com>, 2011 # strel <strelnic(a)gmail.com>, 2013 # strel <strelnic(a)gmail.com>, 2012 @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-04-29 08:18+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-05-08 21:07+0000\n" +"Last-Translator: Envite <envite(a)rolamasao.org>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,13 +23,13 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Congratulations. Your browser is configured to use Tor." -msgstr "Felicidades. Su navegador está configurado para usar Tor." +msgstr "Felicidades, su navegador está configurado para usar Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Visite el <a href=\"https://www.torproject.org/\">sitio web de Tor</a> para más información sobre cómo usar Tor de forma segura. Ahora tiene la oportunidad de navegar por Internet anónimamente." +msgstr "Visite el <a href=\"https://www.torproject.org/\">sitio web de Tor</a> para obtener más información sobre cómo usar Tor de forma segura. Ahora tiene la oportunidad de navegar por Internet anónimamente." msgid "There is a security update available for the Tor Browser Bundle." msgstr "Hay una actualización de seguridad disponible para el Paquete de Navegador Tor." @@ -36,17 +37,17 @@ msgstr "Hay una actualización de seguridad disponible para el Paquete de Navega msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Haga clic aquí para ir a la página de descarga</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Pulse aquí para ir a la página de descargas</a>" msgid "Sorry. You are not using Tor." -msgstr "Lo sentimos. No está usando Tor." +msgstr "Lo sentimos, no está usando Tor." msgid "" "If you are attempting to use a Tor client, please refer to the <a " "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "Si está intentando usar el cliente Tor, visite el <a href=\"https://www.torproject.org/\">sitio web de Tor</a> y específicamente las <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instrucciones para configurar su cliente Tor</a>." +msgstr "Si está intentando utilizar el cliente Tor, visite el <a href=\"https://www.torproject.org/\">sitio web de Tor</a> y específicamente las <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instrucciones para configurar su cliente Tor</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Lo sentimos, su consulta falló o se recibió una respuesta inesperada." @@ -54,7 +55,7 @@ msgstr "Lo sentimos, su consulta falló o se recibió una respuesta inesperada." msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "Una caída temporal del servicio no nos permite determinar si su dirección IP de origen es un nodo de <a href=\"https://www.torproject.org/\">Tor</a>." +msgstr "Un fallo temporal del servicio no nos permite determinar si su dirección IP de origen es un nodo <a href=\"https://www.torproject.org/\">Tor</a>." msgid "Your IP address appears to be: " msgstr "Su dirección IP parece ser: "

1 0

[tor-browser/tor-browser-17.0.5esr-2] squash! Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 08 May '13

08 May '13

commit 05f5bb617ea9b61d219b7166b6c3fd76891a2f86 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue May 7 23:44:30 2013 -0700 squash! Tor Browser's Firefox preference overrides. --- browser/app/profile/tor-browser.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/browser/app/profile/tor-browser.js b/browser/app/profile/tor-browser.js index bf0c81b..87490f2 100644 --- a/browser/app/profile/tor-browser.js +++ b/browser/app/profile/tor-browser.js @@ -111,7 +111,7 @@ pref("extensions.autoDisableScopes", 0); pref("extensions.bootstrappedAddons", "{}"); pref("extensions.checkCompatibility.4.*", false); pref("extensions.databaseSchema", 3); -pref("extensions.enabledAddons", "torlauncher%40torproject.org:0.1.1pre-alpha,https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2" +pref("extensions.enabledAddons", "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,torlauncher%40torproject.org:0.1.1pre-alpha,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5" pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); pref("extensions.enabledScopes", 1); pref("extensions.pendingOperations", false);

1 0

[tor-browser/tor-browser-17.0.5esr-2] fixup! Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 08 May '13

08 May '13

commit 1f590875b79e867f68c577089386301afd529c75 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed May 8 13:09:28 2013 -0700 fixup! Tor Browser's Firefox preference overrides. Also attempt to change omni.ja ordering. --- browser/app/profile/tor-browser.js | 2 +- toolkit/mozapps/installer/packager.mk | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/tor-browser.js b/browser/app/profile/tor-browser.js index 87490f2..bcc5bad 100644 --- a/browser/app/profile/tor-browser.js +++ b/browser/app/profile/tor-browser.js @@ -111,7 +111,7 @@ pref("extensions.autoDisableScopes", 0); pref("extensions.bootstrappedAddons", "{}"); pref("extensions.checkCompatibility.4.*", false); pref("extensions.databaseSchema", 3); -pref("extensions.enabledAddons", "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,torlauncher%40torproject.org:0.1.1pre-alpha,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5" +pref("extensions.enabledAddons", "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,tor-launcher%40torproject.org:0.1.1pre-alpha,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5" pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); pref("extensions.enabledScopes", 1); pref("extensions.pendingOperations", false); diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 8460c91..01c7b93 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -496,11 +496,13 @@ OMNIJAR_FILES = \ $(NULL) # defaults/pref/channel-prefs.js is handled separate from other prefs due to -# bug 756325 +# bug 756325. +# tor-browser.js is also bundled last, because it must override other prefs. NON_OMNIJAR_FILES += \ chrome/icons/\* \ $(PREF_DIR)/channel-prefs.js \ defaults/pref/channel-prefs.js \ + defaults/preferences/tor-browser.js \ res/cursors/\* \ res/MainMenu.nib/\* \ \*/.mkdir.done \ @@ -514,6 +516,7 @@ PACK_OMNIJAR = \ mv tmp.manifest $$m; \ done; \ $(ZIP) -r9m $(OMNIJAR_NAME) $(OMNIJAR_FILES) -x $(NON_OMNIJAR_FILES) && \ + $(ZIP) -u $(OMNIJAR_NAME) defaults/preferences/tor-browser.js && \ $(GENERATE_CACHE) && \ $(OPTIMIZE_JARS_CMD) --optimize $(JARLOG_DIR_AB_CD) ./ ./ && \ mv binary.manifest components && \

1 0

[ooni-probe/master] Parsley 1.1 is now in pypi so we don't have to mirror it.
by art＠torproject.org 08 May '13

08 May '13

commit 5856e93c145ea59447e89ed484b280fa0d3e58b4 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed May 8 19:04:32 2013 +0200 Parsley 1.1 is now in pypi so we don't have to mirror it. * Remove scapy from requirements.txt, because pip does not like it --- requirements.txt | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index ba654e6..fae3eb6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,6 +9,7 @@ pygeoip>=0.2.5 txtorcon>=0.7 txsocksx>=0.0.2 Pyrex +parsley>=1.1 # Taken from the versions required by twisted 13.0.0 (latest) transaction>=1.1.1 @@ -16,23 +17,16 @@ zope.component>=3.5 zope.event>=3.5 zope.interface>=3.6 -# # This is a Tor Project mirror with valid SSL/TLS certs that is stable and fast -# -# Originally fetched from LaunchPad: -# https://launchpad.net/parsley/trunk/1.1pre1/+download/Parsley-1.1pre1.tar.gz -# Mirrored on Tor's webserver: -https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/Parsley-1.1pre1.tar.gz -parsley>=1.1 -# # Originally fetched from the hg repo on secdev.org: # https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy # Mirrored on Tor's webserver: +# This should be scapy>=2.2.0, but pip does not like it https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/scapy-02-25-20… -scapy>=2.2.0 # This was 'dnspython>=1.10.0' above until it failed to download many times. # Originally fetched from dnspython but it timed out often: # http://www.dnspython.org/kits/1.10.0/dnspython-1.10.0.zip # Mirrored on Tor's webserver: -https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/dnspython-1.10.0.zip +# This should be the below, but pip does not like it. dnspython>=1.10.0 +https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/dnspython-1.10.0.zip

1 0

[tor/master] Fix bug 8845: check the right length of memory in aes unit tests
by nickm＠torproject.org 08 May '13

08 May '13

commit 7d3fd858388ddd4916c604ed5ab3c8cfc72dfd1c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 8 12:59:08 2013 -0400 Fix bug 8845: check the right length of memory in aes unit tests This couldn't actually be a buffer overrun unless AES somehow turned into memcpy, but still it's good to fix it. --- changes/bug8845 | 3 +++ src/test/test_crypto.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/bug8845 b/changes/bug8845 new file mode 100644 index 0000000..ace043a --- /dev/null +++ b/changes/bug8845 @@ -0,0 +1,3 @@ + o Minor bugfixes (test): + - Fix an impossible buffer overrun in the AES unit tests. Fixes bug 8845; + bugfix on 0.2.0.7-alpha. Found by eugenis. diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index fcaa081..f92bfd6 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -730,7 +730,7 @@ test_crypto_aes_iv(void *arg) /* Decrypt with the wrong key. */ decrypted_size = crypto_cipher_decrypt_with_iv(key2, decrypted2, 4095, encrypted1, encrypted_size); - test_memneq(plain, decrypted2, encrypted_size); + test_memneq(plain, decrypted2, decrypted_size); /* Alter the initialization vector. */ encrypted1[0] += 42; decrypted_size = crypto_cipher_decrypt_with_iv(key1, decrypted1, 4095,

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 08 May '13

08 May '13

commit 8f21838ee5305b89c4089a06ca51e95bc89ae053 Merge: 9c58905 7d3fd85 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 8 13:01:58 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8845 | 3 +++ src/test/test_crypto.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-)

1 0