summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-08-12 08:39:41 -0400
committerNick Mathewson <nickm@torproject.org>2020-08-12 08:39:41 -0400
commit6ef40144ae7777acdf13126d61c2686cc470b6c5 (patch)
treed49a7732de87c88e469db35331d037bf3c6da3bb
parentc6c0af403c9b8dccba96677b60d86670a651893d (diff)
parent8182f1351a9f48cfb370da4f6fb61bb69732c211 (diff)
downloadtor-6ef40144ae7777acdf13126d61c2686cc470b6c5.tar.gz
tor-6ef40144ae7777acdf13126d61c2686cc470b6c5.zip
Merge branch 'maint-0.3.5' into maint-0.4.2
-rw-r--r--.appveyor.yml8
1 files changed, 0 insertions, 8 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index 03cf2f69f6..13d0d116ae 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -8,8 +8,6 @@ clone_depth: 50
image:
# Windows Server 2019
- Visual Studio 2019
- # Windows Server 2012 R2
- - Visual Studio 2015
environment:
compiler: mingw
@@ -37,12 +35,6 @@ matrix:
compiler_path: mingw32
mingw_prefix: mingw-w64-i686
hardening:
- - image: Visual Studio 2015
- target: x86_64-w64-mingw32
- compiler_path: mingw64
- mingw_prefix: mingw-w64-x86_64
- # hardening doesn't work with mingw-w64-x86_64-gcc, because it's gcc 8
- hardening: --disable-gcc-hardening
install:
- ps: >-