commit 4665ac9ec70105f490ebd810e58281e0c8f03926 Merge: e83eabc9b a4400a77a Author: teor teor@torproject.org Date: Fri Aug 9 09:49:27 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1210' into combined31343_31374_035

changes/bug31343 | 9 +++++++++ src/core/or/channeltls.c | 24 ++++++++++++++++++++---- src/feature/nodelist/routerlist.c | 6 ++++-- 3 files changed, 33 insertions(+), 6 deletions(-)