Merge github.com:BetterCrypto/Applied-Crypto-Hardening
authorAaron Kaplan <aaron@lo-res.org>
Mon, 10 Nov 2014 19:11:16 +0000 (20:11 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Mon, 10 Nov 2014 19:11:16 +0000 (20:11 +0100)

Trivial merge