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)
Conflicts:
src/practical_settings/ssh.tex

1  2 
src/practical_settings/proxy_solutions.tex