commit 591a189fa42c87d706b4395ac6e70110f88b4fe9 Merge: 5acf6f871 c06b7f090 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 9 10:49:47 2018 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

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