Merge branch 'master' of https://git.bettercrypto.org/ach-master

diff --cc src/practical_settings.tex
index 4cce61b,04ac404..8473462
--- 1/src/practical_settings.tex
--- 2/src/practical_settings.tex
+++ b/src/practical_settings.tex
@@@ -965,20 -954,9 +965,20 @@@ tls-remote server.example.co
  \todo{what about tls-auth keys/ta.key? }. 
  \todo{what about auth sha512 ?}
  
 +\item[Justification for special settings (if needed):]
 +
 +\item[References:] \url{http://openvpn.net/index.php/open-source/documentation/security-overview.html}
 +
 +\item[How to test:]
 +\todo{write me please}
 +
 +
 +\end{description}
 +
 +
  \subsubsection{PPTP}
  
- PPTP is broken, Microsoft recommends to ``use a more secure VPN
+ PPTP is considered insecure, Microsoft recommends to ``use a more secure VPN
  tunnel''\footnote{\url{http://technet.microsoft.com/en-us/security/advisory/2743314}}.
  
  There is a cloud service that cracks the underlying MS-CHAPv2