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

[tor-browser-build/master] Bug 32437: Add wasi-sysroot project for RLBox
by boklm＠torproject.org 26 Feb '20

26 Feb '20

commit e8574bbde076ba917f4d3fd3e71c6c7ee10716c4 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 12 20:38:10 2020 +0000 Bug 32437: Add wasi-sysroot project for RLBox --- projects/ninja/build | 21 +++++++++++++++++++++ projects/ninja/config | 16 ++++++++++++++++ projects/wasi-sysroot/build | 32 ++++++++++++++++++++++++++++++++ projects/wasi-sysroot/config | 28 ++++++++++++++++++++++++++++ projects/wasi-sysroot/no-git.patch | 28 ++++++++++++++++++++++++++++ 5 files changed, 125 insertions(+) diff --git a/projects/ninja/build b/projects/ninja/build new file mode 100644 index 0000000..6500ca7 --- /dev/null +++ b/projects/ninja/build @@ -0,0 +1,21 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +[% IF c("var/linux") %] + [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), + hardened_gcc => 0 }) %] +[% END -%] +[% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] +mkdir /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] + +./configure.py --bootstrap + +mkdir $distdir +cp ninja $distdir +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/ninja/config b/projects/ninja/config new file mode 100644 index 0000000..8615511 --- /dev/null +++ b/projects/ninja/config @@ -0,0 +1,16 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/ninja-build/ninja.git +git_hash: b25c08bda4949192c69cea4cee057887341a2ffc #v1.9.0 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +var: + container: + use_container: 1 + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/linux") %]' + - name: python + project: python diff --git a/projects/wasi-sysroot/build b/projects/wasi-sysroot/build new file mode 100644 index 0000000..5ea885c --- /dev/null +++ b/projects/wasi-sysroot/build @@ -0,0 +1,32 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +# We need a link to our GCC, otherwise the system cc gets used which points to +# /usr/bin/gcc. +[% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), + hardened_gcc => 0 }) %] +ln -s gcc /var/tmp/dist/gcc/bin/cc + +distdir=/var/tmp/dist +builddir=/var/tmp/build/[% project %] +mkdir -p $distdir +tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] +export PATH=/var/tmp/dist/binutils/bin:/var/tmp/dist/cmake/bin:/var/tmp/dist/ninja:$PATH + +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz + +mv /var/tmp/build/[% project %]-[% c('version') %] $builddir +cd $builddir +# We have no .git in our tar ball but the Makefile depends on that. Just +# hard-code the version for now. +patch -p1 < $rootdir/no-git.patch + +make -j[% c("buildconf/num_procs") %] PREFIX=$distdir/[% project %] + +cd $distdir +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/wasi-sysroot/config b/projects/wasi-sysroot/config new file mode 100644 index 0000000..512769b --- /dev/null +++ b/projects/wasi-sysroot/config @@ -0,0 +1,28 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' +version: '[% c("abbrev") %]' +git_hash: 87b7a019472770f08d49cf3b558867dc76ea74eb +git_url: https://github.com/CraneStation/wasi-sdk +git_submodule: 1 + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - patch + +input_files: + - project: container-image + - name: gcc + project: gcc + - name: binutils + project: binutils + - name: cmake + project: cmake + - name: ninja + project: ninja + - filename: no-git.patch diff --git a/projects/wasi-sysroot/no-git.patch b/projects/wasi-sysroot/no-git.patch new file mode 100644 index 0000000..27c3446 --- /dev/null +++ b/projects/wasi-sysroot/no-git.patch @@ -0,0 +1,28 @@ +From 55a106779cd012f9cf5d6f46a7a3523de9ba93c3 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Sat, 7 Dec 2019 16:12:42 +0000 +Subject: [PATCH] No .git in our tarball + + +diff --git a/Makefile b/Makefile +index f09a901..dc114cb 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,11 +6,11 @@ LLVM_PROJ_DIR?=$(ROOT_DIR)/src/llvm-project + PREFIX?=/opt/wasi-sdk + + CLANG_VERSION=$(shell ./llvm_version.sh $(LLVM_PROJ_DIR)) +-VERSION:=$(shell ./version.sh) +-DEBUG_PREFIX_MAP=-fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v$(VERSION) ++#VERSION:=$(shell ./version.sh) ++DEBUG_PREFIX_MAP=-fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v8.1g5225b05436ce + + default: build +- @echo "Use -fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v$(VERSION)" ++ @echo "Use -fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v8.1g5225b05436ce" + + clean: + rm -rf build $(PREFIX) +-- +2.24.0 +

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 26 Feb '20

26 Feb '20

commit c6db9ae8a2c0233b531d2e7b2376ebb08bb7b5c4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 26 15:23:47 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+pt-PT.po | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/contents+pt-PT.po b/contents+pt-PT.po index e556acccde..8183c50903 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -875,8 +875,8 @@ msgid "" "A bad first of three servers can see encrypted Tor traffic coming from your " "computer." msgstr "" -"Um primeiro servidor malicioso consegue ver tráfego Tor encriptado a vir do " -"seu computador." +"Um primeiro servidor malicioso dos três servidores pode ver tráfego Tor " +"encriptado a vir do seu computador." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -906,17 +906,19 @@ msgstr "### O terceiro servidor não pode ver o meu tráfego?" #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "A bad third of three servers can see the traffic you sent into Tor." msgstr "" +"Um terceiro servidor malicioso dos três servidores pode ver o tráfego que " +"você enviou para o Tor." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "It won't know who sent this traffic." -msgstr "" +msgstr "Não saberá quem enviou este tráfego." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "" "If you're using encryption (like HTTPS), it will only know the destination." -msgstr "" +msgstr "Se estiver a usar encriptação (como HTTPS), apenas saberá o destino." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -924,17 +926,21 @@ msgid "" "See this visualization of [Tor and HTTPS](/https/https-1/) to understand how" " Tor and HTTPS interact." msgstr "" +"Veja esta visualização de [Tor e HTTPS](/https/https-1/) para perceber como " +"é que o Tor e HTTPS interagem." #: https//support.torproject.org/about/no-data-scrubbing/ #: (content/about/no-data-scrubbing/contents+en.lrquestion.title) msgid "" "Does Tor remove personal information from the data my application sends?" msgstr "" +"O Tor elimina todas as informações pessoias dos dados que a minha aplicação " +"envia?" #: https//support.torproject.org/about/no-data-scrubbing/ #: (content/about/no-data-scrubbing/contents+en.lrquestion.description) msgid "No, it doesn't." -msgstr "" +msgstr "Não, não o faz." #: https//support.torproject.org/about/no-data-scrubbing/ #: (content/about/no-data-scrubbing/contents+en.lrquestion.description) @@ -942,6 +948,8 @@ msgid "" "You need to use a separate program that understands your application and " "protocol and knows how to clean or \"scrub\" the data it sends." msgstr "" +"Você precisa de um programa separado que perceba a sua aplicação e o " +"protocolo e que saiba como limpar ou dar um \"scrub\" aos dados que envia." #: https//support.torproject.org/about/no-data-scrubbing/ #: (content/about/no-data-scrubbing/contents+en.lrquestion.description) @@ -949,6 +957,8 @@ msgid "" "Tor Browser tries to keep application-level data, like the user-agent " "string, uniform for all users." msgstr "" +"O Tor Browser tenta manter os dados ao nível da aplicação, como o \"user-" +"agent\", uniforme em todos os utilizadores." #: https//support.torproject.org/about/no-data-scrubbing/ #: (content/about/no-data-scrubbing/contents+en.lrquestion.description) @@ -956,6 +966,8 @@ msgid "" "Tor Browser can't do anything about the text that you type into forms, " "though." msgstr "" +"O Tor Browser não pode, no entanto, fazer nada em relação ao texto que você " +"escreva em formulários." #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.title) @@ -986,11 +998,16 @@ msgid "" "watching your Internet connection from learning what sites you visit, and it" " prevents the sites you visit from learning your physical location." msgstr "" +"Protege-o retransmitindo as suas comunicações numa rede distribuída de " +"retransmissores mantida por pessoas voluntárias em todo o mundo: evita que " +"alguém que esteja a observar a sua conexão com a Internet, conheça os sites " +"que visita e evita que os sites que visita saibam a sua localização física." #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) msgid "This set of volunteer relays is called the Tor network." msgstr "" +"Este conjunto de retransmissores voluntários é chamado de Tor network." #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) @@ -998,6 +1015,8 @@ msgid "" "The way most people use Tor is with Tor Browser, which is a version of " "Firefox that fixes many privacy issues." msgstr "" +"A forma como a maioria das pessoas utilizam o Tor é com o Tor Browser que é " +"uma versão do Firefox que corrige muitos problemas de privacidade." #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) @@ -1014,6 +1033,8 @@ msgid "" "The Tor Project is a non-profit (charity) organization that maintains and " "develops the Tor software." msgstr "" +"O Tor Project é uma organização sem fins lucrativos que mantem e desenvolve " +"o software Tor." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.title) @@ -1023,7 +1044,7 @@ msgstr "Por que se chama Tor?" #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) msgid "Tor is the onion routing network." -msgstr "" +msgstr "O Tor é uma rede de encaminhamento \"onion\"." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) @@ -1032,6 +1053,10 @@ msgid "" "onion routing in 2001-2002, we would tell people we were working on onion " "routing, and they would say \"Neat. Which one?\"" msgstr "" +"Quando estávamos a começar o novo design da próxima geração e a " +"implementação de encaminhamento \"onion\" em 2001-2002, dizíamos às pessoas " +"que estávamos a trabalhar em encaminhamento \"onion\", e eles respondiam com" +" \"Fixe. Qual deles?\"" #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) @@ -1040,11 +1065,14 @@ msgid "" " of the actual [onion routing project](https://www.onion-router.net/) run by" " the Naval Research Lab." msgstr "" +"Mesmo se encaminhamento \"onion\" se tornou num termo comum, o Tor nasceu do" +" [onion routing project](https://www.onion-router.net/) desenvolvido pelo " +"Naval Research Lab." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) msgid "(It's also got a fine meaning in German and Turkish.)" -msgstr "" +msgstr "(Também tem um significado fino em Alemão e Turco.)" #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) @@ -1052,11 +1080,13 @@ msgid "" "Note: even though it originally came from an acronym, Tor is not spelled " "\"TOR\"." msgstr "" +"Nota: mesmo que originalmente viesse de um acrónimo, Tor não é escrito como " +"\"TOR\"." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) msgid "Only the first letter is capitalized." -msgstr "" +msgstr "Apenas a primeira letra é maiúscula." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 26 Feb '20

26 Feb '20

commit 15054886cc2617155e17d78da40a826b18efead1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 26 14:54:00 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+pt-PT.po | 58 +++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/contents+pt-PT.po b/contents+pt-PT.po index 2ac2290d5d..e556acccde 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -697,6 +697,9 @@ msgid "" "Public License](https://www.fsf.org/licensing/licenses/gpl.html), while " "Firefox ESR is released under the Mozilla Public License." msgstr "" +"Ambas as extenções para Firefox são distribuídas sob a [GNU General Public " +"License](https://www.fsf.org/licensing/licenses/gpl.html), enquanto que o " +"Firefox ESR é lançado sob a Mozilla Public License." #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) @@ -704,6 +707,8 @@ msgid "" "The simplest way to obey their licenses is to include the source code for " "these programs everywhere you include the bundles themselves." msgstr "" +"A maneira mais simples to obedecer às suas licenças é incluir o código-fonte" +" destes programas em tudo onde incluir os mesmos." #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) @@ -711,6 +716,9 @@ msgid "" "Also, you should make sure not to confuse your readers about what Tor is, " "who makes it, and what properties it provides (and doesn't provide)." msgstr "" +"Além disso, também deve ter o cuidado de não confundir os seus leitores " +"sobre o que o Tor é, quem o faz e que propriedades é que providencia (e que " +"não providencia)." #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) @@ -724,7 +732,7 @@ msgstr "" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.title) msgid "How is Tor different from other proxies?" -msgstr "" +msgstr "Como é que o Tor é diferente de outros proxies?" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -732,16 +740,18 @@ msgid "" "A typical proxy provider sets up a server somewhere on the Internet and " "allows you to use it to relay your traffic." msgstr "" +"Um provedor de proxy normal cria um servidor em algum sítio na internet e " +"deixa-o usá-lo para retransmitir o seu tráfego." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "This creates a simple, easy to maintain architecture." -msgstr "" +msgstr "Isto cria uma arquitetura simples e fácil de manter." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "The users all enter and leave through the same server." -msgstr "" +msgstr "Todos os utilizadores entram e saem pelo mesmo servidor." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -749,16 +759,18 @@ msgid "" "The provider may charge for use of the proxy, or fund their costs through " "advertisements on the server." msgstr "" +"O provedor pode cobrar pelo uso do proxy ou financiar os seus custos através" +" de publicidade no servidor." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "In the simplest configuration, you don't have to install anything." -msgstr "" +msgstr "Na sua configuração mais simples, não tem de instalar nada." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "You just have to point your browser at their proxy server." -msgstr "" +msgstr "Apenas tem de apontar o seu browser ao servidor de proxy deles." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -767,6 +779,9 @@ msgid "" " your privacy and anonymity online and you trust the provider to not do bad " "things." msgstr "" +"Provedores de proxy simples são boas soluções se não quiser proteções para a" +" sua privacidade e anonimidade online e confia que estes não fazem coisas " +"más." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -775,22 +790,25 @@ msgid "" " protects you against local eavesdroppers, such as those at a cafe with free" " wifi Internet." msgstr "" +"Alguns provedores de proxy simples usam SSL para proteger a sua conexão com " +"eles, o que o protege contra escutas não autorizadas locais, como aquelas " +"num café com internet gratuita." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "Simple proxy providers also create a single point of failure." -msgstr "" +msgstr "Provedores de proxy simples também criam um único ponto de quebra." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "" "The provider knows both who you are and what you browse on the Internet." -msgstr "" +msgstr "O provedor sabe quem você é e o que faz na Internet." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "They can see your traffic as it passes through their server." -msgstr "" +msgstr "Eles vêem o seu tráfego ao atravessar pelos seus servidores." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -798,6 +816,8 @@ msgid "" "In some cases, they can even see inside your encrypted traffic as they relay" " it to your banking site or to ecommerce stores." msgstr "" +"Em alguns casos, eles podem até ver o seu tráfego encriptado enquanto " +"retransmitem-no para o seu site de banking ou para lojas de ecommerce." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -806,6 +826,9 @@ msgid "" "own advertisements into your traffic stream, or recording your personal " "details." msgstr "" +"Tem de confiar que o provedor não está a ver o seu tráfego, injetando a " +"publicidade deles na sua corrente de tráfego ou a gravar os seus detalhes " +"pessoais." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -813,6 +836,8 @@ msgid "" "Tor passes your traffic through at least 3 different servers before sending " "it on to the destination." msgstr "" +"O Tor passa o tráfego através de pelo menos 3 servidores diferentes antes de" +" enviar para o destino." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -821,6 +846,9 @@ msgid "" " somebody watching your Internet connection can't modify, or read, what you " "are sending into the Tor network." msgstr "" +"Visto que há uma camada separada de encriptação para cada um dos 3 " +"retransmissores, alguém que esteja a ver a sua conexão à Internet não pode " +"modificar ou ler o que está a enviar para a Tor network." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -828,11 +856,13 @@ msgid "" "Your traffic is encrypted between the Tor client (on your computer) and " "where it pops out somewhere else in the world." msgstr "" +"O seu tráfego é encriptado entre o cliente Tor (no seu computador) e onde " +"aparecer algures no mundo." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "### Doesn't the first server see who I am?" -msgstr "" +msgstr "### O primeiro servidor não vê quem eu sou?" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -845,16 +875,18 @@ msgid "" "A bad first of three servers can see encrypted Tor traffic coming from your " "computer." msgstr "" +"Um primeiro servidor malicioso consegue ver tráfego Tor encriptado a vir do " +"seu computador." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "It still doesn't know who you are and what you are doing over Tor." -msgstr "" +msgstr "Mesmo assim, não sabe quem você é nem o que está a fazer sobre o Tor." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "It merely sees \"This IP address is using Tor\"." -msgstr "" +msgstr "Apenas vê \"Este endereço IP está a usar o Tor\"." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) @@ -862,11 +894,13 @@ msgid "" "You are still protected from this node figuring out both who you are and " "where you are going on the Internet." msgstr "" +"Você continua protegido deste node perceber tanto quem você é como onde é " +"que vai na Internet." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description) msgid "### Can't the third server see my traffic?" -msgstr "" +msgstr "### O terceiro servidor não pode ver o meu tráfego?" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description)

1 0

[translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
by translation＠torproject.org 26 Feb '20

26 Feb '20

commit e3ee7dabc524f543ea2ad56357608c5afa332372 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 26 14:53:39 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+pt-PT.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+pt-PT.po b/contents+pt-PT.po index 12cdfb283b..390b292725 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -4,8 +4,8 @@ # erinm, 2019 # Manuela Silva <inactive+h_manuela_rodsilva(a)transifex.com>, 2019 # Manuela Silva <manuelarodsilva(a)gmail.com>, 2020 -# Hugo9191 <hugoncosta(a)gmail.com>, 2020 # Rui <xymarior(a)yandex.com>, 2020 +# Hugo9191 <hugoncosta(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-02-24 13:39+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Rui <xymarior(a)yandex.com>, 2020\n" +"Last-Translator: Hugo9191 <hugoncosta(a)gmail.com>, 2020\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/otf/teams/1519/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 26 Feb '20

26 Feb '20

commit 9f2f5e10d0e6309482aec7f370508e136b669ddb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 26 14:53:27 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+pt-PT.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+pt-PT.po b/contents+pt-PT.po index 9d77f8e5db..3924a72468 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -4,8 +4,8 @@ # erinm, 2019 # Manuela Silva <inactive+h_manuela_rodsilva(a)transifex.com>, 2019 # Manuela Silva <manuelarodsilva(a)gmail.com>, 2020 -# Hugo9191 <hugoncosta(a)gmail.com>, 2020 # Rui <xymarior(a)yandex.com>, 2020 +# Hugo9191 <hugoncosta(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-02-24 13:39+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Rui <xymarior(a)yandex.com>, 2020\n" +"Last-Translator: Hugo9191 <hugoncosta(a)gmail.com>, 2020\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/otf/teams/1519/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1256,7 +1256,7 @@ msgstr "Veja o %s para mais soluções de problemas." #: templates/download.html:49 msgid "How can I verify Tor Browser signature?" -msgstr "" +msgstr "Como é que eu posso verificar a assinatura do Tor Browser?" #: templates/download.html:54 msgid "Stand up for privacy and freedom online." @@ -1286,7 +1286,7 @@ msgstr "Defenda-se." #: templates/hero-download.html:32 msgid "Download for" -msgstr "" +msgstr "Transferir para" #: templates/hero-download.html:33 msgid "Signature" @@ -1294,7 +1294,7 @@ msgstr "Assinatura" #: templates/hero-download.html:43 msgid "Download for Android" -msgstr "" +msgstr "Transferir para Android" #: templates/hero-download.html:49 msgid "Download in another language or platform"

1 0

[tpo/master] Small changes
by emmapeel＠torproject.org 26 Feb '20

26 Feb '20

commit 752a63cd49edf9b0002604cc7198a94764d066ef Author: PROTechThor <patrathewhiz(a)gmail.com> Date: Wed Feb 26 06:12:09 2020 +0100 Small changes --- .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 ------------------- .../contents.lr | 19 ------------------- .../contents.lr | 19 +++++++++++++++++++ 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/content/press/2020-bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr b/content/press/2020-bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr index e69de29..a25fdbb 100644 --- a/content/press/2020-bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr +++ b/content/press/2020-bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Bitcoin Magazine +--- +title: 2020 Bitcoin Adoption: Why Nonprofits Will Lead the Way +--- +link: https://bitcoinmagazine.com/articles/2020-bitcoin-adoption-why-nonprofits-w… +--- +pub_date: 2020-02-11 +--- +summary: +--- +body: diff --git a/content/press/bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr b/content/press/bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr deleted file mode 100644 index a25fdbb..0000000 --- a/content/press/bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr +++ /dev/null @@ -1,19 +0,0 @@ -_model: post ---- -_hidden: yes ---- -active: True ---- -type: snippet ---- -publisher: Bitcoin Magazine ---- -title: 2020 Bitcoin Adoption: Why Nonprofits Will Lead the Way ---- -link: https://bitcoinmagazine.com/articles/2020-bitcoin-adoption-why-nonprofits-w… ---- -pub_date: 2020-02-11 ---- -summary: ---- -body: diff --git a/content/press/how-to-use-tor-browsers-tools-t-protect-your-privacy/contents.lr b/content/press/how-to-use-tor-browsers-tools-t-protect-your-privacy/contents.lr deleted file mode 100644 index 8f6f210..0000000 --- a/content/press/how-to-use-tor-browsers-tools-t-protect-your-privacy/contents.lr +++ /dev/null @@ -1,19 +0,0 @@ -_model: post ---- -_hidden: yes ---- -active: True ---- -type: snippet ---- -publisher: The Verge ---- -title: How to use the Tor Browser’s tools to protect your privacy ---- -link: https://www.theverge.com/2020/2/21/21138403/tor-privacy-tools-private-netwo… ---- -pub_date: 2020-02-21 ---- -summary: ---- -body: diff --git a/content/press/how-to-use-tor-browsers-tools-to-protect-your-privacy/contents.lr b/content/press/how-to-use-tor-browsers-tools-to-protect-your-privacy/contents.lr index e69de29..8f6f210 100644 --- a/content/press/how-to-use-tor-browsers-tools-to-protect-your-privacy/contents.lr +++ b/content/press/how-to-use-tor-browsers-tools-to-protect-your-privacy/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: The Verge +--- +title: How to use the Tor Browser’s tools to protect your privacy +--- +link: https://www.theverge.com/2020/2/21/21138403/tor-privacy-tools-private-netwo… +--- +pub_date: 2020-02-21 +--- +summary: +--- +body:

1 0

[tpo/master] More press links
by emmapeel＠torproject.org 26 Feb '20

26 Feb '20

commit 66f166de5be4ca5465316cbdcbf124726b53312f Author: PROTechThor <patrathewhiz(a)gmail.com> Date: Wed Feb 26 06:00:29 2020 +0100 More press links --- .../contents.lr | 0 .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 0 .../press/interview-with-the-tor-project/contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ 10 files changed, 152 insertions(+) diff --git a/content/press/2020-bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr b/content/press/2020-bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr new file mode 100644 index 0000000..e69de29 diff --git a/content/press/50-orgs-ask-google-to-take-stance-against-android-bloatware/contents.lr b/content/press/50-orgs-ask-google-to-take-stance-against-android-bloatware/contents.lr new file mode 100644 index 0000000..1c551db --- /dev/null +++ b/content/press/50-orgs-ask-google-to-take-stance-against-android-bloatware/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: ZDNet +--- +title: 50+ orgs ask Google to take a stance against Android bloatware +--- +link: https://www.zdnet.com/article/50-orgs-ask-google-to-take-a-stance-against-a… +--- +pub_date: 2020-01-09 +--- +summary: +--- +body: diff --git a/content/press/8-etapas-para-ser-quase-completamente-anonimo-online/contents.lr b/content/press/8-etapas-para-ser-quase-completamente-anonimo-online/contents.lr new file mode 100644 index 0000000..58f9d58 --- /dev/null +++ b/content/press/8-etapas-para-ser-quase-completamente-anonimo-online/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Computer World +--- +title: 8 etapas para ser (quase) completamente anônimo online +--- +link: https://computerworld.com.br/2020/02/24/8-etapas-para-ser-quase-completamen… +--- +pub_date: 2020-02-24 +--- +summary: +--- +body: diff --git a/content/press/bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr b/content/press/bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr new file mode 100644 index 0000000..a25fdbb --- /dev/null +++ b/content/press/bitcoin-adoption-why-nonprofits-will-lead-the-way/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Bitcoin Magazine +--- +title: 2020 Bitcoin Adoption: Why Nonprofits Will Lead the Way +--- +link: https://bitcoinmagazine.com/articles/2020-bitcoin-adoption-why-nonprofits-w… +--- +pub_date: 2020-02-11 +--- +summary: +--- +body: diff --git a/content/press/google-pressured-to-tackle-this-hugely-irritating-android-problem/contents.lr b/content/press/google-pressured-to-tackle-this-hugely-irritating-android-problem/contents.lr new file mode 100644 index 0000000..297bce0 --- /dev/null +++ b/content/press/google-pressured-to-tackle-this-hugely-irritating-android-problem/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Express +--- +title: Google pressured to tackle this hugely irritating Android problem +--- +link: https://www.express.co.uk/life-style/science-technology/1227747/Android-upd… +--- +pub_date: 2020-01-15 +--- +summary: +--- +body: diff --git a/content/press/how-cryptocurrency-has-become-a-force-in-philanthropy/contents.lr b/content/press/how-cryptocurrency-has-become-a-force-in-philanthropy/contents.lr new file mode 100644 index 0000000..56cab07 --- /dev/null +++ b/content/press/how-cryptocurrency-has-become-a-force-in-philanthropy/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: The Daily Dot +--- +title: How cryptocurrency has become a force in philanthropy +--- +link: https://www.dailydot.com/layer8/cryptocurrency-philanthropy-charity-bitcoin/ +--- +pub_date: 2019-07-02 +--- +summary: +--- +body: diff --git a/content/press/how-to-use-tor-browsers-tools-t-protect-your-privacy/contents.lr b/content/press/how-to-use-tor-browsers-tools-t-protect-your-privacy/contents.lr new file mode 100644 index 0000000..8f6f210 --- /dev/null +++ b/content/press/how-to-use-tor-browsers-tools-t-protect-your-privacy/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: The Verge +--- +title: How to use the Tor Browser’s tools to protect your privacy +--- +link: https://www.theverge.com/2020/2/21/21138403/tor-privacy-tools-private-netwo… +--- +pub_date: 2020-02-21 +--- +summary: +--- +body: diff --git a/content/press/how-to-use-tor-browsers-tools-to-protect-your-privacy/contents.lr b/content/press/how-to-use-tor-browsers-tools-to-protect-your-privacy/contents.lr new file mode 100644 index 0000000..e69de29 diff --git a/content/press/interview-with-the-tor-project/contents.lr b/content/press/interview-with-the-tor-project/contents.lr new file mode 100644 index 0000000..e915c18 --- /dev/null +++ b/content/press/interview-with-the-tor-project/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: TechRound +--- +title: Interview with The Tor Project +--- +link: https://techround.co.uk/interviews/interview-tor-project/ +--- +pub_date: 2020-02-04 +--- +summary: +--- +body: diff --git a/content/press/tor-psiphon-signal-and-co-how-to-move-unrecognized-on-the-internet/contents.lr b/content/press/tor-psiphon-signal-and-co-how-to-move-unrecognized-on-the-internet/contents.lr new file mode 100644 index 0000000..3210561 --- /dev/null +++ b/content/press/tor-psiphon-signal-and-co-how-to-move-unrecognized-on-the-internet/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Deutsche Welle +--- +title: Tor, Psiphon, Signal and Co.: How to move unrecognized on the internet +--- +link: https://www.dw.com/en/tor-psiphon-signal-and-co-how-to-move-unrecognized-on… +--- +pub_date: 2020-02-17 +--- +summary: +--- +body:

1 0

[tpo/master] Merge remote-tracking branch 'PROTechThor/press-links'
by emmapeel＠torproject.org 26 Feb '20

26 Feb '20

commit b91759e17d9f5c5cf9a4b304978748aea2a2580a Merge: 2800e53 752a63c Author: emma peel <emma.peel(a)riseup.net> Date: Wed Feb 26 14:51:40 2020 +0100 Merge remote-tracking branch 'PROTechThor/press-links' .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../press/interview-with-the-tor-project/contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ 8 files changed, 152 insertions(+)

1 0

[metrics-lib/master] Avoid invoking overridable methods from constructors.
by karsten＠torproject.org 26 Feb '20

26 Feb '20

commit 9ccb934fac5827ef663e6740f64c4e06c6cb795e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Feb 22 09:13:33 2020 +0100 Avoid invoking overridable methods from constructors. Fixes #33205. --- CHANGELOG.md | 3 ++ .../descriptor/impl/BridgeNetworkStatusImpl.java | 4 +-- .../descriptor/impl/NetworkStatusImpl.java | 7 ++--- .../impl/RelayNetworkStatusConsensusImpl.java | 3 +- .../descriptor/impl/RelayNetworkStatusImpl.java | 3 +- .../impl/RelayNetworkStatusVoteImpl.java | 35 +++++++--------------- .../impl/RelayNetworkStatusVoteImplTest.java | 13 ++++++++ 7 files changed, 36 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb8bb89..d58e92b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changes in version 2.1?.? - 2020-0?-?? + * Minor changes + - Avoid invoking overridable methods from constructors. + # Changes in version 2.10.0 - 2020-01-15 diff --git a/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java index d3d546b..b9241a8 100644 --- a/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java @@ -22,8 +22,8 @@ public class BridgeNetworkStatusImpl extends NetworkStatusImpl protected BridgeNetworkStatusImpl(byte[] rawDescriptorBytes, int[] offsetAndLength, File descriptorFile, String fileName) throws DescriptorParseException { - super(rawDescriptorBytes, offsetAndLength, descriptorFile, - false, false); + super(rawDescriptorBytes, offsetAndLength, descriptorFile, false); + this.splitAndParseParts(false); this.setPublishedMillisFromFileName(fileName); } diff --git a/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java index b994016..4b160f5 100644 --- a/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java @@ -26,14 +26,13 @@ public abstract class NetworkStatusImpl extends DescriptorImpl { protected Map<Integer, String> flagStrings = new HashMap<>(); protected NetworkStatusImpl(byte[] rawDescriptorBytes, int[] offsetAndLength, - File descriptorFile, boolean containsDirSourceEntries, - boolean blankLinesAllowed) throws DescriptorParseException { + File descriptorFile, boolean blankLinesAllowed) + throws DescriptorParseException { super(rawDescriptorBytes, offsetAndLength, descriptorFile, blankLinesAllowed); - this.splitAndParseParts(containsDirSourceEntries); } - private void splitAndParseParts(boolean containsDirSourceEntries) + protected final void splitAndParseParts(boolean containsDirSourceEntries) throws DescriptorParseException { int firstRIndex = this.findFirstIndexOfKey(Key.R); int firstDirectorySignatureIndex = this.findFirstIndexOfKey( diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java index 79f0756..367865e 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java @@ -25,7 +25,8 @@ public class RelayNetworkStatusConsensusImpl extends NetworkStatusImpl protected RelayNetworkStatusConsensusImpl(byte[] consensusBytes, int[] offsetAndLimit, File descriptorFile) throws DescriptorParseException { - super(consensusBytes, offsetAndLimit, descriptorFile, true, false); + super(consensusBytes, offsetAndLimit, descriptorFile, false); + this.splitAndParseParts(true); Set<Key> exactlyOnceKeys = EnumSet.of( Key.VOTE_STATUS, Key.CONSENSUS_METHOD, Key.VALID_AFTER, Key.FRESH_UNTIL, Key.VALID_UNTIL, Key.VOTING_DELAY, Key.KNOWN_FLAGS); diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java index 0fba932..5de8f70 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java @@ -21,7 +21,8 @@ public class RelayNetworkStatusImpl extends NetworkStatusImpl protected RelayNetworkStatusImpl(byte[] statusBytes, int[] offsetAndLength, File descriptorFile) throws DescriptorParseException { - super(statusBytes, offsetAndLength, descriptorFile, false, true); + super(statusBytes, offsetAndLength, descriptorFile, true); + this.splitAndParseParts(false); Set<Key> exactlyOnceKeys = EnumSet.of( Key.NETWORK_STATUS_VERSION, Key.DIR_SOURCE, Key.FINGERPRINT, Key.CONTACT, Key.DIR_SIGNING_KEY, Key.PUBLISHED); diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index 56a9e21..7e8d816 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -26,7 +26,8 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl protected RelayNetworkStatusVoteImpl(byte[] voteBytes, int[] offsetAndLength, File descriptorFile) throws DescriptorParseException { - super(voteBytes, offsetAndLength, descriptorFile, false, false); + super(voteBytes, offsetAndLength, descriptorFile, false); + this.splitAndParseParts(false); Set<Key> exactlyOnceKeys = EnumSet.of( Key.VOTE_STATUS, Key.PUBLISHED, Key.VALID_AFTER, Key.FRESH_UNTIL, Key.VALID_UNTIL, Key.VOTING_DELAY, Key.KNOWN_FLAGS, Key.DIR_SOURCE, @@ -52,20 +53,6 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl protected void parseHeader(int offset, int length) throws DescriptorParseException { - /* Initialize flag-thresholds values here for the case that the vote - * doesn't contain those values. Initializing them in the constructor - * or when declaring variables wouldn't work, because those parts are - * evaluated later and would overwrite everything we parse here. */ - this.stableUptime = -1L; - this.stableMtbf = -1L; - this.fastBandwidth = -1L; - this.guardWfu = -1.0; - this.guardTk = -1L; - this.guardBandwidthIncludingExits = -1L; - this.guardBandwidthExcludingExits = -1L; - this.enoughMtbfInfo = -1; - this.ignoringAdvertisedBws = -1; - Scanner scanner = this.newScanner(offset, length).useDelimiter(NL); Key nextCrypto = Key.EMPTY; StringBuilder crypto = null; @@ -847,63 +834,63 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl return new TreeSet<>(Arrays.asList(this.knownFlags)); } - private long stableUptime; + private long stableUptime = -1L; @Override public long getStableUptime() { return this.stableUptime; } - private long stableMtbf; + private long stableMtbf = -1L; @Override public long getStableMtbf() { return this.stableMtbf; } - private long fastBandwidth; + private long fastBandwidth = -1L; @Override public long getFastBandwidth() { return this.fastBandwidth; } - private double guardWfu; + private double guardWfu = -1.0; @Override public double getGuardWfu() { return this.guardWfu; } - private long guardTk; + private long guardTk = -1L; @Override public long getGuardTk() { return this.guardTk; } - private long guardBandwidthIncludingExits; + private long guardBandwidthIncludingExits = -1L; @Override public long getGuardBandwidthIncludingExits() { return this.guardBandwidthIncludingExits; } - private long guardBandwidthExcludingExits; + private long guardBandwidthExcludingExits = -1L; @Override public long getGuardBandwidthExcludingExits() { return this.guardBandwidthExcludingExits; } - private int enoughMtbfInfo; + private int enoughMtbfInfo = -1; @Override public int getEnoughMtbfInfo() { return this.enoughMtbfInfo; } - private int ignoringAdvertisedBws; + private int ignoringAdvertisedBws = -1; @Override public int getIgnoringAdvertisedBws() { diff --git a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java index 6735b61..a9104b4 100644 --- a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java @@ -721,6 +721,8 @@ public class RelayNetworkStatusVoteImplTest { assertEquals(3, vote.getDirKeyCertificateVersion()); assertEquals("80550987E1D626E3EBA5E5E75A458DE0626D088C", vote.getIdentity()); + assertTrue(vote.isSharedRandParticipate()); + assertEquals(8, vote.getSharedRandCurrentNumReveals()); assertEquals(1303882477000L, /* 2011-04-27 05:34:37 */ vote.getDirKeyPublishedMillis()); assertEquals(1335504877000L, /* 2012-04-27 05:34:37 */ @@ -745,6 +747,8 @@ public class RelayNetworkStatusVoteImplTest { + "F3Yh\nrXVaaoP07r6Ta+s0g1Zijm3lms50Nk/4tV2p8Y63c3F4Q3DAnK40Oi" + "kfOIwEj+Ny\n+zBRQssP3hPhTPOj/A7o3mZZwtL6x1sxpeu/nME1l5E=\n" + "-----END SIGNATURE-----\n", signature.getSignature()); + assertEquals(184320, vote.getGuardBandwidthExcludingExits()); + assertEquals(1, vote.getEnoughMtbfInfo()); assertTrue(vote.getUnrecognizedLines().isEmpty()); } @@ -1549,6 +1553,15 @@ public class RelayNetworkStatusVoteImplTest { } @Test + public void testSharedRandCurrentValueLineEmpty() + throws DescriptorParseException { + RelayNetworkStatusVote vote = + VoteBuilder.createWithSharedRandCurrentValueLine(null); + assertEquals(-1, vote.getSharedRandCurrentNumReveals()); + assertNull(vote.getSharedRandCurrentValue()); + } + + @Test public void testSharedRandCurrentNoNumReveals() throws DescriptorParseException { this.thrown.expect(DescriptorParseException.class);

1 0

[metrics-web/master] Update and sort flags in RS advanced search.
by karsten＠torproject.org 26 Feb '20

26 Feb '20

commit 2dfd743e3c798467622004f71e278bd93f9dbac5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Feb 25 21:08:02 2020 +0100 Update and sort flags in RS advanced search. Fixes #33335. --- src/main/resources/web/templates/rs/search/main.html | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/resources/web/templates/rs/search/main.html b/src/main/resources/web/templates/rs/search/main.html index b69612c..371d54b 100644 --- a/src/main/resources/web/templates/rs/search/main.html +++ b/src/main/resources/web/templates/rs/search/main.html @@ -65,13 +65,18 @@ or exit relay filtered by the search parameters.</p> <label for="advanced-search-flag">Flag:</label> <select class="form-control" id="advanced-search-flag"> <option value="">Any</option> - <option value="stable">Stable</option> - <option value="running">Running</option> + <option value="authority">Authority</option> + <option value="badexit">BadExit</option> + <option value="exit">Exit</option> <option value="fast">Fast</option> <option value="guard">Guard</option> - <option value="exit">Exit</option> - <option value="authority">Authority</option> + <option value="hsdir">HSDir</option> <option value="noedconsensus">NoEdConsensus</option> + <option value="running">Running</option> + <option value="stable">Stable</option> + <option value="staledesc">StaleDesc</option> + <option value="v2dir">V2Dir</option> + <option value="valid">Valid</option> </select> </div> <div class="form-group">

1 0