From: Aaron Zauner <azet@azet.org>
Date: Sat, 5 Apr 2014 18:17:05 +0000 (+0200)
Subject: Merge https://github.com/BetterCrypto/Applied-Crypto-Hardening
X-Git-Url: https://git.bettercrypto.org/ach-master.git/commitdiff_plain/7b56908b4be45373be152e75419c8efce1fc86f7

Merge https://github.com/BetterCrypto/Applied-Crypto-Hardening

Conflicts:
	src/practical_settings/ssh.tex
---

7b56908b4be45373be152e75419c8efce1fc86f7