Merge branch 'master' of github.com:BetterCrypto/Applied-Crypto-Hardening
authorAaron Kaplan <aaron@lo-res.org>
Fri, 8 May 2015 18:07:48 +0000 (20:07 +0200)
committerAaron Kaplan <aaron@lo-res.org>
Fri, 8 May 2015 18:07:48 +0000 (20:07 +0200)

Trivial merge