commit 93cf98cbb160f31804d129e6e3e33355883fc1b2 Merge: dd0b85179 c06b7f090 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 9 10:49:47 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

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