commit 7667c1cbaffeb4c1df9241d80d84d27f3f9bde18 Merge: 8d22c09ab 878f44090 Author: teor <teor@torproject.org> Date: Fri Aug 9 09:48:28 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1209' into combined31343_31374_029 changes/bug31343 | 9 +++++++++ src/or/channeltls.c | 23 +++++++++++++++++++---- src/or/routerlist.c | 7 ++++--- 3 files changed, 32 insertions(+), 7 deletions(-)