Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Wed, 20 Nov 2013 16:20:47 +0000 (17:20 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Wed, 20 Nov 2013 16:20:47 +0000 (17:20 +0100)
Resolved a conflict
Conflicts:
src/practical_settings.tex

1  2 
src/cipher_suites.tex
src/practical_settings.tex

Simple merge
@@@ -680,8 -680,9 +680,11 @@@ Adi?? 
  \subsubsection{XMPP / Jabber}
  \subsubsection{IRC}
  
 +\input{DBs}
 +
+ \subsection{Intercepting proxy solutions}
+ \todo{write this!! }
+ \input{proxy_solutions}