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

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 17 Jan '14

17 Jan '14

commit 8fd751271db02205fd1c069be9a36f30915cba98 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 17 22:16:27 2014 +0000 Update translations for tails-iuk --- ca.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ca.po b/ca.po index 9e7c660..7888ab5 100644 --- a/ca.po +++ b/ca.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-01-07 20:17+0100\n" -"PO-Revision-Date: 2014-01-17 21:44+0000\n" +"PO-Revision-Date: 2014-01-17 22:10+0000\n" "Last-Translator: laia_ <laiaadorio(a)gmail.com>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n" @@ -90,7 +90,7 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "Hauries d'actualitzar a %{name}s %{version}s.\n\nFor more information about this new version, go to %{details_url}s.\n\nIt is recommended to close all the open applications during the upgrade.\nDownloading the upgrade might take a long time, from several minutes to a few hours.\nThe networking will be disabled after downloading the upgrade.\n\nDownload size: %{size}s\n\nDo you want to upgrade now?" +msgstr "Hauries d'actualitzar a %{name}s %{version}s.\n\nPer a més informació sobre aquesta nova versió, ves a %{details_url}s.\n\nÉs recomanable tancar totes les aplicacions obertes durant l'actualització.\nDescaregar l'habitació pot tardar una estona, des de pocs minuts fins a unes quantes hores. \nLa xarxa serà deshabilitada després de descarregar l'actualització.\n\nMida de descàrrega: %{size}s\n\nVols actualitzar ara?" #: ../lib/Tails/IUK/Frontend.pm:330 msgid "Upgrade available" @@ -98,11 +98,11 @@ msgstr "Actualització disponible" #: ../lib/Tails/IUK/Frontend.pm:331 msgid "Upgrade now" -msgstr "" +msgstr "Actualitzar ara" #: ../lib/Tails/IUK/Frontend.pm:332 msgid "Upgrade later" -msgstr "" +msgstr "Actualitzar després" #: ../lib/Tails/IUK/Frontend.pm:342 #, perl-brace-format @@ -114,11 +114,11 @@ msgid "" "It is not possible to automatically upgrade your device to this new version.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" -msgstr "" +msgstr "Hauries de fer una actualització manual a %{name}s %{version}s.\n\nPer a més informació sobre aquesta nova versió, vés a %{details_url}s.\n\nNo és possible actualitzar automàticament el teu dispositiu a aquesta nova versió.\n\nPer aprendre com fer una actualització manual, vés a https://tails.boum.org/doc/first_steps/upgrade/#manual" #: ../lib/Tails/IUK/Frontend.pm:356 msgid "New version available" -msgstr "" +msgstr "Nova versió disponible" #: ../lib/Tails/IUK/Frontend.pm:412 msgid "Downloading upgrade" @@ -127,7 +127,7 @@ msgstr "Descarregant actualització" #: ../lib/Tails/IUK/Frontend.pm:415 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." -msgstr "" +msgstr "Descarregant l'actualització a %{name}s %{version}s..." #: ../lib/Tails/IUK/Frontend.pm:456 msgid "" @@ -135,7 +135,7 @@ msgid "" "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " "persists, go to " "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -msgstr "" +msgstr "L'actualtzació no ha pogut ésser descarregada.\\n\\nRevisa la teva connexió en xarxa, i reinicia Tails per intentar actualitzar-lo un altre cop.\\n\\nSi el problema persisteix, vés a file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" #: ../lib/Tails/IUK/Frontend.pm:468 #, perl-brace-format @@ -145,7 +145,7 @@ msgid "" "\n" "stderr:\n" "%{stderr}s" -msgstr "" +msgstr "Informació de depuració\nSurt del codi: %{exit_code}i\n\nstderr:\n%{stderr}s" #: ../lib/Tails/IUK/Frontend.pm:480 ../lib/Tails/IUK/Frontend.pm:494 msgid "Error while downloading the upgrade" @@ -174,7 +174,7 @@ msgid "" "You should restart Tails on the new version as soon as possible.\n" "\n" "Do you want to restart now?" -msgstr "" +msgstr "El teu dispositiu Tails ha estat actualitzat correctament.\n\nAlgunes característiques de seguretat han estat temporalment deshabilitades.\nHauries de reiniciar Tails a la nova versió tan aviat com sigui possible.\n\nVols reiniciar ara?" #: ../lib/Tails/IUK/Frontend.pm:526 msgid "Restart Tails" @@ -213,7 +213,7 @@ msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." -msgstr "" +msgstr "El teu dispositiu Tails està essent actualitzat...\n\nPer raons de seguertat, la xarxa està deshabilitada. " #: ../lib/Tails/IUK/Frontend.pm:609 msgid "" @@ -221,7 +221,7 @@ msgid "" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" " instructions at " "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -msgstr "" +msgstr "Ha ocorregut un error mentre s'instal·lava l'actualització.\\n\\nEl teu dispositiu Tails ha de ser reparat i pot ser que no pugui reiniciar-se.\\n\\nSi us plau segueix les instruccions que hi ha a file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" #: ../lib/Tails/IUK/Frontend.pm:629 msgid "Error while installing the upgrade"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 17 Jan '14

17 Jan '14

commit 5c750013d3ff17b402962fc24a668616e39cf71f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 17 22:15:59 2014 +0000 Update translations for tails-persistence-setup --- ca/ca.po | 83 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/ca/ca.po b/ca/ca.po index dbfd31f..26ce979 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# laia_ <laiaadorio(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2013-11-07 16:37+0100\n" -"PO-Revision-Date: 2013-11-15 09:19+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2013-12-19 12:20+0100\n" +"PO-Revision-Date: 2014-01-17 22:11+0000\n" +"Last-Translator: laia_ <laiaadorio(a)gmail.com>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,59 +20,59 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:48 msgid "Personal Data" -msgstr "" +msgstr "Dades Personals" #: ../lib/Tails/Persistence/Configuration/Presets.pm:50 msgid "Keep files stored in the `Persistent' directory" -msgstr "" +msgstr "Conserva els arxius emmagatzemats en la carpeta \"Persistent\"" #: ../lib/Tails/Persistence/Configuration/Presets.pm:58 msgid "GnuPG" -msgstr "" +msgstr "GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:60 msgid "GnuPG keyrings and configuration" -msgstr "" +msgstr "Claus i configuració de GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:68 msgid "SSH Client" -msgstr "" +msgstr "Client SSH" #: ../lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "SSH keys, configuration and known hosts" -msgstr "" +msgstr "Claus SSH, configuració i hostes coneguts" #: ../lib/Tails/Persistence/Configuration/Presets.pm:78 msgid "Pidgin" -msgstr "" +msgstr "Pidgin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:80 msgid "Pidgin profiles and OTR keyring" -msgstr "" +msgstr "Perfils de Pidgin i clauer de OTR" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 msgid "Claws Mail" -msgstr "" +msgstr "Claws Mail" #: ../lib/Tails/Persistence/Configuration/Presets.pm:90 msgid "Claws Mail profiles and locally stored email" -msgstr "" +msgstr "Perfils de Claws Mail i correu emmagatzemat localment" #: ../lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "GNOME Keyring" -msgstr "" +msgstr "Clauer de GNOME" #: ../lib/Tails/Persistence/Configuration/Presets.pm:100 msgid "Secrets stored by GNOME Keyring" -msgstr "" +msgstr "Secrets emmagatzemats pel clauer de GNOME" #: ../lib/Tails/Persistence/Configuration/Presets.pm:108 msgid "Network Connections" -msgstr "" +msgstr "Connexions en xarxa" #: ../lib/Tails/Persistence/Configuration/Presets.pm:110 msgid "Configuration of network devices and connections" -msgstr "" +msgstr "Configuració de dispositius en xarxa i connexions" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" @@ -91,19 +92,19 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "APT Packages" -msgstr "" +msgstr "Paquets APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Packages downloaded by APT" -msgstr "" +msgstr "Paquets descarregats per APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Lists" -msgstr "" +msgstr "Llistes APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Lists downloaded by APT" -msgstr "" +msgstr "Llistes descarregades per APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:158 msgid "Dotfiles" @@ -118,67 +119,67 @@ msgstr "" msgid "Setup Tails persistent volume" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:331 +#: ../lib/Tails/Persistence/Setup.pm:337 #, perl-format msgid "Device %s already has a persistent volume." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:339 +#: ../lib/Tails/Persistence/Setup.pm:345 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:347 ../lib/Tails/Persistence/Setup.pm:361 +#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 #, perl-format msgid "Device %s has no persistent volume." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:353 +#: ../lib/Tails/Persistence/Setup.pm:359 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:372 +#: ../lib/Tails/Persistence/Setup.pm:378 msgid "Persistence volume is not unlocked." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:377 +#: ../lib/Tails/Persistence/Setup.pm:383 msgid "Persistence volume is not mounted." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:382 +#: ../lib/Tails/Persistence/Setup.pm:388 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:387 +#: ../lib/Tails/Persistence/Setup.pm:393 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:396 +#: ../lib/Tails/Persistence/Setup.pm:402 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:402 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Device %s is optical." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format msgid "Device %s was not created using Tails USB installer." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:444 +#: ../lib/Tails/Persistence/Setup.pm:450 msgid "Error" msgstr "Error" -#: ../lib/Tails/Persistence/Setup.pm:680 +#: ../lib/Tails/Persistence/Setup.pm:665 msgid "Persistence wizard - Finished" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:683 +#: ../lib/Tails/Persistence/Setup.pm:668 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -287,28 +288,28 @@ msgstr "" msgid "Saving persistence configuration..." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:40 +#: ../lib/Tails/Persistence/Step/Delete.pm:41 msgid "Persistence wizard - Persistent volume deletion" msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:43 +#: ../lib/Tails/Persistence/Step/Delete.pm:44 msgid "Your persistent data will be deleted." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:47 +#: ../lib/Tails/Persistence/Step/Delete.pm:48 #, perl-format msgid "" "The persistent volume %s (%s), on the %s %s device, will be deleted." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:53 +#: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:91 +#: ../lib/Tails/Persistence/Step/Delete.pm:101 msgid "Deleting..." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:94 +#: ../lib/Tails/Persistence/Step/Delete.pm:104 msgid "Deleting the persistent volume..." msgstr ""

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 17 Jan '14

17 Jan '14

commit ed3019036d06836763b35045a582b59eebc663fe Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 17 21:46:27 2014 +0000 Update translations for tails-iuk --- ca.po | 55 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/ca.po b/ca.po index 827128e..9e7c660 100644 --- a/ca.po +++ b/ca.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# laia_ <laiaadorio(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-01-07 20:17+0100\n" -"PO-Revision-Date: 2014-01-08 08:17+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-01-17 21:44+0000\n" +"Last-Translator: laia_ <laiaadorio(a)gmail.com>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,11 +29,11 @@ msgid "" "\n" "stderr:\n" "%{stderr}s" -msgstr "" +msgstr "Informació de depuració\nSurt del codi: %{exit_code}i\n\nstdout:\n%{stdout}s\n\nstderr:\n%{stderr}s" #: ../lib/Tails/IUK/Frontend.pm:205 msgid "Error while checking for upgrades" -msgstr "" +msgstr "Error mentre es cercaven actualitzacions" #: ../lib/Tails/IUK/Frontend.pm:208 msgid "" @@ -41,39 +42,39 @@ msgid "" "Check your network connection, and restart Tails to try upgrading again.\n" "\n" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -msgstr "" +msgstr "No es pot determinar si hi ha una actualització disponible de la nostra pàgina web\n\nRevisa la teva connexió de xarxa i reinicia Tails per intentar actualitzar-lo un altre cop\n\nSi el problema romàn, vés a file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" #: ../lib/Tails/IUK/Frontend.pm:224 msgid "The system is up-to-date" -msgstr "" +msgstr "El sistema està actualitzat" #: ../lib/Tails/IUK/Frontend.pm:229 msgid "This version of Tails is outdated, and may have security issues." -msgstr "" +msgstr "Aquesta versió de Tails està obsoleta i pot presentar problemes de seguretat. " #: ../lib/Tails/IUK/Frontend.pm:262 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." -msgstr "" +msgstr "L'Actualització incremental disponible requereix %{space_needed}s d'espai lliure a la partició de Tails, però només hi ha %{free_space}s disponible. " #: ../lib/Tails/IUK/Frontend.pm:279 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." -msgstr "" +msgstr "L'actualització incremental requereix %{memory_needed}s de memòria lliure, però nomes hi ha %{free_memory}s disponible. " #: ../lib/Tails/IUK/Frontend.pm:301 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." -msgstr "" +msgstr "Hi ha una actualització incremental disponible, però cap de completa.\nAixò no hauria de passar. Si us plau, informa de l'error. " #: ../lib/Tails/IUK/Frontend.pm:305 msgid "Error while detecting available upgrades" -msgstr "" +msgstr "Error durant la detecció d'actualitzacions" #: ../lib/Tails/IUK/Frontend.pm:315 #, perl-brace-format @@ -89,11 +90,11 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "" +msgstr "Hauries d'actualitzar a %{name}s %{version}s.\n\nFor more information about this new version, go to %{details_url}s.\n\nIt is recommended to close all the open applications during the upgrade.\nDownloading the upgrade might take a long time, from several minutes to a few hours.\nThe networking will be disabled after downloading the upgrade.\n\nDownload size: %{size}s\n\nDo you want to upgrade now?" #: ../lib/Tails/IUK/Frontend.pm:330 msgid "Upgrade available" -msgstr "" +msgstr "Actualització disponible" #: ../lib/Tails/IUK/Frontend.pm:331 msgid "Upgrade now" @@ -121,7 +122,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:412 msgid "Downloading upgrade" -msgstr "" +msgstr "Descarregant actualització" #: ../lib/Tails/IUK/Frontend.pm:415 #, perl-brace-format @@ -148,22 +149,22 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:480 ../lib/Tails/IUK/Frontend.pm:494 msgid "Error while downloading the upgrade" -msgstr "" +msgstr "Error mentre es descarregava l'actualització" #: ../lib/Tails/IUK/Frontend.pm:487 #, perl-brace-format msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." -msgstr "" +msgstr "L'arxiu de sortida '%{output_file}s' no existeix, però tails-iuk-get-target-file no s'ha queixat. Si us plau, informa de l'error. " #: ../lib/Tails/IUK/Frontend.pm:506 msgid "Error while creating temporary downloading directory" -msgstr "" +msgstr "Error mentre es creava la carperta temporal de descàrrega" #: ../lib/Tails/IUK/Frontend.pm:509 msgid "Failed to create temporary download directory" -msgstr "" +msgstr "Fallida en crear la carpeta temporal de descàrrega" #: ../lib/Tails/IUK/Frontend.pm:521 msgid "" @@ -177,35 +178,35 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:526 msgid "Restart Tails" -msgstr "" +msgstr "Reinicia Tails" #: ../lib/Tails/IUK/Frontend.pm:527 msgid "Restart now" -msgstr "" +msgstr "Reinicia ara" #: ../lib/Tails/IUK/Frontend.pm:528 msgid "Restart later" -msgstr "" +msgstr "Reinicia després" #: ../lib/Tails/IUK/Frontend.pm:539 msgid "Error while restarting the system" -msgstr "" +msgstr "Error mentre es reiniciava el sistema" #: ../lib/Tails/IUK/Frontend.pm:542 msgid "Failed to restart the system" -msgstr "" +msgstr "Fallida en reiniciar el sistema" #: ../lib/Tails/IUK/Frontend.pm:557 msgid "Error while shutting down the network" -msgstr "" +msgstr "Error mentre s'apagava la xarxa" #: ../lib/Tails/IUK/Frontend.pm:560 msgid "Failed to shutdown network" -msgstr "" +msgstr "Fallida en apagar la xarxa" #: ../lib/Tails/IUK/Frontend.pm:570 msgid "Upgrading the system" -msgstr "" +msgstr "Actualitzant el sistema" #: ../lib/Tails/IUK/Frontend.pm:572 msgid "" @@ -224,4 +225,4 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:629 msgid "Error while installing the upgrade" -msgstr "" +msgstr "Error mentre s'instal·lava l'actualització"

1 0

[tor/master] whitespace fixes
by nickm＠torproject.org 17 Jan '14

17 Jan '14

commit 9be105f94badd2a9ab1674b3c2b427df33426ecd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 17 12:41:56 2014 -0500 whitespace fixes --- src/common/sandbox.c | 1 - src/or/connection_edge.c | 1 - 2 files changed, 2 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 0b67b18..dec6bfe 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -411,7 +411,6 @@ sb_socket(scmp_filter_ctx ctx, sandbox_cfg_t *filter) if (rc) return rc; - rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(socket), 3, SCMP_CMP(0, SCMP_CMP_EQ, PF_INET), SCMP_CMP(1, SCMP_CMP_EQ, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK), diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index d5969ae..4ca926e 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2089,7 +2089,6 @@ connection_ap_handshake_socks_resolved_addr(entry_connection_t *conn, } } - /** Send an answer to an AP connection that has requested a DNS lookup via * SOCKS. The type should be one of RESOLVED_TYPE_(IPV4|IPV6|HOSTNAME) or -1 * for unreachable; the answer should be in the format specified in the socks

1 0

[tor/master] Coverate in util.c: test that tor_parse_* rejects negative base.
by nickm＠torproject.org 17 Jan '14

17 Jan '14

commit 8a49fac9e0e201d0d1774c066bc6984ed7773401 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 13 16:38:48 2014 -0500 Coverate in util.c: test that tor_parse_* rejects negative base. --- src/test/test_util.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 376e3aa..9104088 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1027,6 +1027,8 @@ test_util_strmisc(void) test_eq(0L, tor_parse_long("10",-2,0,100,NULL,NULL)); test_eq(68284L, tor_parse_long("10abc",16,0,70000,NULL,NULL)); test_eq(68284L, tor_parse_long("10ABC",16,0,70000,NULL,NULL)); + test_eq(0, tor_parse_long("10ABC",-1,0,70000,&i,NULL)); + test_eq(i, 0); /* Test parse_ulong */ test_eq(0UL, tor_parse_ulong("",10,0,100,NULL,NULL)); @@ -1038,6 +1040,8 @@ test_util_strmisc(void) test_eq(0UL, tor_parse_ulong("8",8,0,100,NULL,NULL)); test_eq(50UL, tor_parse_ulong("50",10,50,100,NULL,NULL)); test_eq(0UL, tor_parse_ulong("-50",10,-100,100,NULL,NULL)); + test_eq(0UL, tor_parse_ulong("50",-1,50,100,&i,NULL)); + test_eq(0, i); /* Test parse_uint64 */ test_assert(U64_LITERAL(10) == tor_parse_uint64("10 x",10,0,100, &i, &cp)); @@ -1050,6 +1054,9 @@ test_util_strmisc(void) test_assert(U64_LITERAL(0) == tor_parse_uint64("12345678901",10,500,INT32_MAX, &i, &cp)); test_eq(0, i); + test_assert(U64_LITERAL(0) == + tor_parse_uint64("123",-1,0,INT32_MAX, &i, &cp)); + test_eq(0, i); { /* Test parse_double */

1 0

[tor/master] Add an --accel switch to run unit tests with crypto acceleration
by nickm＠torproject.org 17 Jan '14

17 Jan '14

commit ab0fdbb618f52effad41625e88ee341e402a4d6d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 13 16:34:28 2014 -0500 Add an --accel switch to run unit tests with crypto acceleration --- src/test/test.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/test.c b/src/test/test.c index 6ea41b1..9b474e9 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1660,6 +1660,7 @@ main(int c, const char **v) char *errmsg = NULL; int i, i_out; int loglevel = LOG_ERR; + int accel_crypto = 0; #ifdef USE_DMALLOC { @@ -1682,6 +1683,8 @@ main(int c, const char **v) loglevel = LOG_INFO; } else if (!strcmp(v[i], "--debug")) { loglevel = LOG_DEBUG; + } else if (!strcmp(v[i], "--accel")) { + accel_crypto = 1; } else { v[i_out++] = v[i]; } @@ -1696,7 +1699,7 @@ main(int c, const char **v) } options->command = CMD_RUN_UNITTESTS; - if (crypto_global_init(0, NULL, NULL)) { + if (crypto_global_init(accel_crypto, NULL, NULL)) { printf("Can't initialize crypto subsystem; exiting.\n"); return 1; }

1 0

[torspec/master] Make section references easier to search for.
by nickm＠torproject.org 17 Jan '14

17 Jan '14

commit 6e1ca0117dcced1dc179223a8207fe73eb722014 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 13 19:26:40 2014 +0100 Make section references easier to search for. Prefix all section references with the word "section", and avoid line breaks between "section[s]" and section numbers. Searching for section references should now be as easy as (for example): grep "section.* 1\.4" dir-spec.txt Also, while going through section references, lower-case 1 instance of "Section" to be consistent with the rest and fix 2 broken references. --- dir-spec.txt | 58 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 39d880e..f141065 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -373,7 +373,8 @@ [At start, exactly once.] Indicates the beginning of a router descriptor. "nickname" must be a - valid router nickname as specified in 2.3. "address" must be an IPv4 + valid router nickname as specified in section 2.3. "address" must be + an IPv4 address in dotted-quad format. The last three numbers indicate the TCP ports at which this OR exposes functionality. ORPort is a port at which this OR accepts TLS connections for the main OR protocol; @@ -480,7 +481,8 @@ [At most once.] - An exit-policy summary as specified in 3.3 and 3.5.2, summarizing + An exit-policy summary as specified in sections 3.3 and 3.5.2, + summarizing the router's rules for connecting to IPv6 addresses. A missing "ipv6-policy" line is equivalent to "ipv6-policy reject 1-65535". @@ -635,7 +637,8 @@ "write-history" YYYY-MM-DD HH:MM:SS (NSEC s) NUM,NUM,NUM,NUM,NUM... NL [At most once.] - As documented in 2.1 above. See migration notes in section 2.2.1. + As documented in section 2.1 above. See migration notes in + section 2.2.1. "geoip-db-digest" Digest NL [At most once.] @@ -1129,13 +1132,13 @@ [Exactly once, at start] - The "onion-key" element as specified in 2.1. + The "onion-key" element as specified in section 2.1. "ntor-onion-key" base-64-encoded-key [At most once] - The "ntor-onion-key" element as specified in 2.1. + The "ntor-onion-key" element as specified in section 2.1. (Only included when generating microdescriptors for consensus-method 16 or later.) @@ -1144,20 +1147,20 @@ [Any number] - The "or-address" element as specified in 2.1. + The "or-address" element as specified in section 2.1. "family" names NL [At most once] - The "family" element as specified in 2.1. + The "family" element as specified in section 2.1. "p" SP ("accept" / "reject") SP PortList NL [At most once] - The exit-policy summary as specified in 3.3 and 3.5.2. A missing - "p" line is equivalent to "p reject 1-65535". + The exit-policy summary as specified in sections 3.3 and 3.5.2. A + missing "p" line is equivalent to "p reject 1-65535". [With microdescriptors, clients don't learn exact exit policies: clients can only guess whether a relay accepts their request, try the @@ -1168,7 +1171,7 @@ [At most once] - The IPv6 exit policy summary as specified in 3.3 and 3.5.2. A + The IPv6 exit policy summary as specified in sections 3.3 and 3.5.2. A missing "p6" line is equivalent to "p6 reject 1-65535". (Only included when generating microdescriptors for @@ -1245,7 +1248,7 @@ The start of the Interval for this vote. Before this time, the consensus document produced from this vote should not be used. - See 1.4 for voting timeline information. + See section 1.4 for voting timeline information. "flag-thresholds" SP Thresholds NL @@ -1297,15 +1300,15 @@ The time at which the next consensus should be produced; before this time, there is no point in downloading another consensus, since there - won't be a new one. See 1.4 for voting timeline information. + won't be a new one. See section 1.4 for voting timeline information. "valid-until" SP YYYY-MM-DD SP HH:MM:SS NL [Exactly once.] The end of the Interval for this vote. After this time, the - consensus produced by this vote should not be used. See 1.4 for - voting timeline information. + consensus produced by this vote should not be used. See section 1.4 + for voting timeline information. "voting-delay" SP VoteSeconds SP DistSeconds NL @@ -1313,8 +1316,8 @@ VoteSeconds is the number of seconds that we will allow to collect votes from all authorities; DistSeconds is the number of seconds - we'll allow to collect signatures from all authorities. See 1.4 for - voting timeline information. + we'll allow to collect signatures from all authorities. See + section 1.4 for voting timeline information. "client-versions" SP VersionList NL @@ -1513,7 +1516,7 @@ Present only if the OR has at least one IPv6 address. Address and portlist are as for "or-address" as specified in - 2.1. + section 2.1. (Only included when the vote or consensus is generated with consensus-method 14 or later.) @@ -1657,7 +1660,7 @@ Wbe - Weight for Exit-flagged nodes for BEGIN_DIR requests Wbd - Weight for Guard+Exit-flagged nodes for BEGIN_DIR requests - These values are calculated as specified in Section 3.5.3. + These values are calculated as specified in section 3.5.3. The signature contains the following item, which appears Exactly Once for a vote, and At Least Once for a consensus. @@ -1830,7 +1833,7 @@ accept not for all addresses, ignoring all rejects for private netblocks. "Most" addresses are permitted if no more than 2^25 IPv4 addresses (two /8 networks) were blocked. The list is encoded - as described in 3.5.2. + as described in section 3.5.2. 3.5. Computing a consensus from a set of votes @@ -1915,7 +1918,7 @@ for the descriptor we are listing. (They should all be the same. If they are not, we pick the most commonly listed one, breaking ties in favor of the lexicographically larger - vote.) The port list is encoded as specified in 3.5.2. + vote.) The port list is encoded as specified in section 3.5.2. * If consensus-method 6 or later is in use and if 3 or more authorities provide a Measured= keyword in their votes for @@ -2195,7 +2198,7 @@ Examples for consensus flavors include: - Publishing hashes of microdescriptors instead of hashes of - full descriptors (see 3.6.2). + full descriptors (see section 3.6.2). - Including different digests of descriptors, instead of the perhaps-soon-to-be-totally-broken SHA1. @@ -2251,7 +2254,7 @@ [At start, exactly once.] - Similar to "r" lines in 3.3, but without the digest element. + Similar to "r" lines in section 3.3, but without the digest element. "p" ... NL @@ -2512,7 +2515,7 @@ [XXXX define recent] Authorities SHOULD NOT download descriptors for routers that they would - immediately reject for reasons listed in 3.1. + immediately reject for reasons listed in section 4.1. 4.5. Downloading and storing microdescriptors (caches only) @@ -2549,7 +2552,7 @@ documents currently held. If so, it downloads whatever extra-info documents are missing. Caches download from authorities; non-caches try to download from caches. We follow the same splitting and back-off rules - as in 4.4 (if a cache) or 5.3 (if a client). + as in section 4.4 (if a cache) or section 5.3 (if a client). 4.7. General-use HTTP URLs @@ -2727,12 +2730,12 @@ - The client does not currently have it. - The client is not currently trying to download it. - The client would not discard it immediately upon receiving it. - - The client thinks it is running and valid (see 6.1 below). + - The client thinks it is running and valid (see section 6.1 below). If at least 16 known routers have downloadable descriptors, or if enough time (currently 10 minutes) has passed since the last time the client tried to download descriptors, it launches requests for all - downloadable descriptors, as described in 5.3 below. + downloadable descriptors, as described in section 5.3 below. When a descriptor download fails, the client notes it, and does not consider the descriptor downloadable again until a certain amount of time @@ -2794,7 +2797,8 @@ Everyone besides directory authorities uses the approaches in this section to decide which relays to use and what their keys are likely to be. - (Directory authorities just believe their own opinions, as in 3.1 above.) + (Directory authorities just believe their own opinions, as in section 3.4 + above.) 6.1. Choosing routers for circuits.

1 0

[torspec/master] Move section 4.1 "Accepting uploads" to 3.2.
by nickm＠torproject.org 17 Jan '14

17 Jan '14

commit 69ad226562531ca3ca59dc78284e0bcee9d448d5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 13 18:52:51 2014 +0100 Move section 4.1 "Accepting uploads" to 3.2. This commit does not yet repair section numbering or references. --- dir-spec.txt | 70 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 3f71210..c6fe1c5 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1096,6 +1096,41 @@ Authorities MUST generate a new signing key and corresponding certificate before the key expires. +4.1. Accepting uploads (authorities only) + + When a router posts a signed descriptor to a directory authority, the + authority first checks whether it is well-formed and correctly + self-signed. If it is, the authority next verifies that the nickname + in question is not already assigned to a router with a different + public key. + Finally, the authority MAY check that the router is not blacklisted + because of its key, IP, or another reason. + + If the descriptor passes these tests, and the authority does not already + have a descriptor for a router with this public key, it accepts the + descriptor and remembers it. + + If the authority _does_ have a descriptor with the same public key, the + newly uploaded descriptor is remembered if its publication time is more + recent than the most recent old descriptor for that router, and either: + - There are non-cosmetic differences between the old descriptor and the + new one. + - Enough time has passed between the descriptors' publication times. + (Currently, 12 hours.) + + Differences between router descriptors are "non-cosmetic" if they would be + sufficient to force an upload as described in section 2.1 above. + + Note that the "cosmetic difference" test only applies to uploaded + descriptors, not to descriptors that the authority downloads from other + authorities. + + When a router posts a signed extra-info document to a directory authority, + the authority again checks it for well-formedness and correct signature, + and checks that its matches the extra-info-digest in some router + descriptor that it believes is currently useful. If so, it accepts it and + stores it and serves it as requested. If not, it drops it. + 3.2. Microdescriptors Microdescriptors are a stripped-down version of router descriptors @@ -2344,41 +2379,6 @@ All directory authorities and directory caches ("directory servers") implement this section, except as noted. -4.1. Accepting uploads (authorities only) - - When a router posts a signed descriptor to a directory authority, the - authority first checks whether it is well-formed and correctly - self-signed. If it is, the authority next verifies that the nickname - in question is not already assigned to a router with a different - public key. - Finally, the authority MAY check that the router is not blacklisted - because of its key, IP, or another reason. - - If the descriptor passes these tests, and the authority does not already - have a descriptor for a router with this public key, it accepts the - descriptor and remembers it. - - If the authority _does_ have a descriptor with the same public key, the - newly uploaded descriptor is remembered if its publication time is more - recent than the most recent old descriptor for that router, and either: - - There are non-cosmetic differences between the old descriptor and the - new one. - - Enough time has passed between the descriptors' publication times. - (Currently, 12 hours.) - - Differences between router descriptors are "non-cosmetic" if they would be - sufficient to force an upload as described in section 2.1 above. - - Note that the "cosmetic difference" test only applies to uploaded - descriptors, not to descriptors that the authority downloads from other - authorities. - - When a router posts a signed extra-info document to a directory authority, - the authority again checks it for well-formedness and correct signature, - and checks that its matches the extra-info-digest in some router - descriptor that it believes is currently useful. If so, it accepts it and - stores it and serves it as requested. If not, it drops it. - 4.2. Voting (authorities only) Authorities divide time into Intervals. Authority administrators SHOULD

1 0

[torspec/master] Make new subsection for routers uploading descriptors.
by nickm＠torproject.org 17 Jan '14

17 Jan '14

commit 8a1fab7ef143d7886cfd2cd83b53249e742e6d7d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 13 16:54:10 2014 +0100 Make new subsection for routers uploading descriptors. The rule we're trying to follow here is that sections are for roles (client, authority, cache, client) and subsections are for operations performed by the role. Routers really only perform a single operation: they periodically upload their descriptors to the authorities. That's why there should be a single subsection for this operation. This effectively substitutes section number parts "2." with "2.1.": * 2 -> 2.1 * 2.1 -> 2.1.1 * 2.2 -> 2.1.2 * 2.2.1 -> 2.1.2.1 * 2.3 -> 2.1.3 --- dir-spec.txt | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index f141065..184bc2e 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -328,6 +328,8 @@ 2. Router operation and formats +2.1. Uploading router descriptors and extra-info documents + ORs SHOULD generate a new router descriptor and a new extra-info document whenever any of the following events have occurred: @@ -358,7 +360,7 @@ documents may not exceed 50,000 bytes in length. If they do, the authorities SHOULD reject them. -2.1. Router descriptor format +2.1.1. Router descriptor format Router descriptors consist of the following items. For backward compatibility, there should be an extra NL at the end of each router @@ -366,15 +368,15 @@ In lines that take multiple arguments, extra arguments SHOULD be accepted and ignored. Many of the nonterminals below are defined in - section 2.3. + section 2.1.3. "router" nickname address ORPort SOCKSPort DirPort NL [At start, exactly once.] Indicates the beginning of a router descriptor. "nickname" must be a - valid router nickname as specified in section 2.3. "address" must be - an IPv4 + valid router nickname as specified in section 2.1.3. "address" must + be an IPv4 address in dotted-quad format. The last three numbers indicate the TCP ports at which this OR exposes functionality. ORPort is a port at which this OR accepts TLS connections for the main OR protocol; @@ -530,7 +532,7 @@ [We didn't start parsing these lines until Tor 0.1.0.6-rc; they should be marked with "opt" until earlier versions of Tor are obsolete.] - [See also migration notes in section 2.2.1.] + [See also migration notes in section 2.1.2.1.] "eventdns" bool NL @@ -613,7 +615,7 @@ Tor MAY accept a limited number of addresses or ports. As of Tor 0.2.3.x only the first address and the first port are used. -2.2. Extra-info documents +2.1.2. Extra-info document format Extra-info documents consist of the following items: @@ -637,8 +639,8 @@ "write-history" YYYY-MM-DD HH:MM:SS (NSEC s) NUM,NUM,NUM,NUM,NUM... NL [At most once.] - As documented in section 2.1 above. See migration notes in - section 2.2.1. + As documented in section 2.1.1 above. See migration notes in + section 2.1.2.1. "geoip-db-digest" Digest NL [At most once.] @@ -968,7 +970,7 @@ initial item "extra-info" and the final item "router-signature", signed with the router's identity key. -2.2.1. Moving history fields to extra-info documents. +2.1.2.1. Moving history fields to extra-info documents Tools that want to use the read-history and write-history values SHOULD download extra-info documents as well as router descriptors. Such @@ -981,7 +983,7 @@ produced by older versions of Tor until all Tor versions earlier than 0.2.0.x are obsolete. -2.3. Nonterminals in router descriptors +2.1.3. Nonterminals in router descriptors nickname ::= between 1 and 19 alphanumeric characters ([A-Za-z0-9]), case-insensitive. @@ -1132,13 +1134,13 @@ [Exactly once, at start] - The "onion-key" element as specified in section 2.1. + The "onion-key" element as specified in section 2.1.1. "ntor-onion-key" base-64-encoded-key [At most once] - The "ntor-onion-key" element as specified in section 2.1. + The "ntor-onion-key" element as specified in section 2.1.1. (Only included when generating microdescriptors for consensus-method 16 or later.) @@ -1147,13 +1149,13 @@ [Any number] - The "or-address" element as specified in section 2.1. + The "or-address" element as specified in section 2.1.1. "family" names NL [At most once] - The "family" element as specified in section 2.1. + The "family" element as specified in section 2.1.1. "p" SP ("accept" / "reject") SP PortList NL @@ -1516,7 +1518,7 @@ Present only if the OR has at least one IPv6 address. Address and portlist are as for "or-address" as specified in - section 2.1. + section 2.1.1. (Only included when the vote or consensus is generated with consensus-method 14 or later.) @@ -2373,7 +2375,7 @@ (Currently, 12 hours.) Differences between router descriptors are "non-cosmetic" if they would be - sufficient to force an upload as described in section 2 above. + sufficient to force an upload as described in section 2.1 above. Note that the "cosmetic difference" test only applies to uploaded descriptors, not to descriptors that the authority downloads from other

1 0

[torspec/master] Phrase subsection title as operation.
by nickm＠torproject.org 17 Jan '14

17 Jan '14

commit b310429886e2e74f50601b3325489cfe8f69405f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 13 18:51:02 2014 +0100 Phrase subsection title as operation. --- dir-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir-spec.txt b/dir-spec.txt index a66a684..3f71210 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1019,7 +1019,7 @@ sign new key certificates using new signing keys; it is very sensitive. The signing key is used to sign key certificates and status documents. -3.1. Key certificates +3.1. Creating key certificates Key certificates consist of the following items:

1 0