[tor-commits] r26690: {website} Combined the two FAQ entries; added a warning. (website/trunk/docs/en)

[Matt Pagan]

Author: mttp
Date: 2014-04-03 19:46:58 +0000 (Thu, 03 Apr 2014)
New Revision: 26690

Modified:
   website/trunk/docs/en/faq.wml
Log:
Combined the two FAQ entries; added a warning. 



Modified: website/trunk/docs/en/faq.wml
===================================================================
--- website/trunk/docs/en/faq.wml	2014-04-03 03:41:33 UTC (rev 26689)
+++ website/trunk/docs/en/faq.wml	2014-04-03 19:46:58 UTC (rev 26690)
@@ -258,7 +258,6 @@
     <li><a href="#RemotePhysicalDeviceFingerprinting">Does Tor resist
     "remote physical device fingerprinting"?</a></li>
     <li><a href="#IsTorLikeAVPN">Is Tor like a VPN?</a></li>
-    <li><a href="#ShouldIUseTorWithAVPN">Should I use Tor with a VPN?</a></li>
     <li><a href="#Proxychains">Aren't 10 proxies (proxychains) better than
     Tor with only 3 hops?</a></li>
     <li><a href="#AttacksOnOnionRouting">What attacks remain against onion
@@ -4180,7 +4179,14 @@
     <h3><a class="anchor" href="#IsTorLikeAVPN">Is Tor like a VPN?</a></h3>
  
     <p>
-    Some people use Virtual Private Networks (VPNs) as a privacy solution.
+    <b>Do not use a VPN as an <a href="http://www.nbcnews.com/news/investigations/war-anonymous-british-spies-attacked-hackers-snowden-docs-show-n21361">anonymity solution</a>.</b> 
+    If you're looking for a trusted entry into the Tor network, or if you want 
+    to obscure the fact that you're using Tor, <a
+    href="https://www.torproject.org/docs/bridges#RunningABridge">setting up
+    a private server as a bridge</a> works quite well.
+    </p>
+
+    <p>
     VPNs encrypt the traffic between the user and the VPN provider,
     and they can act as a proxy between a user and an online destination.
     However, VPNs have a single point of failure: the VPN provider.
@@ -4217,20 +4223,6 @@
 
     <hr>
 
-    <a id="ShouldIUseTorWithAVPN"></a>
-    <h3><a class="anchor" href="#ShouldIUseTorWithAVPN">Should I use Tor
-    with a VPN?</a></h3>
-
-    <p>
-    This <a href="https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN">wiki
-    page</a> discusses costs and benefits. However, if you're looking
-    for a trusted entry into the Tor network, <a
-    href="https://www.torproject.org/docs/bridges#RunningABridge">setting up
-    a private Tor server as a bridge</a> is a great option.
-    </p>
-
-    <hr>
-
     <a id="Proxychains"></a>
     <h3><a class="anchor" href="#Proxychains">Aren't 10 proxies
     (proxychains) better than Tor with only 3 hops?</a></h3>