commit 748f0abc2d6b1c2da41d269882aabdcf5819b1ab Merge: 2824413f4 565ec6100 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Dec 20 11:19:23 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/common/tortls.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)