[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1

[nickm at torproject.org]

commit b588b6087690b2d17fd7f854a3a1b65b569fa79c
Merge: 9769df89f bf4a27c0e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 22 12:51:27 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1

 changes/ticket31466           | 5 +++++
 src/core/or/connection_edge.c | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)