commit 565ec6100f8cb7e0f688537f7d6861aa03d83bf6 Merge: 0a1b1430c f7e393eb4 Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 20 11:19:18 2017 -0500

Merge branch 'stack_again_032' into maint-0.3.2

src/common/tortls.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)