Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Zauner <azet@azet.org>
Mon, 9 Dec 2013 21:36:05 +0000 (22:36 +0100)
committerAaron Zauner <azet@azet.org>
Mon, 9 Dec 2013 21:36:05 +0000 (22:36 +0100)
commit4b513e74d8563d830d3516a795c75a74ad1e13a4
treeee6d94dfd7b4a82c1d4233e4fc80cda49b2ea3d7
parentafb37ba6636f500337c918e2a04e8b8e34c2f915
parentaf7f2e99d0778d0e9828ca8b21c96bc0e462fea4
Merge branch 'master' of https://git.bettercrypto.org/ach-master

Conflicts:
src/cipher_suites/recommended.tex
src/cipher_suites/recommended.tex