[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1211' into test31343_040

[teor at torproject.org]

commit e609f003425ee9dff9bebbf4f5c683b8395a5c89
Merge: 0a661cde1 7e32db478
Author: teor <teor at torproject.org>
Date:   Fri Aug 9 09:50:50 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1211' into test31343_040

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