Merge github.com:BetterCrypto/Applied-Crypto-Hardening
authorAaron Kaplan <aaron@lo-res.org>
Wed, 1 Jan 2014 17:24:36 +0000 (18:24 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Wed, 1 Jan 2014 17:24:36 +0000 (18:24 +0100)

Trivial merge