Merge branch 'master' of github.com:BetterCrypto/Applied-Crypto-Hardening
authorsebix <szebi@gmx.at>
Sat, 11 Jan 2014 13:54:28 +0000 (14:54 +0100)
committersebix <szebi@gmx.at>
Sat, 11 Jan 2014 13:54:28 +0000 (14:54 +0100)
commit2e6face17254fb7bdcb1563e757509ac2ed4d969
treef2942299fc18599ab2fcc879f7baddcdb6b82dd4
parenta5a9e1555098487aa60624fad4c8cf4e6be82ad6
parent9a83d2a49fd8270d8cceca7dec7403c78fb1b665
Merge branch 'master' of github.com:BetterCrypto/Applied-Crypto-Hardening

Conflicts:
src/acknowledgements.tex
src/applied-crypto-hardening.tex
src/cipherStringB.txt
src/disclaimer.tex
src/perlify.pl
src/practical_settings.tex
src/practical_settings/DBs.tex
src/practical_settings/GPG.tex
src/practical_settings/im.tex
src/practical_settings/mailserver.tex
src/practical_settings/ssh.tex
src/practical_settings/vpn.tex
src/practical_settings/webserver.tex
src/reviewers.tex
16 files changed:
src/Makefile
src/acknowledgements.tex
src/common/cipherStringB.tex
src/common/commands.tex
src/common/style.tex
src/practical_settings.tex
src/practical_settings/DBs.tex
src/practical_settings/GPG.tex
src/practical_settings/im.tex
src/practical_settings/mailserver.tex
src/practical_settings/proxy_solutions.tex
src/practical_settings/ssh.tex
src/practical_settings/vpn.tex
src/practical_settings/webserver.tex
src/theory/PKIs.tex
src/theory/cipher_suites/recommended.tex