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

[teor at torproject.org]

commit 0650bf3695ae2e118426f3f6ecf1f8a344562119
Merge: c06d540ff f0e412099
Author: teor <teor at torproject.org>
Date:   Wed Nov 6 11:15:45 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9

 changes/ticket31466      | 5 +++++
 src/or/connection_edge.c | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)