[tor-commits] [tor/maint-0.4.1] Merge branch 'ticket31343_040' into maint-0.4.1

[nickm at torproject.org]

commit 0bc5b7ae95a2cc11b380ba09aab0ed1f4219f90b
Merge: 40d7f1e3a 7e32db478
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 8 11:23:59 2019 -0400

    Merge branch 'ticket31343_040' into 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(-)