Merge github.com:BetterCrypto/Applied-Crypto-Hardening
authorAaron Kaplan <aaron@lo-res.org>
Sat, 28 Dec 2013 15:08:35 +0000 (16:08 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Sat, 28 Dec 2013 15:08:35 +0000 (16:08 +0100)

Trivial merge