Merge https://github.com/DigNative/Applied-Crypto-Hardening
authorAaron Zauner <azet@azet.org>
Sat, 1 Nov 2014 23:59:51 +0000 (00:59 +0100)
committerAaron Zauner <azet@azet.org>
Sat, 1 Nov 2014 23:59:51 +0000 (00:59 +0100)

Trivial merge