add diffs from 8884f4d 8e47faf @ https://github.com/cisco/libsrtp