September 2021 - tor-commits - lists.torproject.org

[tor-browser-build/master] Bug 40361: Stop building tor with rust in nightly builds
by sysrqb＠torproject.org 28 Sep '21

28 Sep '21

commit f19f3e3d3831cfb2c9d9fbf20f601c538c70c1c3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 14 16:24:12 2021 +0200 Bug 40361: Stop building tor with rust in nightly builds --- projects/tor/build | 18 +----------------- projects/tor/config | 3 --- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/projects/tor/build b/projects/tor/build index 2e32f50..0d81087 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -21,10 +21,6 @@ mkdir -p /var/tmp/build [% END %] [% IF c("var/osx") %] - [% IF c("var/nightly") %] - # We are compiling Tor with Rust enabled for nightlies. - export TOR_RUST_TARGET=x86_64-apple-darwin - [% END %] TORBINDIR="$distdir/Contents/MacOS/Tor" TORCONFIGDIR="$distdir/Contents/Resources/TorBrowser/Tor" mkdir -p $distdir/bin @@ -39,10 +35,6 @@ mkdir -p /var/tmp/build [% IF c("var/android") %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/zstd') %] [% END %] -[% IF !c("var/android") && c("var/nightly") %] - tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] - export PATH=/var/tmp/dist/rust/bin:$PATH -[% END %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/libevent') %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz @@ -50,10 +42,6 @@ libeventdir=/var/tmp/dist/libevent openssldir=/var/tmp/dist/openssl/openssl [% IF c("var/windows") %] - [% IF c("var/nightly") %] - # We are compiling Tor with Rust enabled for nightlies. - export TOR_RUST_TARGET=[% c("arch") %]-pc-windows-gnu - [% END %] # XXX: It's a bit unfortunate but we need the pthread dll here as libevent # gets compiled with pthread support once it is enabled in GCC, which we need # to do as otherwise the Rust compilaton breaks. @@ -62,9 +50,6 @@ openssldir=/var/tmp/dist/openssl/openssl $gcclibs/*.dll $mingwlibs/libwinpthread-1.dll $distdir/Tor/ [% END %] -[% IF c("var/linux-i686") && c("var/nightly") -%] - export TOR_RUST_TARGET=i686-unknown-linux-gnu -[% END -%] [% IF c("var/linux") %] mkdir -p "$distdir/Debug/Tor" cp $openssldir/lib/libssl.so.1.1 "$distdir/Tor/" @@ -99,11 +84,10 @@ cd /var/tmp/build/[% project %]-[% c('version') %] echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i ./autogen.sh find -type f -print0 | xargs -0 [% c("var/touch") %] -[% IF !c("var/android") && c("var/nightly") %]TOR_RUST_DEPENDENCIES=`pwd`/src/ext/rust/crates[% END %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ +./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ [% IF c("var/asan") %]--enable-fragile-hardening[% END %] \ [% IF c("var/windows") || c("var/android") %]--with-zlib-dir="$zlibdir"[% END %] \ [% IF c("var/osx") %]--enable-static-openssl[% END %] \ - [% IF !c("var/android") && c("var/nightly") %]--enable-rust[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] [% IF c("var/osx") -%] export LD_PRELOAD=[% c("var/faketime_path") %] diff --git a/projects/tor/config b/projects/tor/config index 1753131..7a93763 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -62,9 +62,6 @@ input_files: enable: '[% c("var/windows") || c("var/android") %]' - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - - name: rust - project: rust - enable: '[% !c("var/android") && c("var/nightly") %]' - name: zstd project: zstd enable: '[% c("var/android") %]'

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklmgl/bug_40361'
by sysrqb＠torproject.org 28 Sep '21

28 Sep '21

commit 7007d35894655756428df92e69500f06c4caae1d Merge: f508da1 f19f3e3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Sep 28 16:55:48 2021 +0000 Merge remote-tracking branch 'boklmgl/bug_40361' projects/tor/build | 18 +----------------- projects/tor/config | 3 --- 2 files changed, 1 insertion(+), 20 deletions(-)

1 0

[tor-browser-spec/master] Bug 40021: Add missing --keyring argument to hkt invocation
by sysrqb＠torproject.org 28 Sep '21

28 Sep '21

commit 5db8b715a24174d6822e1174be48cbefd502c72e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 6 08:26:49 2021 +0000 Bug 40021: Add missing --keyring argument to hkt invocation --- processes/KeyGeneration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/processes/KeyGeneration b/processes/KeyGeneration index 625152e..133b5c3 100644 --- a/processes/KeyGeneration +++ b/processes/KeyGeneration @@ -31,7 +31,7 @@ Key Creation Incantations and Instructions 15) Repeat step 6, 7 (with "2y" for subkeys), 13 and 14 as often as needed 16) At the gpg> prompt enter: save 16) Check whether the keys look good, e.g. with - `hkt export-pubkeys YOURMASTERKEYID | hokey lint` + `hkt export-pubkeys --keyring /path/to/pubring.gpg YOURMASTERKEYID | hokey lint` 17) `gpg --export-secret-subkeys SUBKEYID_N! > subkeys_n` 18) `gpg --export YOURMASTERKEYID > pubkeys` 19) Repeat 17) as needed

1 0

[community/master] i #230: Update BBC onion
by gus＠torproject.org 28 Sep '21

28 Sep '21

commit 0a740967bb54349bfdb8231bac1e5ccdecf77bc2 Author: HackerNCoder <hackerncoder(a)encryptionin.space> Date: Mon Sep 27 22:55:11 2021 +0000 i #230: Update BBC onion --- databags/onions.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/onions.ini b/databags/onions.ini index 096c225..5f1470b 100644 --- a/databags/onions.ini +++ b/databags/onions.ini @@ -14,7 +14,7 @@ image = /static/images/onions/png/dw.png label = Deutsche Welle [bbc] -link = https://www.bbcnewsv2vjtpsuy.onion +link = https://www.bbcnewsd73hkzno2ini43t4gblxvycyac5aw4gnv7t2rccijh7745uqd.onion/ image = /static/images/onions/png/bbc.png label = BBC

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 28 Sep '21

28 Sep '21

commit fa28d7ee456a2161f3cee09d1092560a1f2ea824 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 28 10:17:03 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- pl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pl.po b/pl.po index b6000f4ec4..2c4f475921 100644 --- a/pl.po +++ b/pl.po @@ -19,7 +19,7 @@ # Jarek Kaczynski, 2021 # Konrad W <360kon(a)gmail.com>, 2019 # Marcin S <dzidek1003(a)o2.pl>, 2018,2021 -# No Ne, 2021 +# Marek Adamski, 2021 # oirpos <kuba2707(a)gmail.com>, 2015 # phla47 <phla47(a)gmail.com>, 2013 # sebx, 2013-2015 @@ -31,7 +31,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-09-06 12:01+0200\n" "PO-Revision-Date: 2021-09-06 14:59+0000\n" -"Last-Translator: No Ne\n" +"Last-Translator: Marek Adamski\n" "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tpo/master] change privchat5 from save-the-date to watch
by arma＠torproject.org 28 Sep '21

28 Sep '21

commit df1b36d266efba6a522c0737d2c86e20303dcc0e Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Sep 27 23:15:12 2021 -0400 change privchat5 from save-the-date to watch (really, i'm doing this to wiggle git/tpo so jenkins will try a fresh build. it looks like it failed the last build because git is overloaded and took too long for a checkout, and nothing retries.) --- templates/privchat.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/privchat.html b/templates/privchat.html index a0e59fbb..68d5b32b 100644 --- a/templates/privchat.html +++ b/templates/privchat.html @@ -27,7 +27,7 @@ <div> <p><span class="text-primary nick" style="font-size:18px;"><mark>9/27 ∙ 17:00 UTC ∙ 13:00 Eastern ∙ 10:00 Pacific ∙ <a href="https://www.youtube.com/watch?v=4ovmcZtaacY" title="Tor Project YouTube Channel" target="_blank"><i class="fab fa-youtube"></i> @torproject YouTube channel</a></mark></span></p> </div> - <a class="btn btn-small bg-primary text-light my-4" href="/static/images/privchat/privchat-5.ics" target="_blank"><i class="mr-2 pt-1 fas fa-thumbtack-png"></i> {{ _("Save the Date") }} </a> + <a class="btn btn-small bg-primary text-light my-4" href="https://youtu.be/4ovmcZtaacY" target="_blank"><i class="mr-2 pt-1 fas fa-play-circle-png"></i> {{ _("Watch") }} </a> <div> <p class="font-family-serif"> Every year, governments, law enforcement agencies, militaries, and corporations invest billions of dollars into building and buying malicious spyware--software designed to silently infiltrate a user's device and allow attackers to view the contents without detection.

1 0

[tpo/master] fix versions from sysrqb's android-only commit
by arma＠torproject.org 28 Sep '21

28 Sep '21

commit bf41c4b3d4597389c419583a55803aaff6a9e1af Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Sep 27 22:08:25 2021 -0400 fix versions from sysrqb's android-only commit (actually this commit came from hackerncoder, via merge request 127 on gitlab. but if you press the 'merge' button on gitlab it breaks stuff and also doesn't merge anything. so doing this one by hand so we can proceed.) --- databags/versions.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index 397abfc7..ec927101 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,9 +1,9 @@ [torbrowser-stable] -version = 10.5.7 +version = 10.5.6 win32 = 0.4.5.10 [torbrowser-android-stable] -version = 10.5.5 +version = 10.5.7 [torbrowser-win-stable] version = 10.5.6

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 27 Sep '21

27 Sep '21

commit 22c264c5185a00f105269f57328b545c697254b6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 27 22:46:59 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+pt-BR.po | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index f08cad7c5f..c3286f5181 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -737,11 +737,14 @@ msgid "" "This will display the [Circumvention](../circumvention) section to configure" " a pluggable transport or to connect using [Bridges](../bridges)." msgstr "" +"Isso irá exibir a seção [Contornar a censura](../circumvention) para " +"configurar um Transporte plugável ou para conectar usando " +"[Pontes](../bridges)" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "### OTHER OPTIONS" -msgstr "" +msgstr "### OUTRAS OPÇÕES" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -750,6 +753,10 @@ msgid "" " is not necessary. You will usually know if you need to select this checkbox" " because the same settings will be used for other browsers on your system." msgstr "" +"A terceira caixa de seleção pergunta se a sua conexão usa um proxy. Na " +"maioria dos casos, isso não é necessário. Você normalmente saberá se você " +"precisa marcar esta caixa de seleção porque as mesmas configurações serão " +"usadas para outros navegadores em seu sistema." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -759,7 +766,7 @@ msgstr "Se possível, consulte o administrador da sua rede para orientação." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "If your connection does not use a proxy, click \"Connect\"." -msgstr "" +msgstr "Se sua conexão não usa um proxy, clique em \"Conectar\"." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -767,6 +774,8 @@ msgid "" "<img class=\"col-md-6\" src=\"../../static/images/proxy.png\" " "alt=\"Configure proxy options\">" msgstr "" +"<img class=\"col-md-6\" src=\"../../static/images/proxy.png\" " +"alt=\"Configure proxy options\">" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.title) @@ -848,6 +857,9 @@ msgid "" "bridges by Internet scanning. obfs4 bridges are less likely to be blocked " "than its predecessors, obfs3 bridges." msgstr "" +"obfs4 faz com que o tráfego Tor pareça aleatório, e também previne censores " +"de descobrirem pontes através escaneamentos. Pontes obfs4 são menos " +"propensas a serem bloqueadas do que suas antecessoras, as pontes obfs3. " #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -910,6 +922,8 @@ msgid "" "To use a pluggable transport, click \"Tor Network Settings\" when starting " "Tor Browser for the first time." msgstr "" +"Para usar um transporte plugável, clique em \"Configurações da Rede Tor\" ao" +" iniciar o Navegador Tor pela primeira vez." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 27 Sep '21

27 Sep '21

commit 0aec67835afcda07a3ec66801762fe58be816d83 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 27 19:47:55 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+my.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+my.po b/contents+my.po index 25dd62ffba..78d1e50f68 100644 --- a/contents+my.po +++ b/contents+my.po @@ -2,12 +2,12 @@ # Translators: # deirae, 2021 # Thet Htut <tissueball(a)protonmail.com>, 2021 -# Tun Tun Aung <tuntunaung(a)codingclassroom.org>, 2021 # erinm, 2021 # Yatanar (Y) <yatanar.a4(a)gmail.com>, 2021 # Saw Min Oo <sawminoo(a)gmail.com>, 2021 # Emma Peel, 2021 # Christine Ivy <christineivy19(a)gmail.com>, 2021 +# Tun Tun Aung <tuntunaung(a)codingclassroom.org>, 2021 # msgid "" msgstr "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-09-15 09:35+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Christine Ivy <christineivy19(a)gmail.com>, 2021\n" +"Last-Translator: Tun Tun Aung <tuntunaung(a)codingclassroom.org>, 2021\n" "Language-Team: Burmese (https://www.transifex.com/otf/teams/1519/my/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -569,7 +569,7 @@ msgstr "" #: https//support.torproject.org/glossary/exit/ #: (content/glossary/exit/contents+en.lrword.term) msgid "exit" -msgstr "exit" +msgstr "ထွက်မယ်" #: https//support.torproject.org/glossary/exit/ #: (content/glossary/exit/contents+en.lrword.definition) @@ -871,7 +871,7 @@ msgstr "" #: https//support.torproject.org/glossary/ip-address/ #: (content/glossary/ip-address/contents+en.lrword.term) msgid "IP address" -msgstr "IP address" +msgstr "IP လိပ်စာ" #: https//support.torproject.org/glossary/ip-address/ #: (content/glossary/ip-address/contents+en.lrword.definition) @@ -934,7 +934,7 @@ msgstr "" #: https//support.torproject.org/glossary/meek/ #: (content/glossary/meek/contents+en.lrword.term) msgid "meek" -msgstr "meek" +msgstr "သိမ်မွေ့သော" #: https//support.torproject.org/glossary/meek/ #: (content/glossary/meek/contents+en.lrword.definition)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 27 Sep '21

27 Sep '21

commit 8bb1945e8d5edfa52ae11ce77088474396d44ed4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 27 19:47:00 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+my.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+my.po b/contents+my.po index 9b8e02978b..7135193f01 100644 --- a/contents+my.po +++ b/contents+my.po @@ -665,7 +665,7 @@ msgid "" "help solving the problem." msgstr "" "သင့်ချိတ်ဆက်မှုသည် အတန်အသင့် မြန်သော်လည်း ဤဘားသည် တစ်နေရာ၌ ရှေ့မဆက်နိုင်ဘဲ " -"ဖြစ်နေပါက ပြဿနာကို ဖြေရှင်းရာတွင် အထောက်အကူဖြစ်စေရန် " +"ဖြစ်နေပါက ပြဿနာကို ဖြေရှင်းရာတွင် အထောက်အကူ ဖြစ်စေရန် " "[ပြဿနာဖြေရှင်းခြင်း](../troubleshooting) စာမျက်နှာကို ကြည့်ပါ။" #: https//tb-manual.torproject.org/running-tor-browser/ @@ -754,8 +754,8 @@ msgid "" " because the same settings will be used for other browsers on your system." msgstr "" "တတိယ အမှန်ခြစ်ရန်အကွက်၌ သင့်ချိတ်ဆက်မှုတွင် ပရောက်စီ သုံး၊ မသုံး မေးပါမည်။ " -"များသောအားဖြင့် ဤအဆင့်ကို မလိုအပ်ပါ။ သင့်စနစ်ရှိ အခြားဘရောက်ဇာများအတွက်လည်း " -"တူညီသော ဆက်တင်များကိုပင် အသုံးပြုမည်ဖြစ်သောကြောင့် ပုံမှန်အားဖြင့် " +"များသောအားဖြင့် ဤအဆင့်ကို မလိုအပ်ပါ။ သင့်စနစ်ရှိ အခြား ဘရောက်ဇာများအတွက်လည်း" +" တူညီသော ဆက်တင်များကိုပင် အသုံးပြုမည် ဖြစ်သောကြောင့် ပုံမှန်အားဖြင့် " "ဤအမှန်ခြစ်ရန်အကွက်ကို ရွေးချယ်ရန် လို၊ မလို သိနိုင်ပါသည်။" #: https//tb-manual.torproject.org/running-tor-browser/ @@ -941,7 +941,7 @@ msgstr "" msgid "" "From the dropdown, select whichever pluggable transport you'd like to use." msgstr "" -"သင်အသုံးပြုလိုသော အသွားအလာ အသွင်ပြောင်းကိရိယာကို ဆွဲချမီနူးမှ ရွေးချယ်ပါ။" +"သင်အသုံးပြုလိုသော အသွားအလာ အသွင်ပြောင်း ကိရိယာကို ဆွဲချမီနူးမှ ရွေးချယ်ပါ။" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body)

1 0