Merge branch 'bug30021_029' into bug30021_035
commitdb1c1dba34545c9b96f9ec4c01338caeaeeb0433
authorNick Mathewson <nickm@torproject.org>
Thu, 4 Apr 2019 15:26:33 +0000 (4 11:26 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 4 Apr 2019 15:26:33 +0000 (4 11:26 -0400)
tree1d93a45b2f69e6377b17e670623aba26a6431625
parent4aa02d3c7abe84e99874f6bf7bfffb7b551935a5
parent1710f4bbd6bb100901e7f601a1c0f96b51845f86
Merge branch 'bug30021_029' into bug30021_035
src/lib/tls/tortls_openssl.c