commit c97c2c690e6c96291882ff1a5826020d82719419 Merge: 9617b596b 896d0ebb9 Author: Nick Mathewson nickm@torproject.org Date: Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

src/lib/tls/tortls_openssl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)