June 2018 - tor-commits - lists.torproject.org

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25859_v4'
by gk＠torproject.org 04 Jun '18

04 Jun '18

commit fb97d6c9141d3a824954b2e2952974daeada26d7 Merge: 4d5e3d2 0e483da Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 4 10:50:51 2018 +0000 Merge remote-tracking branch 'boklm/bug_25859_v4' projects/zlib/build | 6 ++---- projects/zlib/config | 1 + 2 files changed, 3 insertions(+), 4 deletions(-)

1 0

[tor-browser-build/master] Bug 25894: Get a Rust cross-compiler for Windows
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit 4d5e3d2ba5422b931a2e32a9498feabec6ecc23e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 30 21:58:41 2018 +0000 Bug 25894: Get a Rust cross-compiler for Windows --- projects/rust/build | 14 +++++++++++--- projects/rust/config | 9 +++++++++ projects/rust/panic-abort.patch | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/projects/rust/build b/projects/rust/build index 4c81ad8..69bc3a7 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -10,9 +10,7 @@ cd /var/tmp/dist/rust-[% c('var/prev_version') %]-[% c('arch') %]-unknown-linux- ./install.sh --prefix=$distdir-rust-old export PATH="$distdir-rust-old/bin:$PATH" -[% IF ! c("var/windows") %] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% END -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] [% IF c("var/osx") %] # We need to clear `CC` and `LDFLAGS` as they are used for the host platform @@ -61,6 +59,16 @@ cd /var/tmp/build/rustc-[% c('version') %]-src patch -p1 < $rootdir/binaryen.patch [% END %] +[% IF c("var/windows-i686") %] + # Cross-compiling for Windows 32bit is currently not possible without any + # patches. The reason for that is libstd expecting DWARF unwinding while most + # toolchains on Linux, targeting Windows 32bit, use SjLj unwinding. + # See: https://github.com/rust-lang/rust/issues/12859 for discussion about + # that and https://github.com/rust-lang/rust/pull/49633 for a newer attempt to + # fix this problem. + patch -p1 < $rootdir/panic-abort.patch +[% END %] + mkdir build cd build ../configure --prefix=$distdir [% c("var/configure_opt") %] diff --git a/projects/rust/config b/projects/rust/config index ae2290b..9d3030d 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -48,6 +48,13 @@ targets: - pkg-config configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=x86_64-apple-darwin --set=target.x86_64-apple-darwin.cc=x86_64-apple-darwin-clang + windows: + var: + arch_deps: + - libssl-dev + - pkg-config + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("arch") %]-pc-windows-gnu + input_files: - project: container-image - project: cmake @@ -66,3 +73,5 @@ input_files: gpg_keyring: rust.gpg - filename: binaryen.patch enable: '[% c("var/linux") %]' + - filename: panic-abort.patch + enable: '[% c("var/windows-i686") %]' diff --git a/projects/rust/panic-abort.patch b/projects/rust/panic-abort.patch new file mode 100644 index 0000000..1711ff7 --- /dev/null +++ b/projects/rust/panic-abort.patch @@ -0,0 +1,36 @@ +From 2fe471643721f3967f1bdf28907b0a7247fdb705 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Thu, 26 Apr 2018 13:18:27 +0000 +Subject: [PATCH] Avoid cross-compilation breakage due to unwinding + incompatibilities + + +diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs +index 55d104b182..85330f973b 100644 +--- a/src/bootstrap/bin/rustc.rs ++++ b/src/bootstrap/bin/rustc.rs +@@ -143,7 +143,8 @@ fn main() { + // workaround undefined references to `rust_eh_unwind_resume` generated + // otherwise, see issue https://github.com/rust-lang/rust/issues/43095. + if crate_name == "panic_abort" || +- crate_name == "compiler_builtins" && stage != "0" { ++ crate_name == "compiler_builtins" && stage != "0" || ++ target == "i686-pc-windows-gnu" { + cmd.arg("-C").arg("panic=abort"); + } + +diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs +index 9ea5f39b71..bb689120af 100644 +--- a/src/libtest/lib.rs ++++ b/src/libtest/lib.rs +@@ -45,7 +45,6 @@ extern crate getopts; + extern crate term; + #[cfg(any(unix, target_os = "cloudabi"))] + extern crate libc; +-extern crate panic_unwind; + + pub use self::TestFn::*; + pub use self::ColorConfig::*; +-- +2.17.0 +

1 0

[tor-browser-build/master] Bug 25832: Enable pthread support for mingw-w64
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit 9af1ea49a225b3a8582be29172cc3f25ef5c215b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 18 08:20:33 2018 +0000 Bug 25832: Enable pthread support for mingw-w64 Since bug 1406542 landed on Mozilla central pthread support is required for mingw-w64. This patch adds it and removes a wrong sed command related to our msvcrt->msvcr100 replacement. --- projects/mingw-w64/build | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index b0ce69d..502ea94 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -22,15 +22,14 @@ cd /var/tmp/build mkdir gcc cd gcc tar xJf $rootdir/gcc-[% c("var/gcc_version") %].tar.xz -# We don't want to link against msvcrt.dll due to bug 9084. +# We don't want to link against msvcrt.dll due to bug 9084 and want to use +# pthreads, too, as this is needed for ESR60, at least due to bug 1406542. [% c("arch") %]-w64-mingw32-g++ -dumpspecs > $distdir/msvcr100.spec -sed 's/msvcrt/msvcr100/' -i $distdir/msvcr100.spec -# Linking libgcc against msvcrt is hard-coded... -sed 's/msvcrt/msvcr100/' -i gcc-[% c("var/gcc_version") %]/gcc/config/i386/t-mingw-w32 +sed 's/msvcrt/msvcr100 -lpthread/' -i $distdir/msvcr100.spec # LDFLAGS_FOR_TARGET does not work for some reason. Thus, we take # CFLAGS_FOR_TARGET. export CFLAGS_FOR_TARGET="-specs=$distdir/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp" -gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --disable-multilib --enable-languages=c,c++ +gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --with-gnu-ld --with-gnu-as --disable-multilib --enable-threads=posix --enable-languages=c,c++ make -j[% c("buildconf/num_procs") %] all-gcc make install-gcc @@ -41,6 +40,13 @@ cd /var/tmp/build/builddir/mingw-w64/mingw-w64-crt32 make -j[% c("buildconf/num_procs") %] make install +mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread +cd /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread +/var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-libraries/winpthreads/configure \ + --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 +make -j[% c("buildconf/num_procs") %] +make install + mkdir -p /var/tmp/build/builddir/mingw-w64/widl32 cd /var/tmp/build/builddir/mingw-w64/widl32 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-tools/widl/configure \

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 04 Jun '18

04 Jun '18

commit 90cc3818ba1dbfc55525406d449ebce624991f8a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 4 10:18:33 2018 +0000 Update translations for tails-greeter-2 --- br/br.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/br/br.po b/br/br.po index bfa5b4328..91e3dd4d3 100644 --- a/br/br.po +++ b/br/br.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-22 14:15+0100\n" +"POT-Creation-Date: 2018-05-07 19:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Irriep Nala Novram <allannkorh(a)yahoo.fr>, 2018\n" "Language-Team: Breton (https://www.transifex.com/otf/teams/1519/br/)\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: br\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);\n" #: ../data/greeter.ui.h:1 msgid "Administration Password" @@ -255,7 +255,7 @@ msgstr "Nullañ" #: ../tailsgreeter/gui.py:608 msgid "Add" -msgstr "" +msgstr "Ouzhpennañ" #: ../tailsgreeter/gui.py:616 msgid "Back"

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 04 Jun '18

04 Jun '18

commit fe9ab2e33ec86a9d07c516626f335c13184372de Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 4 10:16:19 2018 +0000 Update translations for tor-launcher-properties --- br/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/br/torlauncher.properties b/br/torlauncher.properties index 49cb4440e..90711bd03 100644 --- a/br/torlauncher.properties +++ b/br/torlauncher.properties @@ -45,7 +45,7 @@ torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Kuitaat -torlauncher.done=Done +torlauncher.done=Graet torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 04 Jun '18

04 Jun '18

commit 92bf1f8825d8252dc45c4ad30e9aea54539cbaca Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 4 10:16:11 2018 +0000 Update translations for mat-gui --- br.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/br.po b/br.po index 917aa8585..43e776839 100644 --- a/br.po +++ b/br.po @@ -9,14 +9,14 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2018-04-12 19:01+0000\n" +"PO-Revision-Date: 2018-06-04 09:58+0000\n" "Last-Translator: Irriep Nala Novram <allannkorh(a)yahoo.fr>\n" "Language-Team: Breton (http://www.transifex.com/otf/torproject/language/br/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: br\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);\n" #: mat-gui:66 mat-gui:422 mat-gui:445 msgid "Ready" @@ -149,7 +149,7 @@ msgstr "" #: data/mat.glade:187 msgid "Add" -msgstr "" +msgstr "Ouzhpennañ" #: data/mat.glade:256 msgid "State"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 04 Jun '18

04 Jun '18

commit 01d9389357e750dafdd21432d9fcc79046e90370 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 4 10:15:30 2018 +0000 Update translations for https_everywhere --- br/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/br/ssl-observatory.dtd b/br/ssl-observatory.dtd index e41a4523d..d4759d20a 100644 --- a/br/ssl-observatory.dtd +++ b/br/ssl-observatory.dtd @@ -50,7 +50,7 @@ intrusive corporate network:"> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip "This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong."> -<!ENTITY ssl-observatory.prefs.done "Done"> +<!ENTITY ssl-observatory.prefs.done "Graet"> <!ENTITY ssl-observatory.prefs.explanation "HTTPS Everywhere can use EFF's SSL Observatory. This does two things: (1)

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 04 Jun '18

04 Jun '18

commit d1e99337b4cca156f08983ea37ec11dfe22df310 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 4 09:45:59 2018 +0000 Update translations for torbirdy --- br/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/br/torbirdy.dtd b/br/torbirdy.dtd index ba467b325..56bfcdeca 100644 --- a/br/torbirdy.dtd +++ b/br/torbirdy.dtd @@ -16,7 +16,7 @@ <!ENTITY torbirdy.prefs.extra2.key "d"> <!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings"> <!ENTITY torbirdy.prefs.testproxy.key "n"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy"> +<!ENTITY torbirdy.prefs.proxy.label "Proksi"> <!ENTITY torbirdy.prefs.privacy.label "Privacy"> <!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> <!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">

1 0

[webwml/master] Bug 26044: Add new Tor Browser signing sub key
by gk＠torproject.org 04 Jun '18

04 Jun '18

commit 2fa3225325efb70dbb181b598061be2f6379cf7d Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 4 09:11:53 2018 +0000 Bug 26044: Add new Tor Browser signing sub key --- docs/en/signing-keys.wml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml index 4bd3e350..d08b4033 100644 --- a/docs/en/signing-keys.wml +++ b/docs/en/signing-keys.wml @@ -14,7 +14,7 @@ <p>The signing keys we use are:</p> <ul> - <li>The Tor Browser Developers (0x93298290), + <li>The Tor Browser Developers (0x4E2C6E8793298290), Mike Perry (0x0E3A92E4), Georg Koppen (0x4B7C3223), Nicolas Vigier (0xD0220E4B), Linus Nordberg (0x23291265) and Arthur Edelstein (0xD752F538C0D38C3A) @@ -130,9 +130,8 @@ pub 4096R/0x4E2C6E8793298290 2014-12-15 [expires: 2020-08-24] Key fingerprint = EF6E 286D DA85 EA2A 4BA7 DE68 4E2C 6E87 9329 8290 uid Tor Browser Developers (signing key) <torbrowser(a)torproject.org> - sub 4096R/0x2E1AC68ED40814E0 2014-12-15 [expires: 2017-08-25] - sub 4096R/0x7017ADCEF65C2036 2014-12-15 [expires: 2017-08-25] sub 4096R/0xD1483FA6C3C07136 2016-08-24 [expires: 2018-08-24] + sub 4096R/0xEB774491D9FF06E2 2018-05-26 [expires: 2020-09-12] pub 2048R/0x42E86A2A11F48D36 2011-05-11 [expires: 2017-05-09] Key fingerprint = B744 17ED DF22 AC9F 9E90 F491 42E8 6A2A 11F4 8D36

1 0

[metrics-web/master] Update news.json to version 266 of doc/MetricsTimeline.
by karsten＠torproject.org 04 Jun '18

04 Jun '18

commit 0410899b81f5107c047621bc41de4786dd6ec1f2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jun 4 10:28:46 2018 +0200 Update news.json to version 266 of doc/MetricsTimeline. --- src/main/resources/web/json/news.json | 36 ++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/src/main/resources/web/json/news.json b/src/main/resources/web/json/news.json index 69c3d96..b8f481e 100644 --- a/src/main/resources/web/json/news.json +++ b/src/main/resources/web/json/news.json @@ -2981,13 +2981,31 @@ } ] }, { "start" : "2018-04-16", - "ongoing" : true, + "end" : "2018-05-08", "places" : [ "ru" ], - "short_description" : "Russia tries to block Telegram; disrupts many services on Amazon and Google cloud services.", - "description" : "Russia tries to block Telegram; disrupts many services on Amazon and Google cloud services.", + "short_description" : "Russia tries to block Telegram; blocks about 18 million IP addresses including some belonging to Amazon and Google cloud services.", + "description" : "Russia tries to block Telegram; blocks about 18 million IP addresses including some belonging to Amazon and Google cloud services.", "links" : [ { "label" : "article", "target" : "https://www.bleepingcomputer.com/news/government/russia-bans-18-million-ama…" + }, { + "label" : "relay graph", + "target" : "https://metrics.torproject.org/userstats-relay-country.html?start=2018-03-0…" + }, { + "label" : "bridge graph", + "target" : "https://metrics.torproject.org/userstats-bridge-country.html?start=2018-03-…" + } ] +}, { + "start" : "2018-04-28", + "places" : [ "ru" ], + "short_description" : "Russia unblocks about 3 million IP addresses belonging to Amazon and OVH.", + "description" : "Russia unblocks about 3 million IP addresses belonging to Amazon and OVH.", + "links" : [ { + "label" : "Roskomnadzor press release", + "target" : "http://rkn.gov.ru/news/rsoc/news57288.htm" + }, { + "label" : "monitoring page", + "target" : "https://usher2.club/en/" } ] }, { "start" : "2018-04-30", @@ -3010,6 +3028,18 @@ } ] }, { "start" : "2018-05-08", + "places" : [ "ru" ], + "short_description" : "Russia unblocks about 3.7 million IP addresses belonging to Google and Digital Ocean.", + "description" : "Russia unblocks about 3.7 million IP addresses belonging to Google and Digital Ocean.", + "links" : [ { + "label" : "Roskomnadzor press release", + "target" : "http://rkn.gov.ru/news/rsoc/news57454.htm" + }, { + "label" : "monitoring page", + "target" : "https://usher2.club/en/" + } ] +}, { + "start" : "2018-05-08", "protocols" : [ "meek" ], "short_description" : "The meek-amazon bridge imposes a rate limit of 1 MB/s.", "description" : "The <a href=\"https://metrics.torproject.org/rs.html#details/F4AD82B2032EDEF6C02C5A529C42…">meek-amazon bridge</a> imposes a rate limit of 1 MB/s."

1 0