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

[tor/master] Don't tor_close_socket(-1) in tor-resolve.
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit e5a987fbb8cd5574be392abed3e9f5f366dacc47 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 11 17:32:58 2013 -0500 Don't tor_close_socket(-1) in tor-resolve. Bugfix on 96b1bd4fb8e64. Not in any released Tor. --- src/tools/tor-resolve.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 9b3aa98..306f6c6 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -201,7 +201,7 @@ do_resolve(const char *hostname, uint32_t sockshost, uint16_t socksport, s = tor_open_socket(PF_INET,SOCK_STREAM,IPPROTO_TCP); if (s<0) { log_sock_error("creating_socket", -1); - goto err; + return -1; } memset(&socksaddr, 0, sizeof(socksaddr));

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 11 Feb '13

11 Feb '13

commit 8252264307c6fce5e9510829bcc28daea2c170e6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 11 22:16:09 2013 +0000 Update translations for mat-gui_completed --- pt_BR.po | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 178 insertions(+), 0 deletions(-) diff --git a/pt_BR.po b/pt_BR.po new file mode 100644 index 0000000..7b248d7 --- /dev/null +++ b/pt_BR.po @@ -0,0 +1,178 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Marcos Ortiz <marcosortizf(a)gmail.com>, 2013. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2013-01-05 20:03+0100\n" +"PO-Revision-Date: 2013-02-11 22:01+0000\n" +"Last-Translator: marcosof <marcosortizf(a)gmail.com>\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: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: mat-gui:95 mat-gui:563 mat-gui:579 +msgid "Ready" +msgstr "Pronto" + +#: mat-gui:107 +msgid "Add" +msgstr "Adiciona" + +#: mat-gui:109 mat-gui:183 +msgid "Add files" +msgstr "Adiciona arquivos" + +#: mat-gui:113 mat-gui:203 mat-gui:308 mat-gui:311 mat-gui:555 mat-gui:557 +#: mat-gui:573 mat-gui:575 +msgid "Clean" +msgstr "Limpar" + +#: mat-gui:115 +msgid "Clean selected files" +msgstr "Limpar arquivos selecionados" + +#: mat-gui:119 mat-gui:214 +msgid "Check" +msgstr "Verificar" + +#: mat-gui:121 +msgid "Check selected files for harmful meta" +msgstr "Verificar meta prejudical em arquivos selecionados" + +#: mat-gui:125 mat-gui:185 +msgid "Quit" +msgstr "Sair" + +#: mat-gui:137 +msgid "Path" +msgstr "Caminho" + +#: mat-gui:137 mat-gui:363 +msgid "Filename" +msgstr "Nome do arquivo" + +#: mat-gui:137 mat-gui:365 +msgid "Mimetype" +msgstr "Tipo MIME" + +#: mat-gui:137 +msgid "State" +msgstr "Estado" + +#: mat-gui:138 +msgid "Cleaned file" +msgstr "Arquivo limpo" + +#: mat-gui:182 +msgid "Files" +msgstr "Arquivos" + +#: mat-gui:188 +msgid "Edit" +msgstr "Editar" + +#: mat-gui:189 +msgid "Clear the filelist" +msgstr "Limpar a lista" + +#: mat-gui:192 mat-gui:447 +msgid "Preferences" +msgstr "Preferências" + +#: mat-gui:195 +msgid "Process" +msgstr "Processo" + +#: mat-gui:218 +msgid "Help" +msgstr "Ajuda" + +#: mat-gui:219 mat-gui:395 +msgid "Supported formats" +msgstr "Formatos suportados" + +#: mat-gui:220 +msgid "About" +msgstr "Sobre" + +#: mat-gui:241 +msgid "Choose files" +msgstr "Escolher arquivos" + +#: mat-gui:248 +msgid "All files" +msgstr "Todos arquivos" + +#: mat-gui:255 +msgid "Supported files" +msgstr "Arquivos suportados" + +#: mat-gui:297 +msgid "unknow" +msgstr "Desconhecido" + +#: mat-gui:313 mat-gui:559 +msgid "Dirty" +msgstr "Erro" + +#: mat-gui:343 +msgid "Not-supported" +msgstr "Não suportado" + +#: mat-gui:381 +msgid "This software was coded during the GSoC 2011" +msgstr "Este software foi codificado durante o G8oC 2011" + +#: mat-gui:386 +msgid "Website" +msgstr "Web" + +#: mat-gui:461 +msgid "Force Clean" +msgstr "Limpeza forçada" + +#: mat-gui:464 +msgid "Do not check if already clean before cleaning" +msgstr "Não marque se já limpou antes" + +#: mat-gui:468 +msgid "Backup" +msgstr "Backup" + +#: mat-gui:471 +msgid "Keep a backup copy" +msgstr "Faça backup" + +#: mat-gui:474 +msgid "Reduce PDF quality" +msgstr "Reduzir qualidade do PDF" + +#: mat-gui:477 +msgid "Reduce the produced PDF size and quality" +msgstr "Reduzir tamanho e qualidade do PDF produzido" + +#: mat-gui:480 +msgid "Add unsupported file to archives" +msgstr "Adiciona arquivo não suportado aos arquivos" + +#: mat-gui:484 +msgid "Add non-supported (and so non-anonymised) file to output archive" +msgstr "Adiciona arquivo não suportado (e não anônimo) para o arquivo de saída" + +#: mat-gui:554 +#, python-format +msgid "Checking %s..." +msgstr "Verificando %s..." + +#: mat-gui:572 +#, python-format +msgid "Cleaning %s..." +msgstr "Limpando %s..."

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 11 Feb '13

11 Feb '13

commit 86b3cce57c0811def00461fae7f4145968a4388a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 11 22:16:07 2013 +0000 Update translations for mat-gui --- pt_BR.po | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 7e7ab5e..7b248d7 100644 --- a/pt_BR.po +++ b/pt_BR.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: 2013-01-05 20:03+0100\n" -"PO-Revision-Date: 2013-02-11 21:45+0000\n" +"PO-Revision-Date: 2013-02-11 22:01+0000\n" "Last-Translator: marcosof <marcosortizf(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -61,7 +61,7 @@ msgstr "Nome do arquivo" #: mat-gui:137 mat-gui:365 msgid "Mimetype" -msgstr "" +msgstr "Tipo MIME" #: mat-gui:137 msgid "State" @@ -117,62 +117,62 @@ msgstr "Arquivos suportados" #: mat-gui:297 msgid "unknow" -msgstr "" +msgstr "Desconhecido" #: mat-gui:313 mat-gui:559 msgid "Dirty" -msgstr "" +msgstr "Erro" #: mat-gui:343 msgid "Not-supported" -msgstr "" +msgstr "Não suportado" #: mat-gui:381 msgid "This software was coded during the GSoC 2011" -msgstr "" +msgstr "Este software foi codificado durante o G8oC 2011" #: mat-gui:386 msgid "Website" -msgstr "" +msgstr "Web" #: mat-gui:461 msgid "Force Clean" -msgstr "" +msgstr "Limpeza forçada" #: mat-gui:464 msgid "Do not check if already clean before cleaning" -msgstr "" +msgstr "Não marque se já limpou antes" #: mat-gui:468 msgid "Backup" -msgstr "" +msgstr "Backup" #: mat-gui:471 msgid "Keep a backup copy" -msgstr "" +msgstr "Faça backup" #: mat-gui:474 msgid "Reduce PDF quality" -msgstr "" +msgstr "Reduzir qualidade do PDF" #: mat-gui:477 msgid "Reduce the produced PDF size and quality" -msgstr "" +msgstr "Reduzir tamanho e qualidade do PDF produzido" #: mat-gui:480 msgid "Add unsupported file to archives" -msgstr "" +msgstr "Adiciona arquivo não suportado aos arquivos" #: mat-gui:484 msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "" +msgstr "Adiciona arquivo não suportado (e não anônimo) para o arquivo de saída" #: mat-gui:554 #, python-format msgid "Checking %s..." -msgstr "" +msgstr "Verificando %s..." #: mat-gui:572 #, python-format msgid "Cleaning %s..." -msgstr "" +msgstr "Limpando %s..."

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 11 Feb '13

11 Feb '13

commit 4b04f48afcff688c56c3ad3ac9091795d6c1c280 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 11 22:15:58 2013 +0000 Update translations for liveusb-creator --- cs/cs.po | 61 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 31 insertions(+), 30 deletions(-) diff --git a/cs/cs.po b/cs/cs.po index 741fd54..d5c6d8f 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -5,13 +5,14 @@ # Translators: # Adam Pribyl <pribyl(a)lowlevel.cz>, 2008-2009. # Adam Přibyl <pribyl(a)lowlevel.cz>, 2008. +# <maniak11(a)gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2012-10-03 18:09+0000\n" -"Last-Translator: Tor Project <tor-assistants(a)torproject.org>\n" +"PO-Revision-Date: 2013-02-11 22:15+0000\n" +"Last-Translator: dope <maniak11(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +33,7 @@ msgstr "Stahuji %s..." #: ../liveusb/gui.py:197 #, python-format msgid "Device is too small: it must be at least %s MiB." -msgstr "" +msgstr "Zařízení má příliš malou kapacitu: musí mít nejméně %s MiB." #: ../liveusb/gui.py:226 msgid "" @@ -43,7 +44,7 @@ msgstr "Chyba: Nelze nastavit jmenovku nebo získat UUID vašeho zařízení. Ne #: ../liveusb/gui.py:276 #, python-format msgid "Installation complete! (%s)" -msgstr "" +msgstr "Instalace kompletní! (%s)" #: ../liveusb/gui.py:281 msgid "LiveUSB creation failed!" @@ -54,26 +55,26 @@ msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." -msgstr "" +msgstr "Upozornění: Tento nástroj je nutné spustit jako Administrátor. Učiníte tak kliknutím pravým tlačítkem na ikonu a vyberte Vlastnosti. V záložce Kompatibilita vyberte možnost Spustit tento program jako správce." #: ../liveusb/gui.py:413 msgid "Unable to find any USB drive" -msgstr "" +msgstr "Nemohu najít žádný USB klíč." #: ../liveusb/gui.py:521 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." " Setting a maximum limit of 8G for the persistent storage." -msgstr "" +msgstr "Zařízení ještě není připojeno, takže není možné zjistit množství volného místa. Nastavte maximální limit 8GB pro trvalé úložiště." #: ../liveusb/gui.py:528 #, python-format msgid "No free space on device %(device)s" -msgstr "" +msgstr "Žádné volné místo na zařízení %(device)s" #: ../liveusb/gui.py:533 msgid "Partition is FAT16; Restricting overlay size to 2G" -msgstr "" +msgstr "Oddíl je FAT16; Omezuje velikost na 2GB" #: ../liveusb/gui.py:577 msgid "Persistent Storage" @@ -81,40 +82,40 @@ msgstr "Trvalé úložiště" #: ../liveusb/gui.py:586 msgid "Installation complete!" -msgstr "" +msgstr "Instalace kompletní!" #: ../liveusb/gui.py:587 msgid "Installation was completed. Press OK to close this program." -msgstr "" +msgstr "Instalace proběhla úspěšně. Stiskněte OK pro ukončení." #: ../liveusb/gui.py:610 msgid "" "The Master Boot Record on your device is blank. Pressing 'Create Live USB' " "again will reset the MBR on this device." -msgstr "" +msgstr "Hlavní bootovací záznam na zařízení je prázdný. Opakovaným stiskem 'Vytvořit Live USB' vyresetujete HBZ na tomto zařízení." #: ../liveusb/gui.py:624 msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." -msgstr "" +msgstr "Varování: Hlavní bootovací záznam vašeho zařízení neodpovídá syslinux bootovacímu záznamu vašeho systému. Jestliže máte problém nabootovat toto zařízení, zkuste zpustit liveusb-creator s --reset-mbr atributem." #: ../liveusb/gui.py:638 msgid "Unable to mount device" -msgstr "" +msgstr "Nemohu připojit zařízení" #: ../liveusb/gui.py:644 msgid "Warning: All data on the selected drive will be lost." -msgstr "" +msgstr "Varování: Všechny data na vybraném zařízení budou ztracena" #: ../liveusb/gui.py:646 ../liveusb/gui.py:663 msgid "Press 'Next' if you wish to continue." -msgstr "" +msgstr "Stiskněte 'Další' pokud si přejete pokračovat." #: ../liveusb/gui.py:648 ../liveusb/gui.py:665 msgid "Next" -msgstr "" +msgstr "Další" #: ../liveusb/gui.py:658 msgid "" @@ -147,18 +148,18 @@ msgstr "Vyberte Live ISO" msgid "" "The selected file is unreadable.Please fix its permissions or select another" " file." -msgstr "" +msgstr "Vybraný soubor je nečitelný. Opravte jeho oprávnění nebo vyberte jiný soubor." #: ../liveusb/gui.py:737 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" -msgstr "" +msgstr "Nemohu použít vybraný soubor. Zkuste přesunout ISO do kořenového adresáře vašeho disku (např. C:\\)" #: ../liveusb/gui.py:743 #, python-format msgid "%(filename)s selected" -msgstr "" +msgstr "%(filename)s zvolen" #: ../liveusb/creator.py:91 msgid "You must run this application as root" @@ -167,7 +168,7 @@ msgstr "Tuto aplikaci musíte spouštět jako root" #: ../liveusb/creator.py:130 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" -msgstr "" +msgstr "Typ zdroje nedovoluje ověření pomocí kontrolního součtu ISO MD5, přeskakuji" #: ../liveusb/creator.py:132 msgid "Verifying ISO MD5 checksum" @@ -175,11 +176,11 @@ msgstr "Ověřuji ISO kontrolní součet MD5 " #: ../liveusb/creator.py:137 msgid "ISO MD5 checksum verification failed" -msgstr "" +msgstr "ISO MD5 checksum selhal" #: ../liveusb/creator.py:139 msgid "ISO MD5 checksum passed" -msgstr "" +msgstr "ISO MD5 checksum prošel" #: ../liveusb/creator.py:144 msgid "Extracting live image to USB device..." @@ -188,7 +189,7 @@ msgstr "Extrahuji žívý obraz na USB zařízení..." #: ../liveusb/creator.py:151 #, python-format msgid "Wrote to device at %(speed)d MB/sec" -msgstr "" +msgstr "Zapsáno na zařízení %(speed)d MB/sec" #: ../liveusb/creator.py:181 msgid "Setting up OLPC boot file..." @@ -199,15 +200,15 @@ msgstr "Nastavuji startovací soubor OLPC..." msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to '%(filename)s'." -msgstr "" +msgstr "Vyskytl se problém s vykonáním následujícího příkazu: '%(command)s'\nPodrobnosti o této chybě byly zapsány do souboru '%(filename)s'." #: ../liveusb/creator.py:384 msgid "Verifying SHA1 checksum of LiveCD image..." -msgstr "" +msgstr "Ověřuji kontrolní součet SHA1 obrazu LiveCD..." #: ../liveusb/creator.py:388 msgid "Verifying SHA256 checksum of LiveCD image..." -msgstr "" +msgstr "Ověřuji kontrolní součet SHA256 obrazu LiveCD..." #: ../liveusb/creator.py:404 msgid "" @@ -231,16 +232,16 @@ msgstr "Vytvářím %sMB překrytí trvalého úložiště" #: ../liveusb/creator.py:487 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" -msgstr "" +msgstr "Nemohu zkopírovat %(infile)s do %(outfile)s: %(message)s" #: ../liveusb/creator.py:497 msgid "Removing existing Live OS" -msgstr "" +msgstr "Odebírám existující Live OS" #: ../liveusb/creator.py:506 ../liveusb/creator.py:517 #, python-format msgid "Unable to chmod %(file)s: %(message)s" -msgstr "" +msgstr "Nemohu změnit oprávnění %(file)s: %(message)s" #: ../liveusb/creator.py:510 #, python-format

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 11 Feb '13

11 Feb '13

commit b3aa7ccee9fe00672a2cea64eaef151bbc40d541 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 11 22:15:06 2013 +0000 Update translations for gettor --- pt_BR/gettor.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pt_BR/gettor.po b/pt_BR/gettor.po index b661085..9af4c9b 100644 --- a/pt_BR/gettor.po +++ b/pt_BR/gettor.po @@ -4,14 +4,15 @@ # # Translators: # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. +# Marcos Ortiz <marcosortizf(a)gmail.com>, 2013. # n3t0 <>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-01-19 12:48+0000\n" -"Last-Translator: m4lqu1570 <>\n" +"PO-Revision-Date: 2013-02-11 22:12+0000\n" +"Last-Translator: marcosof <marcosortizf(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -70,7 +71,7 @@ msgid "" " obfs-linux-i386\n" " obfs-linux-x86_64\n" " source" -msgstr "" +msgstr "Eu lhe enviarei um pacote TOR se você me disser qual você quer. Por favor, selecione o tipo de pacote:⏎ ⏎ windows⏎ macos-i386⏎ macos-ppc⏎ linux-i386⏎ linux-x86_64⏎ obfs-windows⏎ obfs-macos-i386⏎ obfs-macos-x86_64⏎ obfs-linux-i386⏎ obfs-linux-x86_64⏎ fonte" #: lib/gettor/i18n.py:61 msgid "" @@ -267,7 +268,7 @@ msgid "" "Another censorship circumvention tool you can request from GetTor is\n" "the Tor Obfsproxy Browser Bundle. Please read the package descriptions for\n" "which package you should request to receive this." -msgstr "" +msgstr "Outra ferramenta de logro de censura que você pode obter é o proxy Tor Obfs Browser Bundle. Por favor, leia as descrições de pacotes para qual pacote você deve solicitar" #: lib/gettor/i18n.py:179 msgid ""

1 0

[tor/master] Avoid null-pointer deref in pathbias_is_new_circ_attempt
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit f3835bcb37b56478adab7bee312cda2344190b38 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 11 16:59:21 2013 -0500 Avoid null-pointer deref in pathbias_is_new_circ_attempt Coverity is worried about this (CID 980653). It hasn't happened in testing, but we might as well make sure it can't happen. --- src/or/circuitbuild.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index b9a4f89..163afd3 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1307,7 +1307,8 @@ pathbias_is_new_circ_attempt(origin_circuit_t *circ) /* cpath is a circular list. We want circs with more than one hop, * and the second hop must be waiting for keys still (it's just * about to get them). */ - return circ->cpath->next != circ->cpath && + return circ->cpath && + circ->cpath->next != circ->cpath && circ->cpath->next->state == CPATH_STATE_AWAITING_KEYS; #else /* If tagging attacks are no longer possible, we probably want to @@ -1315,7 +1316,8 @@ pathbias_is_new_circ_attempt(origin_circuit_t *circ) * timing-based tagging is still more useful than per-hop failure. * In which case, we'd never want to use this. */ - return circ->cpath->state == CPATH_STATE_AWAITING_KEYS; + return circ->cpath && + circ->cpath->state == CPATH_STATE_AWAITING_KEYS; #endif }

1 0

[tor/master] Fix two more coverity-spotted leaks in master.
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit 99457ee7763a2a93cdbaa611a3243e2eb715db65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 11 17:01:02 2013 -0500 Fix two more coverity-spotted leaks in master. One is a probably-impossible leak if we fail to sign a consensus; another occurs when we can't look up the user we're trying to chown our sockets to. --- src/or/connection.c | 1 + src/or/dirvote.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 7b0f081..737da72 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1068,6 +1068,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, log_warn(LD_NET,"Unable to chown() %s socket: user %s not found.", address, options->User); tor_close_socket(s); + goto err; } else if (chown(address, pw->pw_uid, pw->pw_gid) < 0) { log_warn(LD_NET,"Unable to chown() %s socket: %s.", address, strerror(errno)); diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 66dc50d..358708b 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2121,7 +2121,7 @@ networkstatus_compute_consensus(smartlist_t *votes, digest, digest_len, signing_key)) { log_warn(LD_BUG, "Couldn't sign consensus networkstatus."); - return NULL; /* This leaks, but it should never happen. */ + goto done; } smartlist_add(chunks, tor_strdup(sigbuf));

1 0

[tor/master] Fix a nigh-impossible overflow in cpuworker.c
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit 719940df2bdfbd0f5ee02a9ca404f345d2fc49e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 11 16:40:48 2013 -0500 Fix a nigh-impossible overflow in cpuworker.c When we compute the estimated microseconds we need to handle our pending onionskins, we could (in principle) overflow a uint32_t if we ever had 4 million pending onionskins before we had any data about how onionskins take. Nevertheless, let's compute it properly. Fixes bug 8210; bugfix on 0.2.4.10. Found by coverity; this is CID 980651. --- changes/bug8210 | 6 ++++++ src/or/cpuworker.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug8210 b/changes/bug8210 new file mode 100644 index 0000000..85d41b8 --- /dev/null +++ b/changes/bug8210 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Fix an impossible-to-trigger integer overflow when + estimating how long out onionskin queue would take. (This overflow + would require us to accept 4 million onionskins before processing + 100 of them.) Fixes bug 8210; bugfix on 0.2.4.10-alpha. + diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 6b52f3b..444f17c 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -222,10 +222,10 @@ uint64_t estimated_usec_for_onionskins(uint32_t n_requests, uint16_t onionskin_type) { if (onionskin_type > MAX_ONION_HANDSHAKE_TYPE) /* should be impossible */ - return 1000 * n_requests; + return 1000 * (uint64_t)n_requests; if (PREDICT_UNLIKELY(onionskins_n_processed[onionskin_type] < 100)) { /* Until we have 100 data points, just asssume everything takes 1 msec. */ - return 1000 * n_requests; + return 1000 * (uint64_t)n_requests; } else { /* This can't overflow: we'll never have more than 500000 onionskins * measured in onionskin_usec_internal, and they won't take anything near

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 11 Feb '13

11 Feb '13

commit 2facdf833d5a26a6f2d4d6fc14f42436af78feab Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 11 21:46:06 2013 +0000 Update translations for mat-gui --- pt_BR.po | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 2c9ac88..7e7ab5e 100644 --- a/pt_BR.po +++ b/pt_BR.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: 2013-01-05 20:03+0100\n" -"PO-Revision-Date: 2013-02-11 21:13+0000\n" +"PO-Revision-Date: 2013-02-11 21:45+0000\n" "Last-Translator: marcosof <marcosortizf(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -45,19 +45,19 @@ msgstr "Verificar" #: mat-gui:121 msgid "Check selected files for harmful meta" -msgstr "" +msgstr "Verificar meta prejudical em arquivos selecionados" #: mat-gui:125 mat-gui:185 msgid "Quit" -msgstr "" +msgstr "Sair" #: mat-gui:137 msgid "Path" -msgstr "" +msgstr "Caminho" #: mat-gui:137 mat-gui:363 msgid "Filename" -msgstr "" +msgstr "Nome do arquivo" #: mat-gui:137 mat-gui:365 msgid "Mimetype" @@ -65,55 +65,55 @@ msgstr "" #: mat-gui:137 msgid "State" -msgstr "" +msgstr "Estado" #: mat-gui:138 msgid "Cleaned file" -msgstr "" +msgstr "Arquivo limpo" #: mat-gui:182 msgid "Files" -msgstr "" +msgstr "Arquivos" #: mat-gui:188 msgid "Edit" -msgstr "" +msgstr "Editar" #: mat-gui:189 msgid "Clear the filelist" -msgstr "" +msgstr "Limpar a lista" #: mat-gui:192 mat-gui:447 msgid "Preferences" -msgstr "" +msgstr "Preferências" #: mat-gui:195 msgid "Process" -msgstr "" +msgstr "Processo" #: mat-gui:218 msgid "Help" -msgstr "" +msgstr "Ajuda" #: mat-gui:219 mat-gui:395 msgid "Supported formats" -msgstr "" +msgstr "Formatos suportados" #: mat-gui:220 msgid "About" -msgstr "" +msgstr "Sobre" #: mat-gui:241 msgid "Choose files" -msgstr "" +msgstr "Escolher arquivos" #: mat-gui:248 msgid "All files" -msgstr "" +msgstr "Todos arquivos" #: mat-gui:255 msgid "Supported files" -msgstr "" +msgstr "Arquivos suportados" #: mat-gui:297 msgid "unknow"

1 0

[tor/master] Fix a null-deref-on-fail in unit tests
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit 9b2bb901d7c306fd6ca28de527e86379470db89a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 11 16:32:13 2013 -0500 Fix a null-deref-on-fail in unit tests If geoip_format_bridge_stats() returned NULL when it should have returned a string, we would have tried to deref NULL, and died. Not a big deal in the unit tests, but still worth fixing. Found by coverity; This is CID 743384. --- src/test/test.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/test/test.c b/src/test/test.c index be0737c..6c64d35 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1678,6 +1678,7 @@ test_geoip(void) * the connecting clients added above. */ geoip_bridge_stats_init(now); s = geoip_format_bridge_stats(now + 86400); + test_assert(s); test_streq(bridge_stats_1, s); tor_free(s);

1 0