]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-github/pr/902' into maint-0.4.0
authorGeorge Kadianakis <desnacked@riseup.net>
Fri, 5 Apr 2019 11:53:33 +0000 (14:53 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Fri, 5 Apr 2019 11:53:33 +0000 (14:53 +0300)
1  2 
src/lib/tls/tortls_openssl.c

Simple merge