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

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 27 May '16

27 May '16

commit d68748bd80eeabb3794b33fdb0f85a3fa601a589 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 27 15:45:57 2016 +0000 Update translations for tails-iuk_completed --- pt_BR.po | 97 ++++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 54 insertions(+), 43 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 1a50b87..16c9166 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2016-03-07 17:51+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" +"POT-Creation-Date: 2016-05-25 16:55+0200\n" +"PO-Revision-Date: 2016-05-27 15:38+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -23,18 +23,18 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:522 -#: ../lib/Tails/IUK/Frontend.pm:662 +#: ../lib/Tails/IUK/Frontend.pm:148 ../lib/Tails/IUK/Frontend.pm:524 +#: ../lib/Tails/IUK/Frontend.pm:697 msgid "" "For debugging information, execute the following command: sudo tails-" "debugging-info" msgstr "Para informações sobre depuração, executar o seguinte comando: sudo tails-debugging-info" -#: ../lib/Tails/IUK/Frontend.pm:215 +#: ../lib/Tails/IUK/Frontend.pm:217 msgid "Error while checking for upgrades" msgstr "Erro ao verificar as atualizações" -#: ../lib/Tails/IUK/Frontend.pm:218 +#: ../lib/Tails/IUK/Frontend.pm:220 msgid "" "Could not determine whether an upgrade is available from our website.\n" "\n" @@ -43,64 +43,64 @@ msgid "" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" msgstr "Não foi possível determinar se uma atualização está disponível em nosso website.\n\nVerifique sua conexão de rede e reinicie o Tails para tentar atualizar novamente.\n\nCaso o problema persista, consulte o arquivo:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -#: ../lib/Tails/IUK/Frontend.pm:233 +#: ../lib/Tails/IUK/Frontend.pm:235 msgid "no automatic upgrade is available from our website for this version" msgstr "No nosso website, nenhuma atualização automática para essa versão está disponível" -#: ../lib/Tails/IUK/Frontend.pm:239 +#: ../lib/Tails/IUK/Frontend.pm:241 msgid "your device was not created using Tails Installer" msgstr "seu dispositivo não foi criado usando o Instalador do Tails" -#: ../lib/Tails/IUK/Frontend.pm:244 +#: ../lib/Tails/IUK/Frontend.pm:246 msgid "Tails was started from a DVD or a read-only device" msgstr "O Tails foi inciado a partir de um DVD ou de um dispositivo somente de leitura" -#: ../lib/Tails/IUK/Frontend.pm:249 +#: ../lib/Tails/IUK/Frontend.pm:251 msgid "there is not enough free space on the Tails system partition" msgstr "não há espaço livre suficiente na partição do sistema do Tails" -#: ../lib/Tails/IUK/Frontend.pm:254 +#: ../lib/Tails/IUK/Frontend.pm:256 msgid "not enough memory is available on this system" msgstr "não há memória suficiente disponível nesse sistema" -#: ../lib/Tails/IUK/Frontend.pm:260 +#: ../lib/Tails/IUK/Frontend.pm:262 #, perl-brace-format msgid "No explanation available for reason '%{reason}s'." msgstr "Nenhuma explicação disponível para o motivo '%{reason}s'." -#: ../lib/Tails/IUK/Frontend.pm:280 +#: ../lib/Tails/IUK/Frontend.pm:282 msgid "The system is up-to-date" msgstr "O sistema está atualizado" -#: ../lib/Tails/IUK/Frontend.pm:285 +#: ../lib/Tails/IUK/Frontend.pm:287 msgid "This version of Tails is outdated, and may have security issues." msgstr "Esta versão do Tails está desatualizada e pode ter problemas de segurança." -#: ../lib/Tails/IUK/Frontend.pm:317 +#: ../lib/Tails/IUK/Frontend.pm:319 #, 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 "A atualização incremental disponível requer %{space_needed}s de espaço livre na partição do sistema Tails, mas somente %{free_space}s está disponível." -#: ../lib/Tails/IUK/Frontend.pm:333 +#: ../lib/Tails/IUK/Frontend.pm:335 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." msgstr "A atualização incremental disponível requer %{memory_needed}s de espaço livre, mas somente %{free_memory}s está disponível." -#: ../lib/Tails/IUK/Frontend.pm:355 +#: ../lib/Tails/IUK/Frontend.pm:357 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." msgstr "Uma atualização incremental está disponível, mas a atualização completa não se encontra disponível. Isso não deve acontecer. Por favor, reporte o bug." -#: ../lib/Tails/IUK/Frontend.pm:359 +#: ../lib/Tails/IUK/Frontend.pm:361 msgid "Error while detecting available upgrades" msgstr "Erro ao detectar as atualizações disponíveis" -#: ../lib/Tails/IUK/Frontend.pm:369 +#: ../lib/Tails/IUK/Frontend.pm:371 #, perl-brace-format msgid "" "You should upgrade to %{name}s %{version}s.\n" @@ -116,19 +116,19 @@ msgid "" "Do you want to upgrade now?" msgstr "Você deve atualizar para %{name}s %{version}s.\n\nPara mais informações sobre essa nova versão, veja %{details_url}s\n\nRecomendamos que você feche todas os programas durante a atualização.\nO download da atualização pode levar um bom tempo, de vários minutos a algumas horas.\nA rede será desabilitada após o download da atualização.\n\nTamanho do download: %{size}s\n\nVocê deseja fazer a atualizar agora?" -#: ../lib/Tails/IUK/Frontend.pm:384 +#: ../lib/Tails/IUK/Frontend.pm:386 msgid "Upgrade available" msgstr "Atualização disponível" -#: ../lib/Tails/IUK/Frontend.pm:385 +#: ../lib/Tails/IUK/Frontend.pm:387 msgid "Upgrade now" msgstr "Atualizar agora" -#: ../lib/Tails/IUK/Frontend.pm:386 +#: ../lib/Tails/IUK/Frontend.pm:388 msgid "Upgrade later" msgstr "Atualizar mais tarde" -#: ../lib/Tails/IUK/Frontend.pm:394 +#: ../lib/Tails/IUK/Frontend.pm:396 #, perl-brace-format msgid "" "You should do a manual upgrade to %{name}s %{version}s.\n" @@ -140,20 +140,20 @@ msgid "" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" msgstr "Você deve atualizar manualmente para %{name}s %{version}s.\n\nPara mais informações sobre esta nova versão, consulte %{details_url}s.\n\nNão é possível atualizar automaticamente o seu dispositivo para esta nova versão: %{explanation}s.\n\nPara saber como realizar uma atualização manual, consulte https://tails.boum.org/doc/first_steps/upgrade/index.pt.html#manual" -#: ../lib/Tails/IUK/Frontend.pm:410 +#: ../lib/Tails/IUK/Frontend.pm:412 msgid "New version available" msgstr "Nova versão disponível" -#: ../lib/Tails/IUK/Frontend.pm:467 +#: ../lib/Tails/IUK/Frontend.pm:469 msgid "Downloading upgrade" msgstr "Fazendo download da atualização" -#: ../lib/Tails/IUK/Frontend.pm:470 +#: ../lib/Tails/IUK/Frontend.pm:472 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." msgstr "Fazendo download da atualização para %{name}s %{version}s..." -#: ../lib/Tails/IUK/Frontend.pm:511 +#: ../lib/Tails/IUK/Frontend.pm:513 msgid "" "The upgrade could not be downloaded.\\n\\nCheck your network " "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " @@ -161,26 +161,37 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" msgstr "O download da atualização não pôde ser feito.\\n\\nVerifique sua conexão de rede e reinicie Tails para tentar atualizar novamente.\\n\\nCaso o problema continue, consulte o arquivo:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -#: ../lib/Tails/IUK/Frontend.pm:527 ../lib/Tails/IUK/Frontend.pm:546 +#: ../lib/Tails/IUK/Frontend.pm:529 ../lib/Tails/IUK/Frontend.pm:548 msgid "Error while downloading the upgrade" msgstr "Erro ao fazer o download das atualizações" -#: ../lib/Tails/IUK/Frontend.pm:539 +#: ../lib/Tails/IUK/Frontend.pm:541 #, 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 "O arquivo extraído '%{output_file}s' não existe, mas o tails-iuk-get-target-file não reclamou. Por favor, reporte o bug." -#: ../lib/Tails/IUK/Frontend.pm:558 +#: ../lib/Tails/IUK/Frontend.pm:560 msgid "Error while creating temporary downloading directory" msgstr "Erro ao criar um diretório temporário de download" -#: ../lib/Tails/IUK/Frontend.pm:561 +#: ../lib/Tails/IUK/Frontend.pm:563 msgid "Failed to create temporary download directory" msgstr "Falha ao criar um diretório temporário de download" -#: ../lib/Tails/IUK/Frontend.pm:573 +#: ../lib/Tails/IUK/Frontend.pm:587 +msgid "" +"Could not choose a download server.\n" +"\n" +"This should not happen. Please report a bug." +msgstr "Impossível encontrar um servidor para fazer download.\n\nIsso não deveria acontecer. Por favor, relate um bug." + +#: ../lib/Tails/IUK/Frontend.pm:591 +msgid "Error while choosing a download server" +msgstr "Erro ao escolher um servidor para fazer download" + +#: ../lib/Tails/IUK/Frontend.pm:608 msgid "" "Your Tails device was successfully upgraded.\n" "\n" @@ -190,46 +201,46 @@ msgid "" "Do you want to restart now?" msgstr "Seu dispositivo Tails foi atualizado com sucesso.\n\nAlgumas funcionalidades de segurança foram desabilitadas temporariamente.\nVocê deve reiniciar o Tails em sua nova versão assim que puder.\n\nVocê deseja reiniciar agora?" -#: ../lib/Tails/IUK/Frontend.pm:578 +#: ../lib/Tails/IUK/Frontend.pm:613 msgid "Restart Tails" msgstr "Reiniciar o Tails" -#: ../lib/Tails/IUK/Frontend.pm:579 +#: ../lib/Tails/IUK/Frontend.pm:614 msgid "Restart now" msgstr "Reiniciar agora" -#: ../lib/Tails/IUK/Frontend.pm:580 +#: ../lib/Tails/IUK/Frontend.pm:615 msgid "Restart later" msgstr "Reiniciar mais tarde" -#: ../lib/Tails/IUK/Frontend.pm:591 +#: ../lib/Tails/IUK/Frontend.pm:626 msgid "Error while restarting the system" msgstr "Erro ao reiniciar o sistema" -#: ../lib/Tails/IUK/Frontend.pm:594 +#: ../lib/Tails/IUK/Frontend.pm:629 msgid "Failed to restart the system" msgstr "Falha em reiniciar o sistema" -#: ../lib/Tails/IUK/Frontend.pm:609 +#: ../lib/Tails/IUK/Frontend.pm:644 msgid "Error while shutting down the network" msgstr "Erro ao encerrar a rede" -#: ../lib/Tails/IUK/Frontend.pm:612 +#: ../lib/Tails/IUK/Frontend.pm:647 msgid "Failed to shutdown network" msgstr "Falha ao encerrar a rede" -#: ../lib/Tails/IUK/Frontend.pm:622 +#: ../lib/Tails/IUK/Frontend.pm:657 msgid "Upgrading the system" msgstr "Atualizando o sistema" -#: ../lib/Tails/IUK/Frontend.pm:624 +#: ../lib/Tails/IUK/Frontend.pm:659 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." msgstr " O seu dispositivo Tails está sendo atualizado...\n\nPor razões de segurança, agora, a rede está desabilitada." -#: ../lib/Tails/IUK/Frontend.pm:657 +#: ../lib/Tails/IUK/Frontend.pm:692 msgid "" "An error occured while installing the upgrade.\\n\\nYour Tails device" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" @@ -237,6 +248,6 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" msgstr "Ocorreu um erro ao instalar a atualização.\\n\\nSeu dispositivo Tails precisa ser reparado e talvez não possa reiniciar.\\n\\nPor favor, siga as instruções no arquivo:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -#: ../lib/Tails/IUK/Frontend.pm:667 +#: ../lib/Tails/IUK/Frontend.pm:702 msgid "Error while installing the upgrade" msgstr "Erro ao instalar a atualização"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 27 May '16

27 May '16

commit 872309bde87c4eed4e1bf04c1e94dbe7b2279d26 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 27 15:45:53 2016 +0000 Update translations for tails-iuk --- pt_BR.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 4e6eae9..16c9166 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-05-25 16:55+0200\n" -"PO-Revision-Date: 2016-05-26 08:49+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-05-27 15:38+0000\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -185,11 +185,11 @@ msgid "" "Could not choose a download server.\n" "\n" "This should not happen. Please report a bug." -msgstr "" +msgstr "Impossível encontrar um servidor para fazer download.\n\nIsso não deveria acontecer. Por favor, relate um bug." #: ../lib/Tails/IUK/Frontend.pm:591 msgid "Error while choosing a download server" -msgstr "" +msgstr "Erro ao escolher um servidor para fazer download" #: ../lib/Tails/IUK/Frontend.pm:608 msgid ""

1 0

[tor/master] remove sentence about tor-ops from manpage: #19185
by nickm＠torproject.org 27 May '16

27 May '16

commit ae4889ac1a8fd5bad706d7e4bc2ff3b05c9f479c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 27 11:31:34 2016 -0400 remove sentence about tor-ops from manpage: #19185 --- doc/tor.1.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 74915b7..fe73c7f 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2103,8 +2103,7 @@ on the public Tor network. server. Instead of caching the directory, it generates its own list of good servers, signs it, and sends that to the clients. Unless the clients already have you listed as a trusted directory, you probably do not want - to set this option. Please coordinate with the other admins at - tor-ops(a)torproject.org if you think you should be a directory. + to set this option. [[V3AuthoritativeDirectory]] **V3AuthoritativeDirectory** **0**|**1**:: When this option is set in addition to **AuthoritativeDirectory**, Tor

1 0

[tor/master] Make advisory-warnings on by default.
by nickm＠torproject.org 27 May '16

27 May '16

commit 2fa7a3af4c77047525d7372b6845b547b2f6bf92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 23 14:39:56 2016 -0400 Make advisory-warnings on by default. Add --enable-fatal-warnings to control -Werror. Closes ticket 19044. --- changes/19044 | 5 +++++ configure.ac | 26 ++++++++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/changes/19044 b/changes/19044 new file mode 100644 index 0000000..a7f938a --- /dev/null +++ b/changes/19044 @@ -0,0 +1,5 @@ + o Minor features (compilation): + - Our big list of extra GCC warnings is now enabled by default when + building with GCC (or with anything like Clang that claims to be + GCC-compatible). To make all warnings into fatal compilation errors, + pass --enable-fatal-warnings to configure. Closes ticket 19044. diff --git a/configure.ac b/configure.ac index 1ee87a5..cbd9e60 100644 --- a/configure.ac +++ b/configure.ac @@ -143,9 +143,11 @@ case "$host" in esac AC_ARG_ENABLE(gcc-warnings, - AS_HELP_STRING(--enable-gcc-warnings, [enable verbose warnings])) + AS_HELP_STRING(--enable-gcc-warnings, [deprecated alias for enable-fatal-warnings])) +AC_ARG_ENABLE(fatal-warnings, + AS_HELP_STRING(--enable-fatal-warnings, [tell the compiler to treat all warnings as errors.])) AC_ARG_ENABLE(gcc-warnings-advisory, - AS_HELP_STRING(--enable-gcc-warnings-advisory, [enable verbose warnings, excluding -Werror])) + AS_HELP_STRING(--disable-gcc-warnings-advisory, [disable the regular verbose warnings])) dnl Others suggest '/gs /safeseh /nxcompat /dynamicbase' for non-gcc on Windows AC_ARG_ENABLE(gcc-hardening, @@ -1635,6 +1637,12 @@ else enable_gcc_warnings_advisory=no fi +# Warnings implies advisory-warnings and -Werror. +if test "$enable_gcc_warnings" = "yes"; then + enable_gcc_warnings_advisory=yes + enable_fatal_warnings=yes +fi + # OS X Lion started deprecating the system openssl. Let's just disable # all deprecation warnings on OS X. Also, to potentially make the binary # a little smaller, let's enable dead_strip. @@ -1647,8 +1655,7 @@ esac # Add some more warnings which we use in development but not in the # released versions. (Some relevant gcc versions can't handle these.) -if test "x$enable_gcc_warnings" = "xyes" || - test "x$enable_gcc_warnings_advisory" = "xyes"; then +if test "x$enable_gcc_warnings_advisory" != "xno"; then AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ #if !defined(__GNUC__) || (__GNUC__ < 4) @@ -1670,7 +1677,6 @@ if test "x$enable_gcc_warnings" = "xyes" || #error #endif])], have_gcc46=yes, have_gcc46=no) - save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wshorten-64-to-32" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], have_shorten64_flag=yes, @@ -1692,10 +1698,6 @@ if test "x$enable_gcc_warnings" = "xyes" || CFLAGS="$CFLAGS -Wwrite-strings -Wmissing-declarations -Wredundant-decls" CFLAGS="$CFLAGS -Wnested-externs -Wbad-function-cast -Wswitch-enum" - if test "x$enable_gcc_warnings" = "xyes"; then - CFLAGS="$CFLAGS -Werror" - fi - # Disabled, so we can use mallinfo(): -Waggregate-return if test "x$have_gcc4" = "xyes"; then @@ -1732,7 +1734,11 @@ if test "x$enable_gcc_warnings" = "xyes" || CFLAGS="$CFLAGS -Wshorten-64-to-32" fi - + if test "x$enable_fatal_warnings" = "xyes"; then + # I'd like to use TOR_CHECK_CFLAGS here, but I can't, since the + # default autoconf programs are full of errors. + CFLAGS="$CFLAGS -Werror" + fi ##This will break the world on some 64-bit architectures # CFLAGS="$CFLAGS -Winline"

1 0

[tor/master] Stop recommending --enable-gcc-warnings in doc/HACKING
by nickm＠torproject.org 27 May '16

27 May '16

commit 771ca7c5446584989d1602a053c4261ca3450cab Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 23 14:40:27 2016 -0400 Stop recommending --enable-gcc-warnings in doc/HACKING --- doc/HACKING/CodingStandards.md | 12 ++++++------ doc/HACKING/HowToReview.md | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md index 4aafa5d..f1c6585 100644 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@ -3,7 +3,7 @@ Coding conventions for Tor tl;dr: - - Run configure with `--enable-gcc-warnings` + - Run configure with `--enable-fatal-warnings` - Run `make check-spaces` to catch whitespace errors - Document your functions - Write unit tests @@ -21,7 +21,7 @@ preference) Did you remember... - - To build your code while configured with `--enable-gcc-warnings`? + - To build your code while configured with `--enable-fatal-warnings`? - To run `make check-spaces` on your code? - To run `make check-docs` to see whether all new options are on the manpage? @@ -125,10 +125,10 @@ deviations from our C whitespace style. Generally, we use: `puts (x)`. - Function declarations at the start of the line. -We try hard to build without warnings everywhere. In particular, if you're -using gcc, you should invoke the configure script with the option -`--enable-gcc-warnings`. This will give a bunch of extra warning flags to -the compiler, and help us find divergences from our preferred C style. +We try hard to build without warnings everywhere. In particular, if +you're using gcc, you should invoke the configure script with the +option `--enable-fatal-warnings`. This will tell the compiler +to make all warnings into errors. Functions to use; functions not to use -------------------------------------- diff --git a/doc/HACKING/HowToReview.md b/doc/HACKING/HowToReview.md index de7891c..d533189 100644 --- a/doc/HACKING/HowToReview.md +++ b/doc/HACKING/HowToReview.md @@ -15,7 +15,7 @@ Top-level smell-checks (Difficulty: easy) -- Does it compile with `--enable-gcc-warnings`? +- Does it compile with `--enable-fatal-warnings`? - Does `make check-spaces` pass?

1 0

[tor/master] Merge remote-tracking branch 'public/ticket19044'
by nickm＠torproject.org 27 May '16

27 May '16

commit a0dd8360983e8df41424694f4708ffa6f03f65a1 Merge: 437cbb1 771ca7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 27 10:39:34 2016 -0400 Merge remote-tracking branch 'public/ticket19044' changes/19044 | 5 +++++ configure.ac | 26 ++++++++++++++++---------- doc/HACKING/CodingStandards.md | 12 ++++++------ doc/HACKING/HowToReview.md | 2 +- 4 files changed, 28 insertions(+), 17 deletions(-)

1 0

[tor/master] write v3-status-votes file earlier in consensus voting
by nickm＠torproject.org 27 May '16

27 May '16

commit 694f1fe80874b2280717908d10d40b45e9e2cc82 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 11 17:34:38 2016 -0400 write v3-status-votes file earlier in consensus voting Make directory authorities write the v3-status-votes file out to disk earlier in the consensus process, so we have the votes even if we abort the consensus process later on. Resolves ticket 19036. --- changes/feature19036 | 4 ++++ src/or/dirvote.c | 38 ++++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/changes/feature19036 b/changes/feature19036 new file mode 100644 index 0000000..98bcfca --- /dev/null +++ b/changes/feature19036 @@ -0,0 +1,4 @@ + o Minor features: + - Make directory authorities write the v3-status-votes file out + to disk earlier in the consensus process, so we have the votes + even if we abort the consensus process below. Resolves ticket 19036. diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 9854af7..11b4fd1 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3040,6 +3040,26 @@ dirvote_compute_consensuses(void) if (!pending_vote_list) pending_vote_list = smartlist_new(); + /* write the votes out to disk early, so we have them even if we abort + * the consensus process below. */ + votes = smartlist_new(); + votestrings = smartlist_new(); + SMARTLIST_FOREACH(pending_vote_list, pending_vote_t *, v, + { + sized_chunk_t *c = tor_malloc(sizeof(sized_chunk_t)); + c->bytes = v->vote_body->dir; + c->len = v->vote_body->dir_len; + smartlist_add(votestrings, c); /* collect strings to write to disk */ + + smartlist_add(votes, v->vote); /* collect votes to compute consensus */ + }); + + votefile = get_datadir_fname("v3-status-votes"); + write_chunks_to_file(votefile, votestrings, 0, 0); + tor_free(votefile); + SMARTLIST_FOREACH(votestrings, sized_chunk_t *, c, tor_free(c)); + smartlist_free(votestrings); + n_voters = get_n_authorities(V3_DIRINFO); n_votes = smartlist_len(pending_vote_list); if (n_votes <= n_voters/2) { @@ -3066,24 +3086,6 @@ dirvote_compute_consensuses(void) goto err; } - votes = smartlist_new(); - votestrings = smartlist_new(); - SMARTLIST_FOREACH(pending_vote_list, pending_vote_t *, v, - { - sized_chunk_t *c = tor_malloc(sizeof(sized_chunk_t)); - c->bytes = v->vote_body->dir; - c->len = v->vote_body->dir_len; - smartlist_add(votestrings, c); /* collect strings to write to disk */ - - smartlist_add(votes, v->vote); /* collect votes to compute consensus */ - }); - - votefile = get_datadir_fname("v3-status-votes"); - write_chunks_to_file(votefile, votestrings, 0, 0); - tor_free(votefile); - SMARTLIST_FOREACH(votestrings, sized_chunk_t *, c, tor_free(c)); - smartlist_free(votestrings); - { char legacy_dbuf[DIGEST_LEN]; crypto_pk_t *legacy_sign=NULL;

1 0

[tor/master] Functionify code that writes votes to disk.
by nickm＠torproject.org 27 May '16

27 May '16

commit d875101e03680a372fe1ac91dfff0a9bde883dd3 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu May 26 15:32:34 2016 +0300 Functionify code that writes votes to disk. --- src/or/dirvote.c | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 11b4fd1..ac32df9 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3019,6 +3019,30 @@ dirvote_add_vote(const char *vote_body, const char **msg_out, int *status_out) return any_failed ? NULL : pending_vote; } +/* Write the votes in pending_vote_list to disk. */ +static void +write_v3_votes_to_disk(const smartlist_t *pending_vote_list) +{ + smartlist_t *votestrings = smartlist_new(); + char *votefile = NULL; + + SMARTLIST_FOREACH(pending_vote_list, pending_vote_t *, v, + { + sized_chunk_t *c = tor_malloc(sizeof(sized_chunk_t)); + c->bytes = v->vote_body->dir; + c->len = v->vote_body->dir_len; + smartlist_add(votestrings, c); /* collect strings to write to disk */ + }); + + votefile = get_datadir_fname("v3-status-votes"); + write_chunks_to_file(votefile, votestrings, 0, 0); + log_debug(LD_DIR, "Wrote votes to disk (%s)!", votefile); + + tor_free(votefile); + SMARTLIST_FOREACH(votestrings, sized_chunk_t *, c, tor_free(c)); + smartlist_free(votestrings); +} + /** Try to compute a v3 networkstatus consensus from the currently pending * votes. Return 0 on success, -1 on failure. Store the consensus in * pending_consensus: it won't be ready to be published until we have @@ -3028,8 +3052,8 @@ dirvote_compute_consensuses(void) { /* Have we got enough votes to try? */ int n_votes, n_voters, n_vote_running = 0; - smartlist_t *votes = NULL, *votestrings = NULL; - char *consensus_body = NULL, *signatures = NULL, *votefile; + smartlist_t *votes = NULL; + char *consensus_body = NULL, *signatures = NULL; networkstatus_t *consensus = NULL; authority_cert_t *my_cert; pending_consensus_t pending[N_CONSENSUS_FLAVORS]; @@ -3040,26 +3064,17 @@ dirvote_compute_consensuses(void) if (!pending_vote_list) pending_vote_list = smartlist_new(); - /* write the votes out to disk early, so we have them even if we abort - * the consensus process below. */ + /* Write votes to disk */ + write_v3_votes_to_disk(pending_vote_list); + + /* Setup votes smartlist */ votes = smartlist_new(); - votestrings = smartlist_new(); SMARTLIST_FOREACH(pending_vote_list, pending_vote_t *, v, { - sized_chunk_t *c = tor_malloc(sizeof(sized_chunk_t)); - c->bytes = v->vote_body->dir; - c->len = v->vote_body->dir_len; - smartlist_add(votestrings, c); /* collect strings to write to disk */ - smartlist_add(votes, v->vote); /* collect votes to compute consensus */ }); - votefile = get_datadir_fname("v3-status-votes"); - write_chunks_to_file(votefile, votestrings, 0, 0); - tor_free(votefile); - SMARTLIST_FOREACH(votestrings, sized_chunk_t *, c, tor_free(c)); - smartlist_free(votestrings); - + /* See if consensus managed to achieve majority */ n_voters = get_n_authorities(V3_DIRINFO); n_votes = smartlist_len(pending_vote_list); if (n_votes <= n_voters/2) {

1 0

[tor/master] Merge remote-tracking branch 'asn/feature19036'
by nickm＠torproject.org 27 May '16

27 May '16

commit 437cbb17c215e60cfd673d99e9c7ad729df6431a Merge: 476714e d875101 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 27 10:37:11 2016 -0400 Merge remote-tracking branch 'asn/feature19036' changes/feature19036 | 4 ++++ src/or/dirvote.c | 57 ++++++++++++++++++++++++++++++++++------------------ 2 files changed, 41 insertions(+), 20 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'arma/bug18840'
by nickm＠torproject.org 27 May '16

27 May '16

commit 476714e1a4b18d4beaa8aa6e0c6b8939efbf2f9f Merge: 3934e78 5a83122 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 27 10:35:55 2016 -0400 Merge remote-tracking branch 'arma/bug18840' changes/bug18840 | 4 ++++ src/or/dirvote.c | 1 + 2 files changed, 5 insertions(+)

1 0