Merge branch 'master' of github.com:BetterCrypto/Applied-Crypto-Hardening
authorsebix <szebi@gmx.at>
Wed, 25 Dec 2013 20:27:25 +0000 (21:27 +0100)
committersebix <szebi@gmx.at>
Wed, 25 Dec 2013 20:27:25 +0000 (21:27 +0100)
commit5a3ae028c621c4143287bfe6e463da00661e8e1f
tree825b3523f91a3406f50c1687c0050bdefaa16bea
parentc0e6903f7c0330044fe82987bcd7cde3dc5c1c4e
parent63802f297d23462f2759abe8348e21f0518c4d28
Merge branch 'master' of github.com:BetterCrypto/Applied-Crypto-Hardening

Conflicts:
src/acknowledgements.tex
src/practical_settings/DBs.tex
src/practical_settings/im.tex
src/practical_settings/vpn.tex
src/practical_settings/webserver.tex
src/acknowledgements.tex
src/applied-crypto-hardening.tex
src/disclaimer.tex
src/practical_settings/DBs.tex
src/practical_settings/im.tex
src/practical_settings/mailserver.tex
src/practical_settings/ssh.tex
src/practical_settings/vpn.tex
src/security.bib
src/theory/PKIs.tex
src/theory/cipher_suites/recommended.tex