Merge github.com:BetterCrypto/Applied-Crypto-Hardening
authorAaron Kaplan <aaron@lo-res.org>
Mon, 16 Dec 2013 20:54:03 +0000 (21:54 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Mon, 16 Dec 2013 20:54:03 +0000 (21:54 +0100)
commite3abf1dbe4461c6be31366f9acf07c50b8bfd41f
tree29a5f0fc3217089650c8d11c22ac5587c3c98bba
parenta87207872a38ec7e51d70fee2042d79539fe4339
parent7f3d05e48a380a675cde861f80acd6eb4e837034
Merge github.com:BetterCrypto/Applied-Crypto-Hardening

Conflicts:
src/practical_settings/DBs.tex
src/practical_settings/DBs.tex