commit 8f2f06c9b38015f641d0505e805a8285884f55ba Merge: 5e57190 65cf513 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Aug 19 19:35:39 2016 -0400 Merge branch 'maint-0.2.8' changes/bug19903 | 4 ++++ src/common/tortls.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)