commit 5d73f87cedaf58fd6e7a53a230b311f5e8b51b73 Merge: 7e969a7b2 2ac2d0a42 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 9 10:49:48 2018 -0500

Merge branch 'maint-0.3.5'

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