Merge branch 'maint-0.3.5' into maint-0.4.0

Thezone1975 · Nov 11, 2019 · 2994051 · 2994051
2 parents 03e77ef + 2abff83
commit 2994051
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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.