commit d1c2597096cac27eb9ee842f52384ca4cb28a195 Merge: 8b0b850ef 33d9889a2 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 31 16:17:04 2018 -0500

Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

changes/bug24952 | 5 +++++ src/or/channeltls.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)