[tor-commits] [tor/master] Merge branch 'bug31107_040' into bug31107_041

[asn at torproject.org]

commit 6ee19e57c2a25060f6610e795731575aa776d903
Merge: 4596ead2f da8ba5010
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 17 09:16:52 2019 -0400

    Merge branch 'bug31107_040' into bug31107_041

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