Merge https://github.com/krono/Applied-Crypto-Hardening
authorAaron Kaplan <aaron@lo-res.org>
Tue, 7 Jan 2014 13:27:46 +0000 (14:27 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Tue, 7 Jan 2014 13:27:46 +0000 (14:27 +0100)

Trivial merge