Commit Graph

2 Commits

Author SHA1 Message Date
Colin Sullivan
bb286ba424 Merge branch 'master' into tls_add_cipher 2015-11-23 10:55:43 -07:00
Derek Collison
ef43c19fce Use better ciphers available under 1.5 2015-11-22 08:29:18 -08:00