From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 20 Nov 2018 18:10:18 +0000 (-0500)
Subject: Merge remote-tracking branch 'teor/ticket28459-034' into maint-0.3.4
X-Git-Tag: tor-0.3.4.10~15^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9da8cd0bc35920bc1492efd3312d05f147fc7f7e;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'teor/ticket28459-034' into maint-0.3.4
---

9da8cd0bc35920bc1492efd3312d05f147fc7f7e
diff --cc .appveyor.yml
index f76a9f0a94,21ae277671..0bb93316f5
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@@ -70,10 -60,9 +70,10 @@@ test_script
              Execute-Bash "VERBOSE=1 make -j2 check"
      }
  
- on_failure:
+ on_finish:
  - ps: >-
      if ($env:compiler -eq "mingw") {
 +            <# use the MSYS2 user binaries to archive failures #>
              $oldpath = ${env:Path} -split ';'
              $buildpath = @("C:\msys64\usr\bin") + $oldpath
              $env:Path = @($buildpath) -join ';'
@@@ -85,5 -73,6 +85,7 @@@
              Execute-Bash "tail -1000 config.log || true"
              Execute-Bash "cat test-suite.log || true"
      }
+ 
 +# notify the IRC channel of any failures
+ on_failure:
  - cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci failure