commit 0330652346ed47863710454d3dccdc1b5109d53c Merge: 85cee6a74 8849b2ca3 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Sep 7 09:15:56 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-)