Merge branch 'maint-0.4.2' into maint-0.4.3

This commit is contained in:
Nick Mathewson 2020-08-12 08:39:41 -04:00
commit 489d33e190

View file

@ -8,8 +8,6 @@ clone_depth: 50
image: image:
# Windows Server 2019 # Windows Server 2019
- Visual Studio 2019 - Visual Studio 2019
# Windows Server 2012 R2
- Visual Studio 2015
environment: environment:
compiler: mingw compiler: mingw
@ -37,12 +35,6 @@ matrix:
compiler_path: mingw32 compiler_path: mingw32
mingw_prefix: mingw-w64-i686 mingw_prefix: mingw-w64-i686
hardening: 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: install:
- ps: >- - ps: >-