Merge remote-tracking branch 'tor-gitlab/mr/102' into maint-0.4.4
commitab9c35f04353c00323068ec5dc46b2995a9b69bf
authorGeorge Kadianakis <desnacked@riseup.net>
Tue, 11 Aug 2020 11:53:03 +0000 (11 14:53 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Tue, 11 Aug 2020 11:53:03 +0000 (11 14:53 +0300)
tree390a3b4f064551449dddd4474fe7f2a6c2bc7b89
parent7d80bf80fe9017e04fff4b588f49d0393332ebee
parentea876ab00e223b0c1ba022cc27861cfbbde31b64
Merge remote-tracking branch 'tor-gitlab/mr/102' into maint-0.4.4
src/core/mainloop/connection.c
src/lib/crypt_ops/crypto_util.c
src/lib/crypt_ops/crypto_util.h