commit 8b026b4eeef1cb3de672d120dfa2018c9ce67f0d Merge: a522aabd3b 301ffb71a6 Author: George Kadianakis desnacked@riseup.net Date: Wed Jul 7 13:04:24 2021 +0300

Merge remote-tracking branch 'tor-gitlab/mr/406' into maint-0.4.6

changes/ticket40421 | 3 +++ src/core/or/connection_edge.c | 4 ++++ 2 files changed, 7 insertions(+)