commit 7f9eaec538b7d01e0d1b130dc4cf2ec634252d46 Merge: b2849f449 8c55d34e0 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Apr 24 08:14:59 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1862/head' changes/bug33899 | 9 +++++++++ src/core/or/connection_or.c | 26 ++++++++++++++++++-------- src/core/or/connection_or.h | 4 ---- 3 files changed, 27 insertions(+), 12 deletions(-)