merge misresolve
authorSam Hartman <hartmans@painless-security.com>
Mon, 30 Sep 2013 17:19:11 +0000 (13:19 -0400)
committerSam Hartman <hartmans@painless-security.com>
Mon, 30 Sep 2013 17:19:11 +0000 (13:19 -0400)
commitdbd1950db1fbd668e0b9989d2096ee11e3ea3bc7
tree5a557851d71b299f93a52b7868692160e698a91d
parent20aec869d43ecd1d1ba168170211496472ace822
merge misresolve
lib/tls.c