Merge branch 'master' of github.com:BetterCrypto/Applied-Crypto-Hardening
authorAaron Kaplan <aaron@lo-res.org>
Fri, 9 May 2014 10:05:19 +0000 (12:05 +0200)
committerAaron Kaplan <aaron@lo-res.org>
Fri, 9 May 2014 10:05:19 +0000 (12:05 +0200)

Trivial merge