[tor-commits] r25403: {website} unify the download options, since there are now 4 (website/trunk/projects/en)

[Roger Dingledine]

Author: arma
Date: 2012-02-11 15:17:55 +0000 (Sat, 11 Feb 2012)
New Revision: 25403

Modified:
   website/trunk/projects/en/obfsproxy.wml
Log:
unify the download options, since there are now 4


Modified: website/trunk/projects/en/obfsproxy.wml
===================================================================
--- website/trunk/projects/en/obfsproxy.wml	2012-02-11 15:12:18 UTC (rev 25402)
+++ website/trunk/projects/en/obfsproxy.wml	2012-02-11 15:17:55 UTC (rev 25403)
@@ -54,47 +54,43 @@
     <h2><a class="anchor" href="#download">Download Obfsproxy Tor Browser Bundle</a></h2>
 
     <p>
+    We've made an experimental that currently works in all censored
+    countries with no config changes.
     <b>Please spread the news of these bundles to the right people,
     but please don't make a big media splash out of them — we need
     them to remain available and working for people in censored areas.</b>
     </p>
 
     <p>
-    We've made an experimental <a
-    href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-en-US.exe">Obfsproxy
-    Tor Browser Bundle for Windows</a> (<a
+    <a
+    href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-en-US.exe">Windows Obfsproxy Tor Browser Bundle</a> (<a
     href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-en-US.exe.asc">signature</a>)
     (<a
-    href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-en-US.torrent">torrent</a>)
-    that currently works in all censored countries with no config
-    changes. See also <a
+    href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-en-US.torrent">torrent</a>), or <a
     href="http://sebastianhahn.net/stuff/obfsprxy.exe">mirror 1</a>
     (<a href="http://sebastianhahn.net/stuff/obfsprxy.exe.asc">sig</a>,
-    <a href="http://sebastianhahn.net/stuff/obfsprxy.torrent">torrent</a>)
-    and <a href="http://mit.edu/arma/Public/obfsprxy.exe">mirror 2</a>
+    <a href="http://sebastianhahn.net/stuff/obfsprxy.torrent">torrent</a>),
+    <a href="http://mit.edu/arma/Public/obfsprxy.exe">mirror 2</a>
     (<a href="http://mit.edu/arma/Public/obfsprxy.exe.asc">sig</a>,
     <a href="http://mit.edu/arma/Public/obfsprxy.torrent">torrent</a>).
     </p>
 
     <p>
-    Or try the
-    <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-osx-64bit.tar.gz">Obfsproxy Tor Browser Bundle for OSX 64-bit</a>
+    <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-osx-64bit.tar.gz">OSX 64-bit Obfsproxy Tor Browser Bundle</a>
     (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-osx-64bit.tar.gz.asc">signature</a>)
     (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-osx-64bit.torrent">torrent</a>), or
     <a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_osx.tar.gz">mirror 1</a> (<a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_osx.tar.gz.asc">sig</a>, <a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_osx.torrent">torrent</a>), <a href=" http://mit.edu/arma/Public/obfsprxy_64bit_osx.tar.gz">mirror 2</a> (<a href="http://mit.edu/arma/Public/obfsprxy_64bit_osx.tar.gz.asc">sig</a>, <a href="http://mit.edu/arma/Public/obfsprxy_64bit_osx.torrent">torrent</a>).
     </p>
 
     <p>
-    Or try the
-    <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-linux-32bit.tar.gz">Obfsproxy Tor Browser Bundle for Linux 32-bit</a>
+    <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-linux-32bit.tar.gz">Linux 32-bit Obfsproxy Tor Browser Bundle</a>
     (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-linux-32bit.tar.gz.asc">signature</a>)
     (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-linux-32bit.torrent">torrent</a>), or
     <a href="http://sebastianhahn.net/stuff/obfsprxy_32bit_linux.tar.gz">mirror 1</a> (<a href="http://sebastianhahn.net/stuff/obfsprxy_32bit_linux.tar.gz.asc">sig</a>, <a href="http://sebastianhahn.net/stuff/obfsprxy_32bit_linux.torrent">torrent</a>), <a href=" http://mit.edu/arma/Public/obfsprxy_32bit_linux.tar.gz">mirror 2</a> (<a href="http://mit.edu/arma/Public/obfsprxy_32bit_linux.tar.gz.asc">sig</a>, <a href="http://mit.edu/arma/Public/obfsprxy_32bit_linux.torrent">torrent</a>).
     </p>
 
     <p>
-    Or try the
-    <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-linux-64bit.tar.gz">Obfsproxy Tor Browser Bundle for Linux 64-bit</a>
+    <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-linux-64bit.tar.gz">Linux 64-bit Obfsproxy Tor Browser Bundle</a>
     (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-linux-64bit.tar.gz.asc">signature</a>)
     (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-linux-64bit.torrent">torrent</a>), or
     <a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.tar.gz">mirror 1</a> (<a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.tar.gz.asc">sig</a>, <a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.torrent">torrent</a>), <a href=" http://mit.edu/arma/Public/obfsprxy_64bit_linux.tar.gz">mirror 2</a> (<a href="http://mit.edu/arma/Public/obfsprxy_64bit_linux.tar.gz.asc">sig</a>, <a href="http://mit.edu/arma/Public/obfsprxy_64bit_linux.torrent">torrent</a>).