Merge branch 'vendor/OPENSSL' into rel4_0
commitc1baae3c437b74fba40ec2181b0e2b993593eef5
authorSascha Wildner <saw@online.de>
Thu, 15 Jan 2015 21:19:46 +0000 (15 22:19 +0100)
committerSascha Wildner <saw@online.de>
Thu, 15 Jan 2015 21:19:46 +0000 (15 22:19 +0100)
treec4c08813acede446aba5a604b45c57edc9cb651c
parented2dd084ee5c7ce291d84d234d9c1e1654398462
parent4b6818e855c236add2f0d7f640cba95af9f302e8
Merge branch 'vendor/OPENSSL' into rel4_0
crypto/openssl/ssl/srtp.h