Merge https://github.com/BetterCrypto/Applied-Crypto-Hardening
authorAaron Zauner <azet@azet.org>
Sat, 5 Apr 2014 18:17:05 +0000 (20:17 +0200)
committerAaron Zauner <azet@azet.org>
Sat, 5 Apr 2014 18:17:05 +0000 (20:17 +0200)
commit7b56908b4be45373be152e75419c8efce1fc86f7
treefef157da5d88e3ed47a62db7724e1112860ec86b
parent3a70104ab29cbbe3ba599665f60c73f0a48199af
parentbc34ccb25488a1ebb4c56846f7a10ae9d6a0be7a
Merge https://github.com/BetterCrypto/Applied-Crypto-Hardening

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