commit ab9c35f04353c00323068ec5dc46b2995a9b69bf Merge: 7d80bf80fe ea876ab00e Author: George Kadianakis desnacked@riseup.net Date: Tue Aug 11 14:53:03 2020 +0300

Merge remote-tracking branch 'tor-gitlab/mr/102' into 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(-)