commit 246fdd87424e8e1345aba20ac5d22c07ce082da4 Merge: 9e674d0eb da5c8277e Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 24 08:02:44 2019 -0400

Merge branch 'ticket31372_035' into ticket31372_040

.appveyor.yml | 6 +++--- .travis.yml | 6 ++++-- changes/ticket31372_appveyor | 4 ++++ changes/ticket31372_travis | 4 ++++ 4 files changed, 15 insertions(+), 5 deletions(-)

diff --cc .appveyor.yml index f4fd3774b,25f87fa45..8177a23cf --- a/.appveyor.yml +++ b/.appveyor.yml @@@ -95,9 -95,7 +95,9 @@@ test_script $buildpath = @("C:\msys64${env:compiler_path}\bin") + $oldpath $env:Path = $buildpath -join ';' Set-Location "${env:build}" + Copy-Item "C:/msys64/${env:compiler_path}/bin/libssp-0.dll" -Destination "${env:build}/src/test" + Copy-Item "C:/msys64/${env:compiler_path}/bin/zlib1.dll" -Destination "${env:build}/src/test" - Execute-Bash "VERBOSE=1 make -j2 check" + Execute-Bash "VERBOSE=1 make -k -j2 check" }

on_finish: