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

[tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 27 Nov '18

27 Nov '18

commit 72c1303cef629576cb8d078590ed71091828fd78 Merge: feb41b7c3 36c323553 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 27 12:03:50 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 .appveyor.yml | 4 ++-- changes/ticket28574 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/master] Explicitly specify path to OpenSSL for Appveyor.
by nickm＠torproject.org 27 Nov '18

27 Nov '18

commit 36c32355349bff091b92c04be2823d96feebd5c6 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Nov 27 02:35:44 2018 +0100 Explicitly specify path to OpenSSL for Appveyor. This patch explicitly specifies the path to our OpenSSL dependency and disables the installation of an external OpenSSL version and instead uses the OpenSSL version available from the MinGW environments. See: https://bugs.torproject.org/28574 --- .appveyor.yml | 4 ++-- changes/ticket28574 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 0bb93316f..34e1c8b84 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -34,7 +34,7 @@ install: # # Use pacman --debug to show package downloads and install locations #> - Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; + Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; build_script: - ps: >- @@ -54,7 +54,7 @@ build_script: # mingw zstd doesn't come with a pkg-config file, so we manually # configure its flags. liblzma just works. #> - Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings ${env:hardening}" + Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --with-openssl-dir=/${env:compiler_path} --disable-asciidoc --enable-fatal-warnings ${env:hardening}" Execute-Bash "V=1 make -j2" Execute-Bash "V=1 make -j2 install" } diff --git a/changes/ticket28574 b/changes/ticket28574 new file mode 100644 index 000000000..562810f51 --- /dev/null +++ b/changes/ticket28574 @@ -0,0 +1,4 @@ + o Minor bugfixes (continuous integration, Windows): + - Explicitly specify the path to the OpenSSL library and do not download + OpenSSL from Pacman, but instead use the library that is already provided + by AppVeyor. Fixes bug 28574; bugfix on master.

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 27 Nov '18

27 Nov '18

commit 9c2b114b2ee93434106ae300e31ba2ed317baea2 Merge: 8a15d0f69 72c1303ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 27 12:03:50 2018 -0500 Merge branch 'maint-0.3.5' .appveyor.yml | 4 ++-- changes/ticket28574 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 27 Nov '18

27 Nov '18

commit 84b2197571b847b9100b300ee596f371547b0301 Merge: 79b40a910 36c323553 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 27 12:03:50 2018 -0500 Merge branch 'maint-0.3.4' into release-0.3.4 .appveyor.yml | 4 ++-- changes/ticket28574 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.4] Explicitly specify path to OpenSSL for Appveyor.
by nickm＠torproject.org 27 Nov '18

27 Nov '18

commit 36c32355349bff091b92c04be2823d96feebd5c6 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Nov 27 02:35:44 2018 +0100 Explicitly specify path to OpenSSL for Appveyor. This patch explicitly specifies the path to our OpenSSL dependency and disables the installation of an external OpenSSL version and instead uses the OpenSSL version available from the MinGW environments. See: https://bugs.torproject.org/28574 --- .appveyor.yml | 4 ++-- changes/ticket28574 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 0bb93316f..34e1c8b84 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -34,7 +34,7 @@ install: # # Use pacman --debug to show package downloads and install locations #> - Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; + Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; build_script: - ps: >- @@ -54,7 +54,7 @@ build_script: # mingw zstd doesn't come with a pkg-config file, so we manually # configure its flags. liblzma just works. #> - Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings ${env:hardening}" + Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --with-openssl-dir=/${env:compiler_path} --disable-asciidoc --enable-fatal-warnings ${env:hardening}" Execute-Bash "V=1 make -j2" Execute-Bash "V=1 make -j2 install" } diff --git a/changes/ticket28574 b/changes/ticket28574 new file mode 100644 index 000000000..562810f51 --- /dev/null +++ b/changes/ticket28574 @@ -0,0 +1,4 @@ + o Minor bugfixes (continuous integration, Windows): + - Explicitly specify the path to the OpenSSL library and do not download + OpenSSL from Pacman, but instead use the library that is already provided + by AppVeyor. Fixes bug 28574; bugfix on master.

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 27 Nov '18

27 Nov '18

commit 72c1303cef629576cb8d078590ed71091828fd78 Merge: feb41b7c3 36c323553 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 27 12:03:50 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 .appveyor.yml | 4 ++-- changes/ticket28574 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.5] Explicitly specify path to OpenSSL for Appveyor.
by nickm＠torproject.org 27 Nov '18

27 Nov '18

commit 36c32355349bff091b92c04be2823d96feebd5c6 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Nov 27 02:35:44 2018 +0100 Explicitly specify path to OpenSSL for Appveyor. This patch explicitly specifies the path to our OpenSSL dependency and disables the installation of an external OpenSSL version and instead uses the OpenSSL version available from the MinGW environments. See: https://bugs.torproject.org/28574 --- .appveyor.yml | 4 ++-- changes/ticket28574 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 0bb93316f..34e1c8b84 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -34,7 +34,7 @@ install: # # Use pacman --debug to show package downloads and install locations #> - Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; + Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; build_script: - ps: >- @@ -54,7 +54,7 @@ build_script: # mingw zstd doesn't come with a pkg-config file, so we manually # configure its flags. liblzma just works. #> - Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings ${env:hardening}" + Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --with-openssl-dir=/${env:compiler_path} --disable-asciidoc --enable-fatal-warnings ${env:hardening}" Execute-Bash "V=1 make -j2" Execute-Bash "V=1 make -j2 install" } diff --git a/changes/ticket28574 b/changes/ticket28574 new file mode 100644 index 000000000..562810f51 --- /dev/null +++ b/changes/ticket28574 @@ -0,0 +1,4 @@ + o Minor bugfixes (continuous integration, Windows): + - Explicitly specify the path to the OpenSSL library and do not download + OpenSSL from Pacman, but instead use the library that is already provided + by AppVeyor. Fixes bug 28574; bugfix on master.

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 27 Nov '18

27 Nov '18

commit 4b37c2d1dc398d8229b6ab200fe4c3e27006f017 Merge: 3153c2726 72c1303ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 27 12:03:50 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 .appveyor.yml | 4 ++-- changes/ticket28574 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor-browser-build/master] Bug 23384: Remove user arthuredelstein on build-sunet-a.torproject.net
by boklm＠torproject.org 27 Nov '18

27 Nov '18

commit 1aaca9195d0ba07db68ceaab1f516f91e0ee8a49 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Nov 27 17:55:04 2018 +0100 Bug 23384: Remove user arthuredelstein on build-sunet-a.torproject.net Arthur said he doesn't need access to this machine anymore, so we remove his user account from the ansible config (the account will be removed from the machine manually). --- tools/ansible/roles/tbb-team/defaults/main.yml | 1 - tools/ansible/roles/tbb-team/files/arthuredelstein.pub | 1 - 2 files changed, 2 deletions(-) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index 8bf2e66..fa8ffa3 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -1,6 +1,5 @@ --- tbb_team_members: - - arthuredelstein - boklm - brade - gk diff --git a/tools/ansible/roles/tbb-team/files/arthuredelstein.pub b/tools/ansible/roles/tbb-team/files/arthuredelstein.pub deleted file mode 100644 index e7f0c39..0000000 --- a/tools/ansible/roles/tbb-team/files/arthuredelstein.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTn6K3kVN90fKK4BFC2I6wU9Ngb0v1U9JG9Ongt8UlTnbT58tLXATj65a7JwLcFHTjfTyDe2YLA5ujec2Az9LVYNezf4lIbykkDMg125En0HVhjanae9JwCWbOH9BhaEcB9ILc/gAeEXedxvZjpdTkcuJRoYem0jzyBXIm1eCb7gSbGJ5ma9JVFysOxFFor3SiOAjTDotgqVtfG3SF0ecRnViO/dfW9sCzwpTABOg0FZTKV/0AzbPoLE9w8OGe3qZU/eyK+Uw4gP/ZmF9veP1Npnvhf3wS4xkyg0zIvhIeOWQyArbir7dr0xTPhoOv3+GrDwKfCVfEvLEAwcL4TZPx arthur(a)Arthur.local

1 0

[translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
by translation＠torproject.org 27 Nov '18

27 Nov '18

commit 9d2e7e4d11cbdc18d5786eaa3c0c2374a53edfc7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 27 16:18:34 2018 +0000 Update translations for torbutton-browseronboardingproperties --- ja/browserOnboarding.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ja/browserOnboarding.properties b/ja/browserOnboarding.properties index f3475cb7a..230123cfa 100644 --- a/ja/browserOnboarding.properties +++ b/ja/browserOnboarding.properties @@ -32,10 +32,10 @@ onboarding.tour-tor-expect-differences.title=Expect some differences. onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. onboarding.tour-tor-expect-differences.button=よくある質問を見る -onboarding.tour-tor-onion-services=オニオンサービス +onboarding.tour-tor-onion-services=Onion サービス onboarding.tour-tor-onion-services.title=更なる保護。 onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=オニオンサイトを訪問 +onboarding.tour-tor-onion-services.button=Onionサイトを訪問 # Circuit Display onboarding. onboarding.tor-circuit-display.next=次へ

1 0