diff options
| author | teor <teor@torproject.org> | 2019-11-11 14:19:59 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-11 14:19:59 +1000 |
| commit | 253a45115ef7908804f58df1020c6a6f46b3affa (patch) | |
| tree | d2f97d0f0496d1c7bab30f12030f233642165d5f | |
| parent | 7a4069911d427391455e8b75597b504dc478da5c (diff) | |
| parent | 8b1f99c29d6bcdbd3598b835b7084cee30383d01 (diff) | |
| download | tor-253a45115ef7908804f58df1020c6a6f46b3affa.tar.gz tor-253a45115ef7908804f58df1020c6a6f46b3affa.zip | |
Merge branch 'maint-0.4.2' into release-0.4.2
| -rw-r--r-- | .appveyor.yml | 2 | ||||
| -rw-r--r-- | changes/bug32449 | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 296678990f..7e08602fe3 100644 --- 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 new file mode 100644 index 0000000000..213d8a1014 --- /dev/null +++ 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. |