commit f9f6718c50ab2c8aead0bcf9b64f91ca1840b367 Merge: 4bc88a266 217db9efe Author: George Kadianakis desnacked@riseup.net Date: Fri Apr 5 14:53:39 2019 +0300

Merge branch 'maint-0.4.0' into release-0.4.0

changes/bug30021 | 8 ++++++++ src/lib/tls/tortls_openssl.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)