tor

commit 967cef2f8f5ad654aa0d53e1516fd26bc18a00e8
parent a78504dbe62efac4a8f0ce03f3fb1123bde7c1dd
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri,  7 Sep 2018 08:48:19 -0400

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

Diffstat:
M
.appveyor.yml
 | 
4
+++-
A
changes/bug27460
 | 
6
++++++

2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -9,9 +9,11 @@ environment:
   - target: i686-w64-mingw32
     compiler_path: mingw32
     openssl_path: /c/OpenSSL-Win32
+    hardening:
   - target: x86_64-w64-mingw32
     compiler_path: mingw64
     openssl_path: /c/OpenSSL-Win64
+    hardening: --disable-gcc-hardening
 
 install:
 - ps: >-
@@ -41,7 +43,7 @@ build_script:
             Set-Location "${env:build}"
             Execute-Bash "which ${env:target}-gcc"
             Execute-Bash "${env:target}-gcc --version"
-            Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path}"
+            Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path} ${env:hardening}"
             Execute-Bash "V=1 make -j2"
             Execute-Bash "V=1 make -j2 install"
      }
diff --git a/changes/bug27460 b/changes/bug27460
@@ -0,0 +1,6 @@
+  o Minor bugfixes (continuous integration):
+    - Disable gcc hardening in Appveyor Windows 64-bit builds. As of
+      August 29, 2018, Appveyor images come with gcc 8.2.0 by default.
+      64-bit Windows executables compiled with gcc 8.2.0 and
+      tor's --enable-gcc-hardening crash.
+      Fixes bug 27460; bugfix on 0.3.4.1-alpha.