commit 37c616aeaf21fc54a367361272e5f1fc84d4a508 Merge: d6d3e829d bf4a27c0e Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 18 15:48:25 2019 -0400

Merge branch 'bug31466_035' into bug31466_042

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