- tor-commits - lists.torproject.org

[tor/master] Merge branch 'bug6638'
by nickm＠torproject.org 21 Aug '12

21 Aug '12

commit 64676d05714a8248610bdbbc6270966ed440a33c Merge: 939d01f 778d901 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 11:20:58 2012 -0400 Merge branch 'bug6638' src/or/rendservice.c | 42 +++++++++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 17 deletions(-)

1 0

[tor/master] Avoid spurious warnings in rend_service_introduce
by nickm＠torproject.org 21 Aug '12

21 Aug '12

commit 778d90122cf491262e3298007d3165e181bbafe2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 10:15:52 2012 -0400 Avoid spurious warnings in rend_service_introduce There was some code in the "err:" block that would always log a warning, reporting an "unknown error" if we hadn't set err_msg. But there were also plenty of "goto err" blocks that did their own logging, and never set err_msg at all. Now we should only log when we have an error message to log. This fixes bug 6638, from no released Tor version. --- src/or/rendservice.c | 42 +++++++++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 3d8d3e9..bd8b13a 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1177,8 +1177,9 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, /* Early parsing pass (get pk, ciphertext); type 2 is INTRODUCE2 */ parsed_req = rend_service_begin_parse_intro(request, request_len, 2, &err_msg); - if (!parsed_req) goto err; - else if (err_msg) { + if (!parsed_req) { + goto log_error; + } else if (err_msg) { log_info(LD_REND, "%s on circ %d.", err_msg, circuit->_base.n_circ_id); tor_free(err_msg); } @@ -1186,8 +1187,9 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, stage_descr = "early validation"; /* Early validation of pk/ciphertext part */ result = rend_service_validate_intro_early(parsed_req, &err_msg); - if (result < 0) goto err; - else if (err_msg) { + if (result < 0) { + goto log_error; + } else if (err_msg) { log_info(LD_REND, "%s on circ %d.", err_msg, circuit->_base.n_circ_id); tor_free(err_msg); } @@ -1215,14 +1217,15 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, "INTRODUCE2 cell with same PK-encrypted part %d " "seconds ago. Dropping cell.", (int)elapsed); - goto err; + goto err; } stage_descr = "decryption"; /* Now try to decrypt it */ result = rend_service_decrypt_intro(parsed_req, intro_key, &err_msg); - if (result < 0) goto err; - else if (err_msg) { + if (result < 0) { + goto log_error; + } else if (err_msg) { log_info(LD_REND, "%s on circ %d.", err_msg, circuit->_base.n_circ_id); tor_free(err_msg); } @@ -1230,8 +1233,9 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, stage_descr = "late parsing"; /* Parse the plaintext */ result = rend_service_parse_intro_plaintext(parsed_req, &err_msg); - if (result < 0) goto err; - else if (err_msg) { + if (result < 0) { + goto log_error; + } else if (err_msg) { log_info(LD_REND, "%s on circ %d.", err_msg, circuit->_base.n_circ_id); tor_free(err_msg); } @@ -1239,8 +1243,9 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, stage_descr = "late validation"; /* Validate the parsed plaintext parts */ result = rend_service_validate_intro_late(parsed_req, &err_msg); - if (result < 0) goto err; - else if (err_msg) { + if (result < 0) { + goto log_error; + } else if (err_msg) { log_info(LD_REND, "%s on circ %d.", err_msg, circuit->_base.n_circ_id); tor_free(err_msg); } @@ -1251,7 +1256,8 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, /* Find the rendezvous point */ rp = find_rp_for_intro(parsed_req, &need_rp_free, &err_msg); - if (!rp) goto err; + if (!rp) + goto log_error; /* Check if we'd refuse to talk to this router */ if (options->StrictNodes && @@ -1379,21 +1385,23 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, goto done; - err: - status = -1; + log_error: if (!err_msg) { if (stage_descr) { tor_asprintf(&err_msg, "unknown %s error for INTRODUCE2", stage_descr); - } else { + } else { err_msg = tor_strdup("unknown error for INTRODUCE2"); - } + } } + + log_warn(LD_REND, "%s on circ %d", err_msg, circuit->_base.n_circ_id); + err: + status = -1; if (dh) crypto_dh_free(dh); if (launched) { circuit_mark_for_close(TO_CIRCUIT(launched), reason); } - log_warn(LD_REND, "%s on circ %d", err_msg, circuit->_base.n_circ_id); tor_free(err_msg); done:

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 21 Aug '12

21 Aug '12

commit 0e474acf269c75bc362412b35cdeed04917c4fbf Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 21 15:15:31 2012 +0000 Update translations for whisperback_completed --- cs/cs.po | 247 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 247 insertions(+), 0 deletions(-) diff --git a/cs/cs.po b/cs/cs.po new file mode 100644 index 0000000..a603052 --- /dev/null +++ b/cs/cs.po @@ -0,0 +1,247 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <digitaldreamer(a)email.cz>, 2012. +msgid "" +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 22:33+0100\n" +"PO-Revision-Date: 2012-08-21 15:14+0000\n" +"Last-Translator: digitaldreamer <digitaldreamer(a)email.cz>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" + +#. XXX use a better exception +#: ../whisperBack/whisperback.py:63 +#, python-format +msgid "Invalid contact email: %s" +msgstr "Neplatný kontaktní email: %s" + +#: ../whisperBack/whisperback.py:80 +#, python-format +msgid "Invalid contact OpenPGP key: %s" +msgstr "Neplatný kontaktní OpenPGP klíč: %s" + +#: ../whisperBack/whisperback.py:82 +msgid "Invalid contact OpenPGP public key block" +msgstr "Neplatný blok veřejného OpenPGP klíče" + +#: ../whisperBack/encryption.py:126 +msgid "No keys found." +msgstr "Žádné klíče nebyly nalezeny." + +#: ../whisperBack/exceptions.py:41 +#, python-format +msgid "" +"The variable %s was not found in any of the configuation " +"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" +msgstr "Proměnná %s nebyla nalezena v žádném z konfiguračních souborů/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" + +#: ../whisperBack/gui.py:114 +msgid "Name of the affected software" +msgstr "Název postiženého softwaru" + +#: ../whisperBack/gui.py:115 +msgid "Exact steps to reproduce the problem" +msgstr "Přesný popis kroků po kterých dochází k problému" + +#: ../whisperBack/gui.py:116 +msgid "Actual result / the problem" +msgstr "Aktuální výsledek / problém" + +#: ../whisperBack/gui.py:117 +msgid "Desired result" +msgstr "Očekávaný výsledek" + +#: ../whisperBack/gui.py:155 +msgid "Unable to load a valid configuration." +msgstr "Nelze nahrát platnou konfiguraci" + +#: ../whisperBack/gui.py:177 +#, python-format +msgid "" +"<h1>Help us fix your bug!</h1>\n" +"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n" +"<p><strong>Do not include more personal information than\n" +"needed!</strong></p>\n" +"<h2>About giving us an email address</h2>\n" +"<p>If you don't mind disclosing some bits of your identity\n" +"to Tails developers, you can provide an email address to\n" +"let us ask more details about the bug. Additionally entering\n" +"a public PGP key enables us to encrypt such future\n" +"communication.</p>\n" +"<p>Anyone who can see this reply will probably infer you are\n" +"a Tails user. Time to wonder how much you trust your\n" +"Internet and mailbox providers?</p>\n" +msgstr "<h1>Pomozte nám spravit váš problém!</h1>\n <p>Přečtěte si <a href=\"%s\">naše instrukce pro nahlášení problému</a>.</p>\n <p><strong>Nepřikládejte více osobních informací než je \n třeba!</strong></p>\n <h2>Pokud nám chcete dát svou emailovou adresu</h2>\n <p>Nevadí-li vám částečné odhalení vaší identity\n vývojářům softwaru Tails, můžete poskytnout svou emailovou adresu\\n abychom se vás mohli zeptat na podrobnosti kolem vámi pozorovaného problému.. Přidáním\n veřejného PGP klíče nám umožní naší budoucí korespondenci s vámi zabezpečit \n šifrováním.</p>\n <p>Kdokoli kdo uvidí tuto odpověď, bude vědět že jste\n uživatelem softwaru Tails. Není na čase zvážit, nakolik věříte vašemu\n poskytovateli internetu a emailu?</p>\n" + +#: ../whisperBack/gui.py:229 +msgid "Sending mail..." +msgstr "Odesílám mail..." + +#: ../whisperBack/gui.py:230 +msgid "Sending mail" +msgstr "Odesílám mail" + +#. pylint: disable=C0301 +#: ../whisperBack/gui.py:232 +msgid "This could take a while..." +msgstr "Může to chvíli trvat..." + +#: ../whisperBack/gui.py:246 +msgid "The contact email adress doesn't seem valid." +msgstr "Zdá se, že kontaktní emailová adresa je neplatná." + +#: ../whisperBack/gui.py:263 +msgid "Unable to send the mail: SMTP error." +msgstr "Mail nelze odeslat. Chyba SMTP." + +#: ../whisperBack/gui.py:265 +msgid "Unable to connect to the server." +msgstr "Nelze se připojit k serveru." + +#: ../whisperBack/gui.py:267 +msgid "Unable to create or to send the mail." +msgstr "Mail nelze vytvořit nebo odeslat." + +#: ../whisperBack/gui.py:270 +msgid "" +"\n" +"\n" +"The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" +"\n" +"If it does not work, you will be offered to save the bug report." +msgstr "\n\nHlášení o problému nebylo možné odeslat, pravděpodobně kvůli problémům sítě. Zkuste se, prosím, znovu připojit k síti a znovu kliknout na Odeslat.\n\nPokud to nebude fungovat, bude vám nabídnuta možnost hlášení o problému uložit." + +#: ../whisperBack/gui.py:283 +msgid "Your message has been sent." +msgstr "Vaše zpráva byla úspěšně odeslána." + +#: ../whisperBack/gui.py:289 +msgid "Unable to find encryption key." +msgstr "Nelze najít šifrovací klíč." + +#: ../whisperBack/gui.py:293 +msgid "An error occured during encryption." +msgstr "Během šifrování došlo k chybě." + +#: ../whisperBack/gui.py:313 +#, python-format +msgid "Unable to save %s." +msgstr "Nelze uložit %s." + +#. XXX: fix string +#: ../whisperBack/gui.py:337 +#, python-format +msgid "" +"The bug report could not be sent, likely due to network problems.\n" +"\n" +"As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" +"\n" +"Do you want to save the bug report to a file?" +msgstr "Hlášení o problému nebylo možné odeslat, pravděpodobně kvůli problémům sítě. \n\nLze to obejít tak, že své hlášení o problému uložíte na USB flashdisk a pokusíte s ho poslat na %s z jiného počítače. Mějte na paměti, že vaše hlášení v tomto případě nebude anonymní, pokud se o to nepostaráte smi (jako například že se připojít přez Tor jednoráznově založenému emailovému účtu).\n\nChcete tedy uložit hlášení o problému jako soubor?" + +#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11 +msgid "WhisperBack" +msgstr "WhisperBack" + +#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8 +msgid "Send feedback in an encrypted mail." +msgstr "Poslat odezvu jako šifrovaný mail." + +#: ../whisperBack/gui.py:405 +msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" +msgstr "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" + +#: ../whisperBack/gui.py:406 +msgid "Tails developers <tails(a)boum.org>" +msgstr "Vývojáři softwaru Tails <tails(a)boum.org>" + +#: ../whisperBack/gui.py:407 +msgid "translator-credits" +msgstr "translator-credits" + +#: ../whisperBack/gui.py:434 +msgid "This doesn's seem to be a valid URL or OpenPGP key." +msgstr "Toto nevypadá jako platné URL nebo klíč OpenPGP." + +#: ../data/whisperback.ui.h:1 +msgid "" +"Add a PGP key if you want us to encrypt messages when we respond to you." +msgstr "Přiložte klíč PGP, pokud chcete, abychom vám odpovědi posílali šifrovaně." + +#: ../data/whisperback.ui.h:2 +msgid "Bug description" +msgstr "Popis problému" + +#: ../data/whisperback.ui.h:3 +msgid "Copyright © 2009-2012 tails(a)boum.org" +msgstr "Copyright © 2009-2012 tails(a)boum.org" + +#: ../data/whisperback.ui.h:4 +msgid "Help" +msgstr "Nápověda" + +#: ../data/whisperback.ui.h:5 +msgid "" +"If you want us to encrypt messages when we respond to you, add your key ID, " +"a link to your key, or the key as a public key block:" +msgstr "Pokud chcete, abychom šifrovali zprávy až vám budeme odpovídat, přidejte ID svého klíče, odkaz na váš klíč, nebo klíč jako blok veřejného klíče." + +#: ../data/whisperback.ui.h:6 +msgid "Optional email address to contact you" +msgstr "Nepovinná adresa, na které vás můžeme kontaktovat." + +#: ../data/whisperback.ui.h:7 +msgid "Send" +msgstr "Odeslat" + +#: ../data/whisperback.ui.h:9 +msgid "Summary" +msgstr "Shrnutí" + +#: ../data/whisperback.ui.h:10 +msgid "Technical details to include" +msgstr "Technické detaily k přiložení" + +#: ../data/whisperback.ui.h:12 +msgid "" +"WhisperBack - Send feedback in an encrypted mail\n" +"Copyright (C) 2009-2012 Tails developers <tails(a)boum.org>\n" +"\n" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 3 of the License, or (at\n" +"your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful, but\n" +"WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" +"General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program. If not, see <http://www.gnu.org/licenses/>.\n" +msgstr "WhisperBack - Odešlete vaší odezvu jako zašifrovaný email\nCopyright (C) 2009-2012 Tails developers <tails(a)boum.org>\n\nTento program je svobodný software; můžete ho šířit dál a / nebo modifikovat pokud dodržíte podmínky GNU General Public License tak, jak jí publikovala Free Software Foundation; buď ve verzi 3 této license, nebo (pokud chcete) kteroukoli její novější verzi.\n\nTento program je distribuován v naději, že bude užitečný, ale ZCELA BEZ ZÁRUKY; i bez implicitní záurky PRODEJNOSTI nebo VHODNOSTI KE KONKRÉTNÍMU ÚČELU. Podrobnosti najdete v textu GNU\nGeneral Public License.\n\nKopii GNU General Public License jste měli dostat spolu s tímto programem. Pokud tomu tak není, najde ji na <http://www.gnu.org/licenses/>.\n" + +#: ../data/whisperback.ui.h:28 +msgid "debugging info" +msgstr "Informace pro debuggování" + +#: ../data/whisperback.ui.h:29 +msgid "headers" +msgstr "Hlavičky" + +#: ../data/whisperback.ui.h:30 +msgid "https://tails.boum.org/" +msgstr "https://tails.boum.org/" + +#: ../data/whisperback.ui.h:31 +msgid "optional PGP key" +msgstr "Nepovinný PGP klíč"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 21 Aug '12

21 Aug '12

commit e6157c747d410247c94d0335cde93d9cfdd3ac06 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 21 15:15:30 2012 +0000 Update translations for whisperback --- cs/cs.po | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cs/cs.po b/cs/cs.po index f1316e5..a603052 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -9,7 +9,7 @@ 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 22:33+0100\n" -"PO-Revision-Date: 2012-08-20 14:22+0000\n" +"PO-Revision-Date: 2012-08-21 15:14+0000\n" "Last-Translator: digitaldreamer <digitaldreamer(a)email.cz>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -80,7 +80,7 @@ msgid "" "<p>Anyone who can see this reply will probably infer you are\n" "a Tails user. Time to wonder how much you trust your\n" "Internet and mailbox providers?</p>\n" -msgstr "<h1>Pomozte nám spravit váš problém!</h1>\\n <p>Přečtěte si <a href=\"%s\">naše instrukce pro nahlášení problému</a>.</p>\\n <p><strong>Nepřikládejte více osobních informací než je \\n třeba!</strong></p>\\n <h2>Pokud nám chcete dát svou emailovou adresu</h2>\\n <p>Nevadí-li vám částečné odhalení vaší identity\\n vývojářům softwaru Tails, můžete poskytnout svou emailovou adresu\\n abychom se vás mohli zeptat na podrobnosti kolem vámi pozorovaného problému.. Přidáním\\n veřejného PGP klíče nám umožní naší budoucí korespondenci s vámi zabezpečit \\n šifrováním.</p>\\n <p>Kdokoli kdo uvidí tuto odpověď, bude vědět že jste\\n uživatelem softwaru Tails. Není na čase zvážit, nakolik věříte vašemu\\n poskytovateli internetu a emailu?</p>\\n" +msgstr "<h1>Pomozte nám spravit váš problém!</h1>\n <p>Přečtěte si <a href=\"%s\">naše instrukce pro nahlášení problému</a>.</p>\n <p><strong>Nepřikládejte více osobních informací než je \n třeba!</strong></p>\n <h2>Pokud nám chcete dát svou emailovou adresu</h2>\n <p>Nevadí-li vám částečné odhalení vaší identity\n vývojářům softwaru Tails, můžete poskytnout svou emailovou adresu\\n abychom se vás mohli zeptat na podrobnosti kolem vámi pozorovaného problému.. Přidáním\n veřejného PGP klíče nám umožní naší budoucí korespondenci s vámi zabezpečit \n šifrováním.</p>\n <p>Kdokoli kdo uvidí tuto odpověď, bude vědět že jste\n uživatelem softwaru Tails. Není na čase zvážit, nakolik věříte vašemu\n poskytovateli internetu a emailu?</p>\n" #: ../whisperBack/gui.py:229 msgid "Sending mail..." @@ -118,7 +118,7 @@ msgid "" "The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" "\n" "If it does not work, you will be offered to save the bug report." -msgstr "" +msgstr "\n\nHlášení o problému nebylo možné odeslat, pravděpodobně kvůli problémům sítě. Zkuste se, prosím, znovu připojit k síti a znovu kliknout na Odeslat.\n\nPokud to nebude fungovat, bude vám nabídnuta možnost hlášení o problému uložit." #: ../whisperBack/gui.py:283 msgid "Your message has been sent." @@ -146,7 +146,7 @@ msgid "" "As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" "\n" "Do you want to save the bug report to a file?" -msgstr "Hlášení o problému nebylo možné odeslat, pravděpodobně kvůli problémům sítě. \\n \\n Lze to obejít tak, že své hlášení o problému uložíte na USB flashdisk a pokusíte s ho poslat na %s z jiného počítače. Mějte na paměti, že vaše hlášení v tomto případě nebude anonymní, pokud se o to nepostaráte smi (jako například že se připojít přez Tor jednoráznově založenému emailovému účtu). \\n \\n Chcete tedy uložit hlášení o problému jako soubor?" +msgstr "Hlášení o problému nebylo možné odeslat, pravděpodobně kvůli problémům sítě. \n\nLze to obejít tak, že své hlášení o problému uložíte na USB flashdisk a pokusíte s ho poslat na %s z jiného počítače. Mějte na paměti, že vaše hlášení v tomto případě nebude anonymní, pokud se o to nepostaráte smi (jako například že se připojít přez Tor jednoráznově založenému emailovému účtu).\n\nChcete tedy uložit hlášení o problému jako soubor?" #: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11 msgid "WhisperBack" @@ -158,7 +158,7 @@ msgstr "Poslat odezvu jako šifrovaný mail." #: ../whisperBack/gui.py:405 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" -msgstr "" +msgstr "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" #: ../whisperBack/gui.py:406 msgid "Tails developers <tails(a)boum.org>" @@ -183,7 +183,7 @@ msgstr "Popis problému" #: ../data/whisperback.ui.h:3 msgid "Copyright © 2009-2012 tails(a)boum.org" -msgstr "" +msgstr "Copyright © 2009-2012 tails(a)boum.org" #: ../data/whisperback.ui.h:4 msgid "Help" @@ -193,23 +193,23 @@ msgstr "Nápověda" msgid "" "If you want us to encrypt messages when we respond to you, add your key ID, " "a link to your key, or the key as a public key block:" -msgstr "" +msgstr "Pokud chcete, abychom šifrovali zprávy až vám budeme odpovídat, přidejte ID svého klíče, odkaz na váš klíč, nebo klíč jako blok veřejného klíče." #: ../data/whisperback.ui.h:6 msgid "Optional email address to contact you" -msgstr "" +msgstr "Nepovinná adresa, na které vás můžeme kontaktovat." #: ../data/whisperback.ui.h:7 msgid "Send" -msgstr "" +msgstr "Odeslat" #: ../data/whisperback.ui.h:9 msgid "Summary" -msgstr "" +msgstr "Shrnutí" #: ../data/whisperback.ui.h:10 msgid "Technical details to include" -msgstr "" +msgstr "Technické detaily k přiložení" #: ../data/whisperback.ui.h:12 msgid "" @@ -228,20 +228,20 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "" +msgstr "WhisperBack - Odešlete vaší odezvu jako zašifrovaný email\nCopyright (C) 2009-2012 Tails developers <tails(a)boum.org>\n\nTento program je svobodný software; můžete ho šířit dál a / nebo modifikovat pokud dodržíte podmínky GNU General Public License tak, jak jí publikovala Free Software Foundation; buď ve verzi 3 této license, nebo (pokud chcete) kteroukoli její novější verzi.\n\nTento program je distribuován v naději, že bude užitečný, ale ZCELA BEZ ZÁRUKY; i bez implicitní záurky PRODEJNOSTI nebo VHODNOSTI KE KONKRÉTNÍMU ÚČELU. Podrobnosti najdete v textu GNU\nGeneral Public License.\n\nKopii GNU General Public License jste měli dostat spolu s tímto programem. Pokud tomu tak není, najde ji na <http://www.gnu.org/licenses/>.\n" #: ../data/whisperback.ui.h:28 msgid "debugging info" -msgstr "" +msgstr "Informace pro debuggování" #: ../data/whisperback.ui.h:29 msgid "headers" -msgstr "" +msgstr "Hlavičky" #: ../data/whisperback.ui.h:30 msgid "https://tails.boum.org/" -msgstr "" +msgstr "https://tails.boum.org/" #: ../data/whisperback.ui.h:31 msgid "optional PGP key" -msgstr "" +msgstr "Nepovinný PGP klíč"

1 0

[torspec/master] list method 13 in section 3.5.1
by nickm＠torproject.org 21 Aug '12

21 Aug '12

commit 51b3ba10a114107bd0f062444d2fe809198af03d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 10:52:04 2012 -0400 list method 13 in section 3.5.1 --- dir-spec.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index a9562d4..36b4328 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1763,6 +1763,7 @@ "10" -- Fixes edge case bugs in router flag selection weights "11" -- Don't consider BadExits when calculating bandwidth weights "12" -- Params are only included if enough auths voted for them + "13" -- Omit router entries with missing microdescriptors. Before generating a consensus, an authority must decide which consensus

1 0

[torspec/master] Describe consensus method 13 in dir-spec.txt
by nickm＠torproject.org 21 Aug '12

21 Aug '12

commit 9ff438663d879acf61c796c31a0a0833811d0eac Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 11:03:29 2012 -0400 Describe consensus method 13 in dir-spec.txt Previously, we'd include entries in our microdesc consensus directory even when we couldn't agree on a microdesc for them. --- dir-spec.txt | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index f88ceb3..c6d7633 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1728,6 +1728,9 @@ parameters that more than half of the total number of authorities voted for are included in the consensus. + * If consensus method 13 or later is used, microdesc consensuses + omit any router for which no microdesc was agreed upon. + The signatures at the end of a consensus document are sorted in ascending order by identity digest. @@ -2033,7 +2036,7 @@ "m" SP digest NL - [Exactly once.] + [Exactly once.*] "digest" is the base64 of the SHA256 hash of the router's microdescriptor with trailing =s omitted. For a given router @@ -2046,6 +2049,9 @@ most common. If there is no winner, we break ties in the favor of the lexically earliest. + [*Before consensus method 13, this field was sometimes erroneously + omitted.] + 3.7. Detached signatures Assuming full connectivity, every authority should compute and sign the

1 0

[torspec/master] Fix a couple of typos
by nickm＠torproject.org 21 Aug '12

21 Aug '12

commit 9d144e10293611e06fd135a881ffea377b1fd855 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Aug 17 22:20:55 2012 +0200 Fix a couple of typos --- dir-spec.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index c6d7633..4a129ad 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1092,11 +1092,11 @@ (Note that with microdescriptors, clients do not learn the identity of their routers: they only learn a hash of the identity key. This is all they need to confirm the actual identity key when doing a TLS handshake, - and all they need to put the identity key digest in their cREATE cells.) + and all they need to put the identity key digest in their CREATE cells.) 3.3. Vote and consensus status documents - Votes and consensuses are more strictly formatted then other documents + Votes and consensuses are more strictly formatted than other documents in this specification, since different authorities must be able to generate exactly the same consensus given the same set of votes.

1 0

[torspec/master] Merge remote-tracking branch 'sebastian/bug6404_spec'
by nickm＠torproject.org 21 Aug '12

21 Aug '12

commit 64b939fdcdda47ffcf468f36c0e63e13ee15e158 Merge: 5ce6cbb 9d144e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 10:38:33 2012 -0400 Merge remote-tracking branch 'sebastian/bug6404_spec' dir-spec.txt | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-)

1 0

[tor/master] Don't include a router in an md consensus if we can't find a md for it.
by nickm＠torproject.org 21 Aug '12

21 Aug '12

commit 7143d112a69806bde4a29bf8da94704cfb435fe3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 10:54:14 2012 -0400 Don't include a router in an md consensus if we can't find a md for it. The spec requires that every router in a microdesc consensus have an m line; we weren't obeying that spec. This creates a new consensus method (13) to allow voting to continue to work right. Partial fix for bug 6404; fix on 0.2.2.6-alpha. --- changes/bug6404 | 5 +++++ src/or/dirvote.c | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/changes/bug6404 b/changes/bug6404 index d01964d..64d4594 100644 --- a/changes/bug6404 +++ b/changes/bug6404 @@ -5,3 +5,8 @@ with complex policies or family declarations. Partial fix for bug 6404; fix on 0.2.2.6-alpha. + - Authorities no longer include any router in their + microdescriptor consensuses for which they couldn't generate or + agree on a microdescriptor. Partial fix for bug 6404; fix on + 0.2.2.6-alpha. + diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 85ea85c..87af5be 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -54,7 +54,7 @@ static int dirvote_publish_consensus(void); static char *make_consensus_method_list(int low, int high, const char *sep); /** The highest consensus method that we currently support. */ -#define MAX_SUPPORTED_CONSENSUS_METHOD 12 +#define MAX_SUPPORTED_CONSENSUS_METHOD 13 /** Lowest consensus method that contains a 'directory-footer' marker */ #define MIN_METHOD_FOR_FOOTER 9 @@ -72,6 +72,10 @@ static char *make_consensus_method_list(int low, int high, const char *sep); * for a param. */ #define MIN_METHOD_FOR_MAJORITY_PARAMS 12 +/** Lowest consensus method where microdesc consensuses omit any entry + * with no microdesc. */ +#define MIN_METHOD_FOR_MANDATORY_MICRODESC 13 + /* ===== * Voting * =====*/ @@ -1935,6 +1939,13 @@ networkstatus_compute_consensus(smartlist_t *votes, } } + if (flavor == FLAV_MICRODESC && + consensus_method >= MIN_METHOD_FOR_MANDATORY_MICRODESC && + tor_digest256_is_zero(microdesc_digest)) { + /* With no microdescriptor digest, we omit the entry entirely. */ + continue; + } + { char buf[4096]; /* Okay!! Now we can write the descriptor... */

1 0

[tor/master] Allow microdescs to be up to 2k. Partial fix for 6404.
by nickm＠torproject.org 21 Aug '12

21 Aug '12

commit 2503cfad240bfd59b033b4380b0ebd4a8a148802 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 10:48:35 2012 -0400 Allow microdescs to be up to 2k. Partial fix for 6404. --- changes/bug6404 | 7 +++++++ src/or/dirvote.c | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/changes/bug6404 b/changes/bug6404 new file mode 100644 index 0000000..d01964d --- /dev/null +++ b/changes/bug6404 @@ -0,0 +1,7 @@ + o Minor bugfixes: + + - Increase the maximum length of microdescriptor we are willing to + generate from 1K to 2K. Occasionally this is needed for routers + with complex policies or family declarations. Partial fix for + bug 6404; fix on 0.2.2.6-alpha. + diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 7995873..85ea85c 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3502,7 +3502,7 @@ dirvote_create_microdescriptor(const routerinfo_t *ri) { microdesc_t *result = NULL; char *key = NULL, *summary = NULL, *family = NULL; - char buf[1024]; + char buf[2048]; size_t keylen; char *out = buf, *end = buf+sizeof(buf);

1 0