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

[tor/maint-0.4.1] Appveyor: Copy required DLLs to test and app
by nickm＠torproject.org 25 Mar '20

25 Mar '20

commit 38e07b88fac51f2a778e7c77e2269546c1344dff Author: teor <teor(a)torproject.org> Date: Thu Mar 19 17:35:49 2020 +1000 Appveyor: Copy required DLLs to test and app Copy required DLLs to test and app, before running tor's tests. This ensures that tor.exe and test*.exe use the correct version of each DLL. This fix is not required, but we hope it will avoid DLL search issues in future. Closes bug 33673; bugfix on 0.3.4.2-alpha. --- .appveyor.yml | 14 ++++++++++++++ changes/bug33673 | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index c4f3d9984..dbe52d9ea 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -61,6 +61,9 @@ install: # unprefixed packages are from MSYS2, which is like Cygwin. Avoid them. # # Use pacman --debug to show package downloads and install locations + # + # All installed library dlls must be copied to the test and app + # directories, before running tor's tests. (See below.) #> 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 ; @@ -95,6 +98,17 @@ test_script: $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath $env:Path = $buildpath -join ';' Set-Location "${env:build}" + <# Some compiler dlls must be copied to the test and app + # directories, before running tor's tests. + #> + Copy-Item "C:/msys64/${env:compiler_path}/bin/libssp-0.dll","C:/msys64/${env:compiler_path}/bin/zlib1.dll" -Destination "${env:build}/src/test" + Copy-Item "C:/msys64/${env:compiler_path}/bin/libssp-0.dll","C:/msys64/${env:compiler_path}/bin/zlib1.dll" -Destination "${env:build}/src/app" + <# All installed library dlls must be copied to the test and app + # directories, before running tor's tests. + # (See install command above.) + #> + Copy-Item "C:/${env:compiler_path}/bin/libcrypto*.dll","C:/${env:compiler_path}/bin/libssl*.dll","C:/${env:compiler_path}/bin/liblzma*.dll","C:/${env:compiler_path}/bin/libevent*.dll","C:/${env:compiler_path}/bin/libzstd*.dll" -Destination "${env:build}/src/test" + Copy-Item "C:/${env:compiler_path}/bin/libcrypto*.dll","C:/${env:compiler_path}/bin/libssl*.dll","C:/${env:compiler_path}/bin/liblzma*.dll","C:/${env:compiler_path}/bin/libevent*.dll","C:/${env:compiler_path}/bin/libzstd*.dll" -Destination "${env:build}/src/app" Execute-Bash "VERBOSE=1 TOR_SKIP_TESTCASES=crypto/openssl_version make -k -j2 check" } diff --git a/changes/bug33673 b/changes/bug33673 new file mode 100644 index 000000000..37c00f2e6 --- /dev/null +++ b/changes/bug33673 @@ -0,0 +1,6 @@ + o Testing: + - In our Appveyor Windows CI, copy required DLLs to test and app, before + running tor's tests. This ensures that tor.exe and test*.exe use the + correct version of each DLL. This fix is not required, but we hope it + will avoid DLL search issues in future. + Fixes bug 33673; bugfix on 0.3.4.2-alpha.

1 0

[tor/maint-0.4.1] Merge branch 'bug33673_035' into bug33673_041
by nickm＠torproject.org 25 Mar '20

25 Mar '20

commit 26fd31fef8dfbc9babf60157edf1b47b94cd49d1 Merge: 42ea03eb7 38e07b88f Author: teor <teor(a)torproject.org> Date: Fri Mar 20 14:49:11 2020 +1000 Merge branch 'bug33673_035' into bug33673_041 Merge duplicate DLL copies from maint-0.4.1 with bug33673_035. .appveyor.yml | 16 ++++++++++++++-- changes/bug33673 | 6 ++++++ 2 files changed, 20 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.2] Appveyor: Copy required DLLs to test and app
by nickm＠torproject.org 25 Mar '20

25 Mar '20

commit 38e07b88fac51f2a778e7c77e2269546c1344dff Author: teor <teor(a)torproject.org> Date: Thu Mar 19 17:35:49 2020 +1000 Appveyor: Copy required DLLs to test and app Copy required DLLs to test and app, before running tor's tests. This ensures that tor.exe and test*.exe use the correct version of each DLL. This fix is not required, but we hope it will avoid DLL search issues in future. Closes bug 33673; bugfix on 0.3.4.2-alpha. --- .appveyor.yml | 14 ++++++++++++++ changes/bug33673 | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index c4f3d9984..dbe52d9ea 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -61,6 +61,9 @@ install: # unprefixed packages are from MSYS2, which is like Cygwin. Avoid them. # # Use pacman --debug to show package downloads and install locations + # + # All installed library dlls must be copied to the test and app + # directories, before running tor's tests. (See below.) #> 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 ; @@ -95,6 +98,17 @@ test_script: $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath $env:Path = $buildpath -join ';' Set-Location "${env:build}" + <# Some compiler dlls must be copied to the test and app + # directories, before running tor's tests. + #> + Copy-Item "C:/msys64/${env:compiler_path}/bin/libssp-0.dll","C:/msys64/${env:compiler_path}/bin/zlib1.dll" -Destination "${env:build}/src/test" + Copy-Item "C:/msys64/${env:compiler_path}/bin/libssp-0.dll","C:/msys64/${env:compiler_path}/bin/zlib1.dll" -Destination "${env:build}/src/app" + <# All installed library dlls must be copied to the test and app + # directories, before running tor's tests. + # (See install command above.) + #> + Copy-Item "C:/${env:compiler_path}/bin/libcrypto*.dll","C:/${env:compiler_path}/bin/libssl*.dll","C:/${env:compiler_path}/bin/liblzma*.dll","C:/${env:compiler_path}/bin/libevent*.dll","C:/${env:compiler_path}/bin/libzstd*.dll" -Destination "${env:build}/src/test" + Copy-Item "C:/${env:compiler_path}/bin/libcrypto*.dll","C:/${env:compiler_path}/bin/libssl*.dll","C:/${env:compiler_path}/bin/liblzma*.dll","C:/${env:compiler_path}/bin/libevent*.dll","C:/${env:compiler_path}/bin/libzstd*.dll" -Destination "${env:build}/src/app" Execute-Bash "VERBOSE=1 TOR_SKIP_TESTCASES=crypto/openssl_version make -k -j2 check" } diff --git a/changes/bug33673 b/changes/bug33673 new file mode 100644 index 000000000..37c00f2e6 --- /dev/null +++ b/changes/bug33673 @@ -0,0 +1,6 @@ + o Testing: + - In our Appveyor Windows CI, copy required DLLs to test and app, before + running tor's tests. This ensures that tor.exe and test*.exe use the + correct version of each DLL. This fix is not required, but we hope it + will avoid DLL search issues in future. + Fixes bug 33673; bugfix on 0.3.4.2-alpha.

1 0

[tor/maint-0.4.2] Merge branch 'bug33673_035' into bug33673_041
by nickm＠torproject.org 25 Mar '20

25 Mar '20

commit 26fd31fef8dfbc9babf60157edf1b47b94cd49d1 Merge: 42ea03eb7 38e07b88f Author: teor <teor(a)torproject.org> Date: Fri Mar 20 14:49:11 2020 +1000 Merge branch 'bug33673_035' into bug33673_041 Merge duplicate DLL copies from maint-0.4.1 with bug33673_035. .appveyor.yml | 16 ++++++++++++++-- changes/bug33673 | 6 ++++++ 2 files changed, 20 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 25 Mar '20

25 Mar '20

commit 048714d2ceab0d4658f0d11c50c6fd57f042e1ed Merge: 3aa855dc6 26fd31fef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 25 10:56:27 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 .appveyor.yml | 16 ++++++++++++++-- changes/bug33673 | 6 ++++++ 2 files changed, 20 insertions(+), 2 deletions(-)

1 0

[tor-browser-build/maint-9.0] Add missing https-everywhere entry in ChangeLog
by sysrqb＠torproject.org 25 Mar '20

25 Mar '20

commit 2b2bf99df8513502f151c8cef78c4a7bad616b1a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Mar 25 14:52:51 2020 +0000 Add missing https-everywhere entry in ChangeLog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 4e99fe7..9f6a50e 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,7 @@ Tor Browser 9.0.7 -- March 20 2020 * All Platforms * Bump NoScript to 11.0.19 + * Bump Https-Everywhere to 2020.3.16 * Bug 33613: Disable Javascript on Safest security level * Windows + OS X + Linux * Bump Tor to 0.4.2.7

1 0

[metrics-cloud/master] cfn-lint: Relax strict checking for DNS TTL Type
by irl＠torproject.org 25 Mar '20

25 Mar '20

commit 15ee248b47447ced2c4b029502bf0c1b3bdcc34c Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Wed Mar 25 14:50:15 2020 +0000 cfn-lint: Relax strict checking for DNS TTL Type --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7c55703..c558959 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,4 +12,5 @@ jobs: install: - pip install cfn-lint script: - - cfn-lint cloudformation/*.yml + # https://github.com/aws-cloudformation/cfn-python-lint/issues/1425 + - cfn-lint -x E3012:strict=false cloudformation/*.yml

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 25 Mar '20

25 Mar '20

commit 16de9bb0f6933fe54945b8b45deaa17e907964dc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 25 14:48:52 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- ca.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ca.po b/ca.po index a41920a35c..c2151f6910 100644 --- a/ca.po +++ b/ca.po @@ -14,7 +14,7 @@ # Guillem Arias Fauste <inactive+Mr_SpeedArt(a)transifex.com>, 2016 # Humbert, 2014 # Humbert, 2018 -# jmontane, 2019 +# jmontane, 2019-2020 # josep constantí mata <iceberg.jcm(a)gmail.com>, 2019 # laia_, 2014-2016 # Miquel Bosch, 2018 @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-03-21 09:59+0100\n" -"PO-Revision-Date: 2020-03-25 13:13+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2020-03-25 14:47+0000\n" +"Last-Translator: jmontane\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 25 Mar '20

25 Mar '20

commit 5e3098332e2aacc506ff56d435a7c32c176fad67 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 25 14:47:21 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- ca.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ca.po b/ca.po index 1fa2392e19..da15467983 100644 --- a/ca.po +++ b/ca.po @@ -14,7 +14,7 @@ # Guillem Arias Fauste <inactive+Mr_SpeedArt(a)transifex.com>, 2016 # Humbert, 2014 # Humbert, 2018 -# jmontane, 2019 +# jmontane, 2019-2020 # josep constantí mata <iceberg.jcm(a)gmail.com>, 2019 # laia_, 2014-2016 # Miquel Bosch, 2018 @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-03-21 09:59+0100\n" -"PO-Revision-Date: 2020-03-25 13:13+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2020-03-25 14:46+0000\n" +"Last-Translator: jmontane\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -132,7 +132,7 @@ msgstr "" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:250 msgid "Error while updating the signing key" -msgstr "" +msgstr "S'ha produït un error en actualtizar la clau de signatura" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:279 msgid "Error while checking for upgrades" @@ -971,7 +971,7 @@ msgstr "Podeu instal·lar {packages} automàticament en iniciar Tails" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:345 msgid "To do so, you need to run Tails from a USB stick." -msgstr "" +msgstr "Per a fer-ho, cal que executeu el Tails des d'una memòria USB extraïble." #. Translators: Don't translate {packages}, it's a placeholder and will be #. replaced. @@ -1079,7 +1079,7 @@ msgstr "Per fer-ho, creeu un emmagatzematge persistent i instal·leu algun progr #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:205 msgid "" "To do so, install Tails on a USB stick and create a persistent storage." -msgstr "" +msgstr "Per a fer-ho, instal·leu el Tails en una memòria USB extraïble i creeu un emmagatzematge persistent." #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:251 msgid "[package not available]" @@ -1455,15 +1455,15 @@ msgstr "Aprèn més sobre Tails" #: ../config/chroot_local-includes/usr/share/applications/tails-persistence-delete.desktop.in.h:1 msgid "Delete persistent volume" -msgstr "" +msgstr "Suprimeix el volum persistant" #: ../config/chroot_local-includes/usr/share/applications/tails-persistence-delete.desktop.in.h:2 msgid "Delete the persistent volume and its content" -msgstr "" +msgstr "Suprimeix el volum persistent i el seu contingut" #: ../config/chroot_local-includes/usr/share/applications/tails-persistence-setup.desktop.in.h:1 msgid "Configure persistent volume" -msgstr "" +msgstr "Configura el volum persistent" #: ../config/chroot_local-includes/usr/share/applications/tails-persistence-setup.desktop.in.h:2 msgid ""

1 0

[metrics-cloud/master] cfn: Always use first availability zone, no hardcoding
by irl＠torproject.org 25 Mar '20

25 Mar '20

commit 362b25f336bb3239a6a3e909609aed41d2d773c5 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Wed Mar 25 14:44:08 2020 +0000 cfn: Always use first availability zone, no hardcoding Tested with a template that outputs the availability zone, and they do come as you would expect a,b,c... so this should be a no-op in the actual template interpretations for all current deployments (which are all in us-east). cf #31414 --- cloudformation/exit-scanner-dev.yml | 2 +- cloudformation/metrics-monitor.yml | 2 +- cloudformation/metrics-vpc.yml | 2 +- cloudformation/onionoo-dev.yml | 4 ++-- cloudformation/onionperf-dev.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cloudformation/exit-scanner-dev.yml b/cloudformation/exit-scanner-dev.yml index 2ee4259..5c126c9 100644 --- a/cloudformation/exit-scanner-dev.yml +++ b/cloudformation/exit-scanner-dev.yml @@ -11,7 +11,7 @@ Resources: Instance: Type: AWS::EC2::Instance Properties: - AvailabilityZone: us-east-1a + AvailabilityZone: !Select [ 0, !GetAZs ] ImageId: ami-01db78123b2b99496 InstanceType: t2.large SubnetId: diff --git a/cloudformation/metrics-monitor.yml b/cloudformation/metrics-monitor.yml index a3398f0..bea09cb 100644 --- a/cloudformation/metrics-monitor.yml +++ b/cloudformation/metrics-monitor.yml @@ -8,7 +8,7 @@ Resources: MonitorInstance: Type: AWS::EC2::Instance Properties: - AvailabilityZone: us-east-1a + AvailabilityZone: !Select [ 0, !GetAZs ] ImageId: ami-01db78123b2b99496 InstanceType: t2.micro SubnetId: diff --git a/cloudformation/metrics-vpc.yml b/cloudformation/metrics-vpc.yml index 196b9db..94eb325 100644 --- a/cloudformation/metrics-vpc.yml +++ b/cloudformation/metrics-vpc.yml @@ -22,7 +22,7 @@ Resources: Subnet: Type: AWS::EC2::Subnet Properties: - AvailabilityZone: us-east-1a + AvailabilityZone: !Select [ 0, !GetAZs ] VpcId: !Ref VPC CidrBlock: 172.31.0.0/20 MapPublicIpOnLaunch: true diff --git a/cloudformation/onionoo-dev.yml b/cloudformation/onionoo-dev.yml index d7baa53..9ca1594 100644 --- a/cloudformation/onionoo-dev.yml +++ b/cloudformation/onionoo-dev.yml @@ -11,7 +11,7 @@ Resources: Instance: Type: AWS::EC2::Instance Properties: - AvailabilityZone: us-east-1a + AvailabilityZone: !Select [ 0, !GetAZs ] ImageId: ami-01db78123b2b99496 InstanceType: t2.large SubnetId: @@ -24,7 +24,7 @@ Resources: ServiceVolume: Type: AWS::EC2::Volume Properties: - AvailabilityZone: us-east-1a + AvailabilityZone: !Select [ 0, !GetAZs ] Size: 15 VolumeType: gp2 ServiceVolumeAttachment: diff --git a/cloudformation/onionperf-dev.yml b/cloudformation/onionperf-dev.yml index ddaffd2..62d93a7 100644 --- a/cloudformation/onionperf-dev.yml +++ b/cloudformation/onionperf-dev.yml @@ -11,7 +11,7 @@ Resources: Instance: Type: AWS::EC2::Instance Properties: - AvailabilityZone: us-east-1a + AvailabilityZone: !Select [ 0, !GetAZs ] ImageId: ami-01db78123b2b99496 InstanceType: t2.micro SubnetId:

1 0