unify the download options, since there are now 4
Roger Dingledine

Roger Dingledine commited on 2012-02-11 16:17:55
Zeige 1 geänderte Dateien mit 10 Einfügungen und 14 Löschungen.

... ...
@@ -54,47 +54,43 @@
54 54
     <h2><a class="anchor" href="#download">Download Obfsproxy Tor Browser Bundle</a></h2>
55 55
 
56 56
     <p>
57
+    We've made an experimental that currently works in all censored
58
+    countries with no config changes.
57 59
     <b>Please spread the news of these bundles to the right people,
58 60
     but please don't make a big media splash out of them &mdash; we need
59 61
     them to remain available and working for people in censored areas.</b>
60 62
     </p>
61 63
 
62 64
     <p>
63
-    We've made an experimental <a
64
-    href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-en-US.exe">Obfsproxy
65
-    Tor Browser Bundle for Windows</a> (<a
65
+    <a
66
+    href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-en-US.exe">Windows Obfsproxy Tor Browser Bundle</a> (<a
66 67
     href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-en-US.exe.asc">signature</a>)
67 68
     (<a
68
-    href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-en-US.torrent">torrent</a>)
69
-    that currently works in all censored countries with no config
70
-    changes. See also <a
69
+    href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-en-US.torrent">torrent</a>), or <a
71 70
     href="http://sebastianhahn.net/stuff/obfsprxy.exe">mirror 1</a>
72 71
     (<a href="http://sebastianhahn.net/stuff/obfsprxy.exe.asc">sig</a>,
73
-    <a href="http://sebastianhahn.net/stuff/obfsprxy.torrent">torrent</a>)
74
-    and <a href="http://mit.edu/arma/Public/obfsprxy.exe">mirror 2</a>
72
+    <a href="http://sebastianhahn.net/stuff/obfsprxy.torrent">torrent</a>),
73
+    <a href="http://mit.edu/arma/Public/obfsprxy.exe">mirror 2</a>
75 74
     (<a href="http://mit.edu/arma/Public/obfsprxy.exe.asc">sig</a>,
76 75
     <a href="http://mit.edu/arma/Public/obfsprxy.torrent">torrent</a>).
77 76
     </p>
78 77
 
79 78
     <p>
80
-    Or try the
81
-    <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>
79
+    <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>
82 80
     (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-osx-64bit.tar.gz.asc">signature</a>)
83 81
     (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-osx-64bit.torrent">torrent</a>), or
84 82
     <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>).
85 83
     </p>
86 84
 
87 85
     <p>
88
-    Or try the
89
-    <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>
86
+    <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>
90 87
     (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-linux-32bit.tar.gz.asc">signature</a>)
91 88
     (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-linux-32bit.torrent">torrent</a>), or
92 89
     <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>).
93 90
     </p>
94 91
 
95 92
     <p>
96
-    Or try the
97
-    <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>
93
+    <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>
98 94
     (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-linux-64bit.tar.gz.asc">signature</a>)
99 95
     (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.10-linux-64bit.torrent">torrent</a>), or
100 96
     <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>).
101 97