[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3

[nickm at torproject.org]

commit a58dda96b64761c1df54c1a0cb5d21e12a6a0e49
Merge: 275b9f1e4 b444096be
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 6 17:18:46 2020 -0400

    Merge branch 'maint-0.4.3' into release-0.4.3

 changes/bug34131                           | 4 ++++
 src/core/or/connection_edge.c              | 6 ++++--
 src/core/or/connection_or.c                | 1 +
 src/feature/control/btrack_orconn_cevent.c | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)