Merge branch 'master' into hmac_support
authorMichael Rash <mbr@cipherdyne.org>
Thu, 2 Aug 2012 03:41:00 +0000 (23:41 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Thu, 2 Aug 2012 03:41:00 +0000 (23:41 -0400)
commit84b9c775c037ec079bb43dcdf7b8e93517937534
tree3dd0c55ca56d1fc40efada11c3883885ef7b1136
parent1528697aaa7d322c4dd8becd9ca90c2131e54568
parent7061b7bd3ecb1de6ae151b6b85af9251d46e32c6
Merge branch 'master' into hmac_support