commit a8f936c817d0afc586c6791b9e02b94483c80ae3 Merge: 0acfd7dce 0bc5b7ae9 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 8 11:24:08 2019 -0400

Merge branch 'maint-0.4.1'

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