Merge https://github.com/BetterCrypto/Applied-Crypto-Hardening
authorAaron Zauner <azet@azet.org>
Sun, 2 Nov 2014 00:00:35 +0000 (01:00 +0100)
committerAaron Zauner <azet@azet.org>
Sun, 2 Nov 2014 00:00:35 +0000 (01:00 +0100)

Trivial merge