Merge github.com:BetterCrypto/Applied-Crypto-Hardening
authorAaron Kaplan <aaron@lo-res.org>
Mon, 9 Dec 2013 20:20:53 +0000 (21:20 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Mon, 9 Dec 2013 20:20:53 +0000 (21:20 +0100)

Trivial merge