Merge github.com:BetterCrypto/Applied-Crypto-Hardening
authorAaron Kaplan <aaron@lo-res.org>
Mon, 23 Dec 2013 22:14:11 +0000 (23:14 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Mon, 23 Dec 2013 22:14:11 +0000 (23:14 +0100)

Trivial merge