commit 3ce2d8c4adb15268c330264cbd4113294a02c8ad Merge: 336f1fad3 591a189fa Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 9 10:49:47 2018 -0500

Merge branch 'maint-0.3.4' into release-0.3.4

changes/bug28245 | 6 ++++++ configure.ac | 1 + src/common/tortls.c | 17 +++++++++++++++++ 3 files changed, 24 insertions(+)