Merge branch 'master' of github.com:BetterCrypto/Applied-Crypto-Hardening
authorAaron Kaplan <aaron@lo-res.org>
Sun, 29 Mar 2015 20:45:12 +0000 (22:45 +0200)
committerAaron Kaplan <aaron@lo-res.org>
Sun, 29 Mar 2015 20:45:12 +0000 (22:45 +0200)

Trivial merge