Merge branch 'maint-0.4.2'

This commit is contained in:
teor 2019-11-11 14:20:03 +10:00
commit 8af8ed72b2
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 6 additions and 1 deletions

View File

@ -62,7 +62,7 @@ install:
#
# Use pacman --debug to show package downloads and install locations
#>
Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ;
Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ;
build_script:
- ps: >-

5
changes/bug32449 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (CI, appveyor):
- Install the mingw OpenSSL package in Appveyor. This makes sure that
the OpenSSL headers and libraries match in Tor's Appveyor builds.
(This bug was triggered by an Appveyor image update.)
Fixes bug 32449; bugfix on 0.3.5.6-rc.