commit b8003fbe99da4657ba408dc69602700956b9c2fb Merge: 069946852a ab9c35f043 Author: George Kadianakis desnacked@riseup.net Date: Tue Aug 11 14:54:26 2020 +0300

Merge branch 'maint-0.4.4'

changes/ticket6198 | 3 +++ src/core/mainloop/connection.c | 8 ++++---- src/lib/crypt_ops/crypto_util.c | 14 ++++++++++++++ src/lib/crypt_ops/crypto_util.h | 10 ++++++++++ 4 files changed, 31 insertions(+), 4 deletions(-)