[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5

[teor at torproject.org]

commit 6bfdd096792194d1077a101a34859bff996c940e
Merge: 15d67842f bf4a27c0e
Author: teor <teor at torproject.org>
Date:   Wed Nov 6 11:16:09 2019 +1000

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

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