Merge branch 'maint-0.3.1'

2024-12-06 19:41:15 +01:00 · 2017-07-12 09:24:01 -04:00
parent 7b2364035a e111cfcd54
commit 4984d6242a
2 changed files with 7 additions and 0 deletions
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+    - Compile correctly when both openssl 1.1.0 and libscrypt are detected.
+      Previously this would cause an error. Fixes bug 22892; bugfix on 
+      0.3.1.1-alpha.