commit cb9e3466188aae17e08844ac5a193a35b07edba3 Merge: d89bffb8c7 8b026b4eee Author: George Kadianakis desnacked@riseup.net Date: Wed Jul 7 13:04:39 2021 +0300

Merge branch 'maint-0.4.6' into release-0.4.6

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