commit 7043be968a6ebe6fe56f139fc8db372aa9a7379a parent de6ceb0bee8c1bf56d8929940a109bdc2a2d7521 Author: teor <teor@torproject.org> Date: Mon, 11 Nov 2019 14:19:47 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 Diffstat:
| M | .appveyor.yml | | | 2 | +- |
| A | changes/bug32449 | | | 5 | +++++ |
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/.appveyor.yml b/.appveyor.yml @@ -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: >- diff --git a/changes/bug32449 b/changes/bug32449 @@ -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.