Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
commitd1c2597096cac27eb9ee842f52384ca4cb28a195
authorNick Mathewson <nickm@torproject.org>
Wed, 31 Jan 2018 21:17:04 +0000 (31 16:17 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 31 Jan 2018 21:17:04 +0000 (31 16:17 -0500)
treeaaa1b859ea69b01c1945d4d19a40ac97308bbf71
parent8b0b850efa0f77b627f31e9907acc6d29482f362
parent33d9889a2bdd611bcc255c68c43d60b8919ab663
Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
src/or/channeltls.c