[tor-commits] [webwml/master] Remove strange characters

[hiro@xxxxxxxxxxxxxx]

commit efffbdc9547dbc681927b8236d57452176a7111e
Author: hiro <hiro@xxxxxxxxxxxxxx>
Date:   Wed Aug 22 12:33:55 2018 +0200

    Remove strange characters
---
 docs/en/faq.wml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/en/faq.wml b/docs/en/faq.wml
index ee197963..69e4568d 100644
--- a/docs/en/faq.wml
+++ b/docs/en/faq.wml
@@ -3539,7 +3539,7 @@ href="https://www.noisebridge.net/wiki/Noisebridge_Tor";>Noisebridge</a>
     <p>
     You can read more at <a href="http://freehaven.net/anonbib/#wright02";>
     An Analysis of the Degradation of Anonymous Protocols</a>,
-    <a href="http://freehaven.net/anonbib/#wright03";>Defending Anonymous 
+    <a href="http://freehaven.net/anonbib/#wright03";>Defending Anonymous
     Communication Against Passive Logging Attacks</a>, and especially
     <a href="http://freehaven.net/anonbib/#hs-attack06";>
     Locating Hidden Servers</a>.
@@ -3980,7 +3980,6 @@ Perhaps even run separate Tor clients for these applications.
     spend rethinking their overall approach to privacy and anonymity.
     </li>
     </ol>
->>>>>>> faq-datadir
 
     <hr>
 

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits