commit e8b81d7dc5cb03a97136125d3ea50788fad9eab3 Merge: db27a70c9 15596f6c0 d28018ea1 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 13 13:09:57 2018 -0400

Merge branches 'bug27684' and 'bug27685'

src/test/test_tortls_openssl.c | 45 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-)