[tor-commits] [tor/master] Merge branch 'maint-0.4.3'

[nickm at torproject.org]

commit 3a785dd5beeaadcd4205f24d6949fdbbdfb5651e
Merge: e39b35f1d b444096be
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 6 17:17:19 2020 -0400

    Merge branch 'maint-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(-)