From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 24 Sep 2019 12:02:44 +0000 (-0400)
Subject: Merge branch 'ticket31372_035' into ticket31372_040
X-Git-Tag: tor-0.4.0.6~14^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=246fdd87424e8e1345aba20ac5d22c07ce082da4;p=thirdparty%2Ftor.git

Merge branch 'ticket31372_035' into ticket31372_040
---

246fdd87424e8e1345aba20ac5d22c07ce082da4
diff --cc .appveyor.yml
index f4fd3774b4,25f87fa457..8177a23cfb
--- 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: