[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1986/head'

[nickm at torproject.org]

commit 3e3b0b0443b6486553e5cfc18a23a8d7cb7ae4c4
Merge: efe8a98817 837e0c4dc9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 3 08:33:22 2020 -0400

    Merge remote-tracking branch 'tor-github/pr/1986/head'

 changes/ticket32190                  |  4 ++++
 src/core/or/connection_edge.c        | 16 ++++++++++++----
 src/core/or/connection_edge.h        |  2 ++
 src/feature/control/control_cmd.c    |  3 +--
 src/feature/control/control_events.c |  2 ++
 src/feature/control/control_events.h |  8 ++++++--
 6 files changed, 27 insertions(+), 8 deletions(-)