nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.4'

Browse Source
This commit is contained in:
Nick Mathewson 2018-10-10 14:27:27 -04:00
commit 50ad2545cc
2 changed files with 81 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.appveyor.yml
View File

@ -9,10 +9,12 @@ environment:
- target: i686-w64-mingw32 - target: i686-w64-mingw32
compiler_path: mingw32 compiler_path: mingw32
openssl_path: /c/OpenSSL-Win32 openssl_path: /c/OpenSSL-Win32
mingw_prefix: mingw-w64-i686
hardening: hardening:
- target: x86_64-w64-mingw32 - target: x86_64-w64-mingw32
compiler_path: mingw64 compiler_path: mingw64
openssl_path: /c/OpenSSL-Win64 openssl_path: /c/OpenSSL-Win64
mingw_prefix: mingw-w64-x86_64
hardening: --disable-gcc-hardening hardening: --disable-gcc-hardening
install: install:
@ -28,7 +30,7 @@ install:
{ {
Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args
} }
Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm openssl-devel openssl libevent-devel libevent mingw-w64-i686-libevent mingw-w64-x86_64-libevent mingw-w64-i686-openssl mingw-w64-x86_64-openssl mingw-w64-i686-zstd mingw-w64-x86_64-zstd Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm openssl-devel openssl libevent-devel libevent ${env:mingw_prefix}-libevent ${env:mingw_prefix}-zstd ;
build_script: build_script:
- ps: >- - ps: >-

5
changes/tickets_27765_27943 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (CI, appveyor):
- Only install the necessary mingw packages during our appveyor
builds. This change makes the build a little faster, and prevents a
conflict with a preinstalled mingw openssl that appveyor now ships.
Fixes bugs 27943 and 27765; bugfix on 0.3.4.2-alpha.