commit 78b85f760c99c8561a1248e27861d694f4a54a8d Merge: 016bf9423 2ac2d0a42 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 9 10:49:48 2018 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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