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

[nickm at torproject.org]

commit 0d88b9e8a99235024cc5c3e31f024fe8eb9a20c3
Merge: 7664d6f51 3c071f300
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 22 12:54:43 2019 -0400

    Merge branch 'maint-0.4.1' into release-0.4.1

 changes/bug31107         |  4 ++++
 src/core/or/channeltls.c | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)