Browse code

Update OpenBSD instruction in download-easy

hiro authored on02/04/2018 19:51:23
Showing1 changed files
... ...
@@ -131,6 +131,11 @@
131 131
 
132 132
         <pre>pkg_add tor-browser</pre>
133 133
 
134
+	<p>Sometimes the most recent version of Tor Browser on OpenBSD is behind the current release. The available version of TB on OpenBSD should be checked with:
135
+
136
+	<pre>pkg_info -Q tor-browser</pre>
137
+
138
+	<p>If provided version is not the current Tor Browser version, it is not recommended.</p>
134 139
    
135 140
         <p>To install the Tor Browser port from an updated ports tree, run:</p>
136 141
 
Browse code

Remove openbsd from install Tor instruction add to download easy en

hiromipaw authored on22/01/2018 22:56:34
Showing1 changed files
... ...
@@ -119,6 +119,25 @@
119 119
 	  <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
120 120
 	</div>
121 121
       </div>
122
+<!-- START BSD -->
123
+
124
+  <div id="openbsd" class="easy bsd">
125
+    <div class="package" style="padding-top: 13px; border-top: 0px;">
126
+      <div class="desc">
127
+        <h2>Running Tor on OpenBSD</h2>
128
+	<p>These are installation instructions for running Tor Browser in a OpenBSD environment.</p>
129
+	<p>To install from OpenBSD's packages, run:</p>
130
+
131
+
132
+        <pre>pkg_add tor-browser</pre>
133
+
134
+   
135
+        <p>To install the Tor Browser port from an updated ports tree, run:</p>
136
+
137
+        <pre>cd /usr/ports/meta/tor-browser && make install</pre>
138
+      </div>
139
+    </div>
140
+  </div>
122 141
 <!-- START Orbot -->
123 142
       <div id="android" class="easy android">
124 143
     <div class="package" style="padding-top: 13px; border-top: 0px;">
... ...
@@ -268,6 +287,7 @@ are blocked.</p>
268 287
 <li class="dropdown"><a href="#windows">Microsoft Windows</a></li>
269 288
 <li class="dropdown"><a href="#mac">Apple OS X</a></li>
270 289
 <li class="dropdown"><a href="#linux">Linux</a></li>
290
+<li class="dropdown"><a href="#openbsd">OpenBSD</a></li>
271 291
 <li class="dropdown"><a href="#android">Android</a></li>
272 292
 <li class="dropdown"><a href="<page download/download>">All Downloads</a></li>
273 293
 </ul>
Browse code

Remove old osx32 variables and comments

Nicolas Vigier authored on16/11/2017 12:34:53
Showing1 changed files
... ...
@@ -12,7 +12,7 @@
12 12
 #<!-- Download button text for language enabled packages -->
13 13
 <define-tag button-win-tbb32>Tor Browser</define-tag>
14 14
 <define-tag button-win-tbb64>Currently Unused</define-tag>
15
-<define-tag button-osx-tbb32>Tor Browser</define-tag>
15
+<define-tag button-osx-tbb64>Tor Browser</define-tag>
16 16
 <define-tag button-lin-tbb32>Tor Browser</define-tag>
17 17
 <define-tag button-lin-tbb64>Linux 64-bit</define-tag>
18 18
 
... ...
@@ -64,7 +64,7 @@
64 64
 	    <p>Everything you need to safely browse the Internet.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
65 65
 	  </div>
66 66
 	  <form class="downloads">
67
-	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
67
+	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>
68 68
 	    <select name="language" id="osx-tbb" class="lang">
69 69
 #include <lang.wmi>
70 70
 	    </select>
Browse code

Allow having different Tor Browser versions for each platform

We remove the version-torbrowserbundledir and version-torbrowserbundlebetadir
variables and update all download links to use the same version number
in the directory and the filename.

Nicolas Vigier authored on27/07/2017 20:11:17
Showing1 changed files
... ...
@@ -43,13 +43,13 @@
43 43
 	    <p>Everything you need to safely browse the Internet. <br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
44 44
 	  </div>
45 45
 	  <form class="downloads">
46
-	    <a class="button win-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>
46
+	    <a class="button win-tbb" href="../dist/torbrowser/<version-torbrowserbundle>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>
47 47
 	    <select name="language" id="win-tbb" class="lang">
48 48
 #include <lang.wmi>
49 49
 	    </select>
50 50
 	    <div class="sig" style="margin-bottom: 5px;">
51 51
 	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
52
-	      (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
52
+	      (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundle>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
53 53
 	    </div>
54 54
 	  </form>
55 55
 	  <p class="alt-dl">Not Using Windows?<br />Download for <a href="#mac">Mac</a> or <a href="#linux">Linux</a></p>
... ...
@@ -64,13 +64,13 @@
64 64
 	    <p>Everything you need to safely browse the Internet.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
65 65
 	  </div>
66 66
 	  <form class="downloads">
67
-	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
67
+	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
68 68
 	    <select name="language" id="osx-tbb" class="lang">
69 69
 #include <lang.wmi>
70 70
 	    </select>
71 71
 	    <div class="sig" style="margin-bottom: 5px;">
72 72
 	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
73
-	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
73
+	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
74 74
 	    </div>
75 75
 	  </form>
76 76
 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">Linux</a></p>
... ...
@@ -85,13 +85,13 @@
85 85
 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
86 86
 	  </div>
87 87
 	  <form class="downloads">
88
-	    <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
88
+	    <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundlelinux64>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
89 89
 	    <select name="language" id="lin-tbb64" class="lang">
90 90
 #include <lang.wmi>
91 91
 	    </select>
92 92
 	    <div class="sig" style="margin-bottom: 5px;">
93 93
 	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
94
-	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
94
+	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundlelinux64>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
95 95
 	    </div>
96 96
 	  </form>
97 97
 	  <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
... ...
@@ -107,13 +107,13 @@
107 107
 	    <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
108 108
 	  </div>
109 109
 	  <form class="downloads">
110
-	    <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>
110
+	    <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundlelinux32>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>
111 111
 	    <select name="language" id="lin-tbb32" class="lang">
112 112
 #include <lang.wmi>
113 113
 	    </select>
114 114
 	    <div class="sig" style="margin-bottom: 5px;">
115 115
 	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
116
-	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
116
+	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundlelinux32>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
117 117
 	    </div>
118 118
 	  </form>
119 119
 	  <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
Browse code

10.9 is the min OS X version for Tor Browser 7

Georg Koppen authored on07/06/2017 14:10:57
Showing1 changed files
... ...
@@ -60,7 +60,7 @@
60 60
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
61 61
 	  <div class="desc">
62 62
 	    <h2>Tor Browser for Mac</h2>
63
-	    <em>Version <version-torbrowserbundleosx64> - OS X (10.6+)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
63
+	    <em>Version <version-torbrowserbundleosx64> - OS X (10.9+)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
64 64
 	    <p>Everything you need to safely browse the Internet.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
65 65
 	  </div>
66 66
 	  <form class="downloads">
Browse code

Put the download easy-linux anchor on Linux

hiromipaw authored on26/01/2017 14:39:18
Showing1 changed files
... ...
@@ -77,7 +77,7 @@
77 77
         </div>
78 78
       </div>
79 79
 <!-- START LINUX 64-Bit -->
80
-      <div class="easy linux">
80
+      <div id="linux" class="easy linux">
81 81
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
82 82
 	  <div class="desc">
83 83
 	    <h2>Tor Browser for Linux (64-Bit)</h2>
... ...
@@ -98,7 +98,7 @@
98 98
 	</div>
99 99
       </div>
100 100
 <!-- START LINUX -->
101
-      <div id="linux" class="easy linux">
101
+      <div class="easy linux">
102 102
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
103 103
 	  <div class="desc">
104 104
 	    <h2>Tor Browser for Linux (32-Bit)</h2>
... ...
@@ -173,14 +173,14 @@ is likely to be unsafe to use with Tor.</p>
173 173
 </li>
174 174
 <li><b>Don't torrent over Tor</b>
175 175
 <p>
176
-Torrent file-sharing applications have been observed to ignore proxy 
177
-settings and make direct connections even when they are told to use Tor. 
178
-Even if your torrent application connects only through Tor, you will 
179
-often send out your real IP address in the tracker GET request, 
180
-because that's how torrents work. Not only do you <a 
176
+Torrent file-sharing applications have been observed to ignore proxy
177
+settings and make direct connections even when they are told to use Tor.
178
+Even if your torrent application connects only through Tor, you will
179
+often send out your real IP address in the tracker GET request,
180
+because that's how torrents work. Not only do you <a
181 181
 href="https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea">
182
-deanonymize your torrent traffic and your other simultaneous Tor web 
183
-traffic</a> this way, you also slow down the entire Tor network for everyone else. 
182
+deanonymize your torrent traffic and your other simultaneous Tor web
183
+traffic</a> this way, you also slow down the entire Tor network for everyone else.
184 184
 </p>
185 185
 </li>
186 186
 <li><b>Don't enable or install browser plugins</b>
Browse code

Bug 20734: Fix links and redirects for new donation site

Arthur Edelstein authored on22/11/2016 07:02:06
Showing1 changed files
... ...
@@ -144,61 +144,7 @@
144 144
 
145 145
 
146 146
 <div id="dow-don-right">
147
-
148
-<!-- START DONATION WIDGET -->
149
-  <script async type="text/javascript">
150
-  function displayVals() {
151
-    var t3 = $("#t3").val();
152
-    var amount = $("#amount").val();
153
-    if(t3 != 0){
154
-      $('#a3').val(amount);
155
-      $('#p3').val(1);
156
-      $('#cmd').val('_xclick-subscriptions');
157
-      $('#item_name').val('Tor Project Membership');
158
-      $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>');
159
-    }else{
160
-      $('#a3').val(0);
161
-      $('#p3').val(0);
162
-      $('#cmd').val('_donations');
163
-      $('#item_name').val('Donation to the Tor Project');
164
-      $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
165
-    }
166
-    if( !t3 ) {
167
-      $('#cmd').val('_donations');
168
-      $('#item_name').val('Donation to the Tor Project');
169
-      $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
170
-    }
171
-  }
172
-  $(function(){
173
-    $("#amount").change(displayVals);
174
-    $("#t3").change(displayVals);
175
-    displayVals();
176
-  });
177
-  </script>
178
-<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post">
179
-    <h2><big style="font-weight: bold; font-size: 1.2em;">Help</big><small style="font-size: 0.9em;" > Create more </small><big style="font-weight: bold; font-size: 1.2em;">Tor</big><big style="font-size: 1.2em;">!</big></h2>
180
-      <p>
181
-	<input type="hidden" name="currency_code" class="cur" value="USD">
182
-	<input type="hidden" id="a3" name="a3" value="0">
183
-	<input type="hidden" id="t3" name="t3" value="0">
184
-	<input type="hidden" id="amount" class="amount" name="amount" value="10" size="10">
185
-	<input type="hidden" id="p3" name="p3" value="1">
186
-	<input type="hidden" name="sra" value="1">
187
-	<input type="hidden" name="src" value="1">
188
-	<input type="hidden" name="no_shipping" value="1">
189
-	<input type="hidden" name="no_note" value="1">
190
-	<input type="hidden" id="cmd" name="cmd" value="_donations">
191
-	<input type="hidden" name="business" value="donations@torproject.org">
192
-	<input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project">
193
-	<input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou">
194
-	<input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download-easy">
195
-      </p>
196
-      <h6 id="ppinfo" style="height:0px;"></h6>
197
-      <p>
198
-	<input class="donate-btn" type="submit" name="donate" value="Donate">
199
-      </p>
200
-      <p><a href="<page donate/donate>">Other donation options...</a></p>
201
-</form> <!-- END DONATION WIDGET -->
147
+<a href="<page donate/donate-download>"><img src="../images/btn_donateCC_LG.gif"></a>
202 148
 </div> <!-- END dow-don-right -->
203 149
 
204 150
 
Browse code

Bug 20465: Call it 'Tor Browser', not 'The Tor Browser'

Arthur Edelstein authored on25/10/2016 22:33:02
Showing1 changed files
... ...
@@ -215,14 +215,14 @@ exactly as you are used to.</p>
215 215
 
216 216
 <ol>
217 217
 
218
-<li><b>Use the Tor Browser</b>
218
+<li><b>Use Tor Browser</b>
219 219
 <p>Tor does not protect all of your computer's Internet traffic when you
220 220
 run it. Tor only protects your applications that are properly configured
221 221
 to send their Internet traffic through Tor. To avoid problems with
222 222
 Tor configuration, we strongly recommend you use the <a href="<page
223 223
 projects/torbrowser>">Tor Browser</a>. It is pre-configured to
224 224
 protect your privacy and anonymity on the web as long as you're browsing
225
-with the Tor Browser itself. Almost any other web browser configuration
225
+with Tor Browser itself. Almost any other web browser configuration
226 226
 is likely to be unsafe to use with Tor.</p>
227 227
 </li>
228 228
 <li><b>Don't torrent over Tor</b>
... ...
@@ -238,10 +238,10 @@ traffic</a> this way, you also slow down the entire Tor network for everyone els
238 238
 </p>
239 239
 </li>
240 240
 <li><b>Don't enable or install browser plugins</b>
241
-<p>The Tor Browser will block browser plugins such as Flash, RealPlayer,
241
+<p>Tor Browser will block browser plugins such as Flash, RealPlayer,
242 242
 Quicktime, and others: they can be manipulated into revealing your IP
243 243
 address.  Similarly, we do not recommend installing additional addons or
244
-plugins into the Tor Browser, as these may bypass Tor or otherwise harm
244
+plugins into Tor Browser, as these may bypass Tor or otherwise harm
245 245
 your anonymity and privacy.</p>
246 246
 </li>
247 247
 
... ...
@@ -250,7 +250,7 @@ your anonymity and privacy.</p>
250 250
 href="<page about/overview>#thesolution">to
251 251
 and within the Tor network</a>, but the encryption of your traffic to
252 252
 the final destination website depends upon on that website. To help
253
-ensure private encryption to websites, the Tor Browser includes
253
+ensure private encryption to websites, Tor Browser includes
254 254
 <a href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a>
255 255
 to force the use of HTTPS encryption with major websites that
256 256
 support it. However, you should still watch the browser URL bar to
... ...
@@ -265,7 +265,7 @@ and HTTPS relate</a>.
265 265
 </li>
266 266
 
267 267
 <li><b>Don't open documents downloaded through Tor while online</b>
268
-<p>The Tor Browser will warn you before automatically opening
268
+<p>Tor Browser will warn you before automatically opening
269 269
 documents that are handled by external applications. <b>DO NOT
270 270
 IGNORE THIS WARNING</b>.  You should be very careful when downloading
271 271
 documents via Tor (especially DOC and PDF files, unless you use the PDF
Browse code

Prefer 64bit on Linux

Sebastian Hahn authored on17/08/2016 09:06:10
Showing1 changed files
... ...
@@ -76,44 +76,44 @@
76 76
 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">Linux</a></p>
77 77
         </div>
78 78
       </div>
79
-<!-- START LINUX -->
80
-      <div id="linux" class="easy linux">
79
+<!-- START LINUX 64-Bit -->
80
+      <div class="easy linux">
81 81
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
82 82
 	  <div class="desc">
83
-	    <h2>Tor Browser for Linux</h2>
84
-	    <em>Version <version-torbrowserbundlelinux32> - Linux (32-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
85
-	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br />
86
-	    <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
83
+	    <h2>Tor Browser for Linux (64-Bit)</h2>
84
+	    <em>Version <version-torbrowserbundlelinux64> - Linux (64-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
85
+	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
87 86
 	  </div>
88 87
 	  <form class="downloads">
89
-	    <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>
90
-	    <select name="language" id="lin-tbb32" class="lang">
88
+	    <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
89
+	    <select name="language" id="lin-tbb64" class="lang">
91 90
 #include <lang.wmi>
92 91
 	    </select>
93 92
 	    <div class="sig" style="margin-bottom: 5px;">
94 93
 	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
95
-	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
94
+	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
96 95
 	    </div>
97 96
 	  </form>
98 97
 	  <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
99 98
 	</div>
100 99
       </div>
101
-<!-- START LINUX 64-Bit -->
102
-      <div class="easy linux">
100
+<!-- START LINUX -->
101
+      <div id="linux" class="easy linux">
103 102
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
104 103
 	  <div class="desc">
105
-	    <h2>Tor Browser for 64-Bit Linux</h2>
106
-	    <em>Version <version-torbrowserbundlelinux64> - Linux (64-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
107
-	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
104
+	    <h2>Tor Browser for Linux (32-Bit)</h2>
105
+	    <em>Version <version-torbrowserbundlelinux32> - Linux (32-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
106
+	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br />
107
+	    <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
108 108
 	  </div>
109 109
 	  <form class="downloads">
110
-	    <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
111
-	    <select name="language" id="lin-tbb64" class="lang">
110
+	    <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>
111
+	    <select name="language" id="lin-tbb32" class="lang">
112 112
 #include <lang.wmi>
113 113
 	    </select>
114 114
 	    <div class="sig" style="margin-bottom: 5px;">
115 115
 	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
116
-	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
116
+	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
117 117
 	    </div>
118 118
 	  </form>
119 119
 	  <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
Browse code

Remove instructions for bypassing Gatekeeper on OS X.

Tor Browser now works with Gatekeeper (#6540).

These instructions were originally added for #14838.

This reverts commit 8c308cd6ef7c95b28cf0fc2c4afa1ebf601cd200.
This reverts commit 3b647388ec91070e307a9e508f2d7ac597c799d8.
This reverts commit 1e96f7e96f192dd341854b5b9ac709775f9a2a50.

David Fifield authored on02/06/2016 00:18:11 • Sebastian Hahn committed on21/06/2016 05:46:05
Showing1 changed files
... ...
@@ -75,24 +75,6 @@
75 75
 	  </form>
76 76
 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">Linux</a></p>
77 77
         </div>
78
-        <!-- To update these screenshots: Press Command-Shift-4 and then Spacebar, then click on the window. See #14838. -->
79
-        <table class="howto">
80
-          <tr>
81
-            <th>1. Install</th>
82
-            <th>2. Control-click</th>
83
-            <th>3. Open</th>
84
-          </tr>
85
-          <tr>
86
-            <td><img src="$(IMGROOT)/tbb-macosx-step-1.png" alt="Screenshot showing the contents of the Tor Browser dmg file."></td>
87
-            <td><img src="$(IMGROOT)/tbb-macosx-step-2.png" alt="Screenshot of the Applications folder with the Tor Browser icon."></td>
88
-            <td><img src="$(IMGROOT)/tbb-macosx-step-3.png" alt="Dialog offering to open Tor Browser."></td>
89
-          </tr>
90
-          <tr>
91
-            <td>Drag the Tor Browser icon to the Applications folder and open the Applications folder.</td>
92
-            <td>Control-click on the Tor Browser icon (click the mouse button while pressing the Control key on the keyboard) and choose &ldquo;Open&rdquo;.</td>
93
-            <td>Click &ldquo;Open&rdquo; on the next screen.</td>
94
-          </tr>
95
-        </table>
96 78
       </div>
97 79
 <!-- START LINUX -->
98 80
       <div id="linux" class="easy linux">
Browse code

Offend everyone thoroughly

- remove one FAQ entry
- consistently say Linux, not GNU/Linux
- remove references of FreeBSD in TB context

Sebastian Hahn authored on30/03/2016 09:32:11
Showing1 changed files
... ...
@@ -14,7 +14,7 @@
14 14
 <define-tag button-win-tbb64>Currently Unused</define-tag>
15 15
 <define-tag button-osx-tbb32>Tor Browser</define-tag>
16 16
 <define-tag button-lin-tbb32>Tor Browser</define-tag>
17
-<define-tag button-lin-tbb64>GNU/Linux 64-bit</define-tag>
17
+<define-tag button-lin-tbb64>Linux 64-bit</define-tag>
18 18
 
19 19
 #include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8"
20 20
 
... ...
@@ -52,7 +52,7 @@
52 52
 	      (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
53 53
 	    </div>
54 54
 	  </form>
55
-	  <p class="alt-dl">Not Using Windows?<br />Download for <a href="#mac">Mac</a> or <a href="#linux">GNU/Linux</a></p>
55
+	  <p class="alt-dl">Not Using Windows?<br />Download for <a href="#mac">Mac</a> or <a href="#linux">Linux</a></p>
56 56
 	</div>
57 57
       </div>
58 58
 <!-- START MAC -->
... ...
@@ -73,7 +73,7 @@
73 73
 	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
74 74
 	    </div>
75 75
 	  </form>
76
-	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p>
76
+	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">Linux</a></p>
77 77
         </div>
78 78
         <!-- To update these screenshots: Press Command-Shift-4 and then Spacebar, then click on the window. See #14838. -->
79 79
         <table class="howto">
... ...
@@ -98,8 +98,8 @@
98 98
       <div id="linux" class="easy linux">
99 99
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
100 100
 	  <div class="desc">
101
-	    <h2>Tor Browser for GNU/Linux</h2>
102
-	    <em>Version <version-torbrowserbundlelinux32> - Linux, FreeBSD (32-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
101
+	    <h2>Tor Browser for Linux</h2>
102
+	    <em>Version <version-torbrowserbundlelinux32> - Linux (32-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
103 103
 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br />
104 104
 	    <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
105 105
 	  </div>
... ...
@@ -113,14 +113,14 @@
113 113
 	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
114 114
 	    </div>
115 115
 	  </form>
116
-	  <p class="alt-dl">Not Using GNU/Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
116
+	  <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
117 117
 	</div>
118 118
       </div>
119 119
 <!-- START LINUX 64-Bit -->
120 120
       <div class="easy linux">
121 121
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
122 122
 	  <div class="desc">
123
-	    <h2>Tor Browser for 64-Bit GNU/Linux</h2>
123
+	    <h2>Tor Browser for 64-Bit Linux</h2>
124 124
 	    <em>Version <version-torbrowserbundlelinux64> - Linux (64-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
125 125
 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
126 126
 	  </div>
... ...
@@ -134,7 +134,7 @@
134 134
 	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
135 135
 	    </div>
136 136
 	  </form>
137
-	  <p class="alt-dl">Not Using GNU/Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
137
+	  <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
138 138
 	</div>
139 139
       </div>
140 140
 <!-- START Orbot -->
... ...
@@ -339,7 +339,7 @@ are blocked.</p>
339 339
 <ul>
340 340
 <li class="dropdown"><a href="#windows">Microsoft Windows</a></li>
341 341
 <li class="dropdown"><a href="#mac">Apple OS X</a></li>
342
-<li class="dropdown"><a href="#linux">Linux/FreeBSD</a></li>
342
+<li class="dropdown"><a href="#linux">Linux</a></li>
343 343
 <li class="dropdown"><a href="#android">Android</a></li>
344 344
 <li class="dropdown"><a href="<page download/download>">All Downloads</a></li>
345 345
 </ul>
Browse code

mention that pdf.js is OK

Sebastian Hahn authored on30/03/2016 00:35:57
Showing1 changed files
... ...
@@ -286,7 +286,8 @@ and HTTPS relate</a>.
286 286
 <p>The Tor Browser will warn you before automatically opening
287 287
 documents that are handled by external applications. <b>DO NOT
288 288
 IGNORE THIS WARNING</b>.  You should be very careful when downloading
289
-documents via Tor (especially DOC and PDF files) as these documents
289
+documents via Tor (especially DOC and PDF files, unless you use the PDF
290
+viewer that's built into Tor Browser) as these documents
290 291
 can contain Internet resources that will be downloaded outside of
291 292
 Tor by the application that opens them. This will reveal your non-Tor
292 293
 IP address. If you must work with DOC and/or PDF files, we strongly
Browse code

Try to deceive people less about where TB will run

Sebastian Hahn authored on30/03/2016 00:27:39
Showing1 changed files
... ...
@@ -99,7 +99,7 @@
99 99
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
100 100
 	  <div class="desc">
101 101
 	    <h2>Tor Browser for GNU/Linux</h2>
102
-	    <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
102
+	    <em>Version <version-torbrowserbundlelinux32> - Linux, FreeBSD (32-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
103 103
 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br />
104 104
 	    <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
105 105
 	  </div>
... ...
@@ -121,7 +121,7 @@
121 121
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
122 122
 	  <div class="desc">
123 123
 	    <h2>Tor Browser for 64-Bit GNU/Linux</h2>
124
-	    <em>Version <version-torbrowserbundlelinux64> - Linux, Unix, BSD (64-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
124
+	    <em>Version <version-torbrowserbundlelinux64> - Linux (64-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
125 125
 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
126 126
 	  </div>
127 127
 	  <form class="downloads">
... ...
@@ -338,7 +338,7 @@ are blocked.</p>
338 338
 <ul>
339 339
 <li class="dropdown"><a href="#windows">Microsoft Windows</a></li>
340 340
 <li class="dropdown"><a href="#mac">Apple OS X</a></li>
341
-<li class="dropdown"><a href="#linux">Linux/Unix</a></li>
341
+<li class="dropdown"><a href="#linux">Linux/FreeBSD</a></li>
342 342
 <li class="dropdown"><a href="#android">Android</a></li>
343 343
 <li class="dropdown"><a href="<page download/download>">All Downloads</a></li>
344 344
 </ul>
Browse code

Fix up the android download-easy section a bit

Sebastian Hahn authored on02/03/2016 14:40:34
Showing1 changed files
... ...
@@ -142,11 +142,15 @@
142 142
     <div class="package" style="padding-top: 13px; border-top: 0px;">
143 143
       <div class="desc">
144 144
         <h2>Orbot - Tor for Android</h2>
145
-        <p>Our software is available for Android-based phones, tablets, and computers from the <a href="https://guardianproject.info/">Guardian Project</a> in their <a href= "https://guardianproject.info/2012/03/15/our-new-f-droid-app-repository/">F-Droid Repository</a> or the <a href="https://play.google.com/store/apps/details?id=org.torproject.android">Google Play Store</a>.</p>
146
-        <a href="https://www.torproject.org/docs/android.html.en">Learn more &raquo;</a></p>
145
+        <p>Our software is available for Android-based phones, tablets,
146
+        and computers from the <a href="https://guardianproject.info/">Guardian Project</a> in
147
+        their <a href= "https://guardianproject.info/fdroid/">F-Droid Repository</a> or
148
+        the <a href="https://play.google.com/store/apps/details?id=org.torproject.android">Google
149
+        Play Store</a>. <a href="<page docs/android>">Learn more &raquo;</a>
150
+        </p>
147 151
       </div>
148 152
       <form class="downloads">
149
-        <a class="button lin-orbot" href="https://guardianproject.info/apps/orbot/?src=tbb_download"><span class="strong">Download</span><span class="normal">Orbot</span></a>
153
+        <a class="button" href="https://guardianproject.info/apps/orbot/?src=tbb_download"><span class="strong">Download</span><span class="normal">Orbot</span></a>
150 154
       </form>
151 155
     </div>
152 156
       </div>
Browse code

Merge remote-tracking branch 'donnchaC/orbot-on-download-page'

Sebastian Hahn authored on02/03/2016 14:23:58
Showing0 changed files
Browse code

Tweak wording for gettor/github addition

Sebastian Hahn authored on02/03/2016 14:23:28
Showing1 changed files
... ...
@@ -300,10 +300,15 @@ use Tor, too!</p>
300 300
 This list of pitfalls isn't complete, and we need your help <a href="<page
301 301
 getinvolved/volunteer>#Documentation">identifying and documenting all
302 302
 the issues</a>.</p><br />
303
-<h2><a class="anchor" href="#mirror">What else can I get Tor?</a></h2>
304
-<p>In some countries the Tor Project website is blocked or censored and it is not possible to download
305
- Tor directly. The Tor Project also hosts a mirror of <a href="https://github.com/TheTorProject/gettorbrowser">Tor Browser Bundle on Github</a>.</p><br />
306
-<p>The <a href="https://www.torproject.org/projects/gettor">GetTor</a> service can also be used to download Tor Browser when the Project website and mirrors are blocked.</p>
303
+<h2><a class="anchor" href="#mirror">Where else can I get Tor?</a></h2>
304
+<p>In some countries the Tor Project website is blocked or censored and
305
+it is not possible to download Tor directly. The Tor Project hosts a
306
+Tor Browser <a
307
+href="https://github.com/TheTorProject/gettorbrowser">mirror on Github</a>.</p><br />
308
+<p>Using the <a
309
+href="https://www.torproject.org/projects/gettor">GetTor</a> service is
310
+another way to download Tor Browser when the Project website and mirrors
311
+are blocked.</p>
307 312
 
308 313
 </div>
309 314
 <!-- END WARNING -->
Browse code

List GetTor and Github mirror on Tor download pages

Donncha O'Cearbhaill authored on02/03/2016 13:21:09
Showing1 changed files
... ...
@@ -299,7 +299,11 @@ use Tor, too!</p>
299 299
 <p>Be smart and learn more. Understand what Tor does and does not offer.
300 300
 This list of pitfalls isn't complete, and we need your help <a href="<page
301 301
 getinvolved/volunteer>#Documentation">identifying and documenting all
302
-the issues</a>.</p>
302
+the issues</a>.</p><br />
303
+<h2><a class="anchor" href="#mirror">What else can I get Tor?</a></h2>
304
+<p>In some countries the Tor Project website is blocked or censored and it is not possible to download
305
+ Tor directly. The Tor Project also hosts a mirror of <a href="https://github.com/TheTorProject/gettorbrowser">Tor Browser Bundle on Github</a>.</p><br />
306
+<p>The <a href="https://www.torproject.org/projects/gettor">GetTor</a> service can also be used to download Tor Browser when the Project website and mirrors are blocked.</p>
303 307
 
304 308
 </div>
305 309
 <!-- END WARNING -->
Browse code

Display Orbot on Tor download page

This commit adds a box on the download-easy.html.en webpage which
includes links to install Orbot.

The jquery.client.min.js script is from 2009 and does not detect
Android. I've added JS Android detection.

Donncha O'Cearbhaill authored on01/03/2016 18:04:44
Showing1 changed files
... ...
@@ -137,6 +137,19 @@
137 137
 	  <p class="alt-dl">Not Using GNU/Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
138 138
 	</div>
139 139
       </div>
140
+<!-- START Orbot -->
141
+      <div id="android" class="easy android">
142
+    <div class="package" style="padding-top: 13px; border-top: 0px;">
143
+      <div class="desc">
144
+        <h2>Orbot - Tor for Android</h2>
145
+        <p>Our software is available for Android-based phones, tablets, and computers from the <a href="https://guardianproject.info/">Guardian Project</a> in their <a href= "https://guardianproject.info/2012/03/15/our-new-f-droid-app-repository/">F-Droid Repository</a> or the <a href="https://play.google.com/store/apps/details?id=org.torproject.android">Google Play Store</a>.</p>
146
+        <a href="https://www.torproject.org/docs/android.html.en">Learn more &raquo;</a></p>
147
+      </div>
148
+      <form class="downloads">
149
+        <a class="button lin-orbot" href="https://guardianproject.info/apps/orbot/?src=tbb_download"><span class="strong">Download</span><span class="normal">Orbot</span></a>
150
+      </form>
151
+    </div>
152
+      </div>
140 153
       <p class="all-dl">Looking For Something Else? <a href="<page download/download>">View All Downloads</a></p>
141 154
 		<!-- END DOWNLOADS --><br>
142 155
 </div> <!-- END dow-don-left -->
... ...
@@ -313,6 +326,7 @@ the issues</a>.</p>
313 326
 <li class="dropdown"><a href="#windows">Microsoft Windows</a></li>
314 327
 <li class="dropdown"><a href="#mac">Apple OS X</a></li>
315 328
 <li class="dropdown"><a href="#linux">Linux/Unix</a></li>
329
+<li class="dropdown"><a href="#android">Android</a></li>
316 330
 <li class="dropdown"><a href="<page download/download>">All Downloads</a></li>
317 331
 </ul>
318 332
 </div>
Browse code

Bug 17445: State Windows 10 support explicitly

Georg Koppen authored on03/11/2015 11:56:42 • Sebastian Hahn committed on03/11/2015 12:51:14
Showing1 changed files
... ...
@@ -39,7 +39,7 @@
39 39
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
40 40
 	  <div class="desc">
41 41
 	    <h2>Tor Browser for Windows</h2>
42
-	    <em>Version <version-torbrowserbundle> - Windows 8, 7, Vista, and XP</em>
42
+	    <em>Version <version-torbrowserbundle> - Windows 10, 8, 7, Vista, and XP</em>
43 43
 	    <p>Everything you need to safely browse the Internet. <br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
44 44
 	  </div>
45 45
 	  <form class="downloads">
Browse code

Update dowload links

The download links to the OSX bundles (now 64bit), the Tor expert
bundle (0.2.6.7 is the new stable version) and the alpha bundles (now
4.5) are updated.

Georg Koppen authored on28/04/2015 12:53:42
Showing1 changed files
... ...
@@ -60,17 +60,17 @@
60 60
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
61 61
 	  <div class="desc">
62 62
 	    <h2>Tor Browser for Mac</h2>
63
-	    <em>Version <version-torbrowserbundleosx32> - OS X (10.6+)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
63
+	    <em>Version <version-torbrowserbundleosx64> - OS X (10.6+)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
64 64
 	    <p>Everything you need to safely browse the Internet.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
65 65
 	  </div>
66 66
 	  <form class="downloads">
67
-	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
67
+	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
68 68
 	    <select name="language" id="osx-tbb" class="lang">
69 69
 #include <lang.wmi>
70 70
 	    </select>
71 71
 	    <div class="sig" style="margin-bottom: 5px;">
72 72
 	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
73
-	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
73
+	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
74 74
 	    </div>
75 75
 	  </form>
76 76
 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p>
Browse code

Remove statement about Mac bundles needing no installation.

Mike Perry authored on25/04/2015 02:24:45
Showing1 changed files
... ...
@@ -61,7 +61,7 @@
61 61
 	  <div class="desc">
62 62
 	    <h2>Tor Browser for Mac</h2>
63 63
 	    <em>Version <version-torbrowserbundleosx32> - OS X (10.6+)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
64
-	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
64
+	    <p>Everything you need to safely browse the Internet.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
65 65
 	  </div>
66 66
 	  <form class="downloads">
67 67
 	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
Browse code

Add screenshots that show how to run Tor Browser on OS X.

https://trac.torproject.org/projects/tor/ticket/14838

David Fifield authored on12/02/2015 21:29:32 • Mike Perry committed on25/04/2015 02:17:38
Showing1 changed files
... ...
@@ -75,6 +75,24 @@
75 75
 	  </form>
76 76
 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p>
77 77
         </div>
78
+        <!-- To update these screenshots: Press Command-Shift-4 and then Spacebar, then click on the window. See #14838. -->
79
+        <table class="howto">
80
+          <tr>
81
+            <th>1. Install</th>
82
+            <th>2. Control-click</th>
83
+            <th>3. Open</th>
84
+          </tr>
85
+          <tr>
86
+            <td><img src="$(IMGROOT)/tbb-macosx-step-1.png" alt="Screenshot showing the contents of the Tor Browser dmg file."></td>
87
+            <td><img src="$(IMGROOT)/tbb-macosx-step-2.png" alt="Screenshot of the Applications folder with the Tor Browser icon."></td>
88
+            <td><img src="$(IMGROOT)/tbb-macosx-step-3.png" alt="Dialog offering to open Tor Browser."></td>
89
+          </tr>
90
+          <tr>
91
+            <td>Drag the Tor Browser icon to the Applications folder and open the Applications folder.</td>
92
+            <td>Control-click on the Tor Browser icon (click the mouse button while pressing the Control key on the keyboard) and choose &ldquo;Open&rdquo;.</td>
93
+            <td>Click &ldquo;Open&rdquo; on the next screen.</td>
94
+          </tr>
95
+        </table>
78 96
       </div>
79 97
 <!-- START LINUX -->
80 98
       <div id="linux" class="easy linux">
Browse code

Link to tbb blog posts from download-easy

Sebastian Hahn authored on11/02/2015 12:31:43
Showing1 changed files
... ...
@@ -60,7 +60,7 @@
60 60
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
61 61
 	  <div class="desc">
62 62
 	    <h2>Tor Browser for Mac</h2>
63
-	    <em>Version <version-torbrowserbundleosx32> - OS X (10.6+)</em>
63
+	    <em>Version <version-torbrowserbundleosx32> - OS X (10.6+)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
64 64
 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
65 65
 	  </div>
66 66
 	  <form class="downloads">
... ...
@@ -81,7 +81,7 @@
81 81
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
82 82
 	  <div class="desc">
83 83
 	    <h2>Tor Browser for GNU/Linux</h2>
84
-	    <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em>
84
+	    <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
85 85
 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br />
86 86
 	    <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
87 87
 	  </div>
... ...
@@ -103,7 +103,7 @@
103 103
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
104 104
 	  <div class="desc">
105 105
 	    <h2>Tor Browser for 64-Bit GNU/Linux</h2>
106
-	    <em>Version <version-torbrowserbundlelinux64> - Linux, Unix, BSD (64-Bit)</em>
106
+	    <em>Version <version-torbrowserbundlelinux64> - Linux, Unix, BSD (64-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
107 107
 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
108 108
 	  </div>
109 109
 	  <form class="downloads">
Browse code

youtube no longer breaks when used without flash

Sebastian Hahn authored on11/01/2015 20:40:18
Showing1 changed files
... ...
@@ -225,10 +225,7 @@ traffic</a> this way, you also slow down the entire Tor network for everyone els
225 225
 Quicktime, and others: they can be manipulated into revealing your IP
226 226
 address.  Similarly, we do not recommend installing additional addons or
227 227
 plugins into the Tor Browser, as these may bypass Tor or otherwise harm
228
-your anonymity and privacy. The lack of plugins means that Youtube videos
229
-are blocked by default, but Youtube does provide an experimental opt-in
230
-feature <a href="https://www.youtube.com/html5">(enable it here)</a>
231
-that works for some videos.</p>
228
+your anonymity and privacy.</p>
232 229
 </li>
233 230
 
234 231
 <li><b>Use HTTPS versions of websites</b>
Browse code

Fix download link anchors.

David Fifield authored on19/10/2014 07:23:54
Showing1 changed files
... ...
@@ -48,7 +48,7 @@
48 48
 #include <lang.wmi>
49 49
 	    </select>
50 50
 	    <div class="sig" style="margin-bottom: 5px;">
51
-	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a>
51
+	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
52 52
 	      (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
53 53
 	    </div>
54 54
 	  </form>
... ...
@@ -69,7 +69,7 @@
69 69
 #include <lang.wmi>
70 70
 	    </select>
71 71
 	    <div class="sig" style="margin-bottom: 5px;">
72
-	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
72
+	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
73 73
 	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
74 74
 	    </div>
75 75
 	  </form>
... ...
@@ -91,7 +91,7 @@
91 91
 #include <lang.wmi>
92 92
 	    </select>
93 93
 	    <div class="sig" style="margin-bottom: 5px;">
94
-	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
94
+	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
95 95
 	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
96 96
 	    </div>
97 97
 	  </form>
... ...
@@ -112,7 +112,7 @@
112 112
 #include <lang.wmi>
113 113
 	    </select>
114 114
 	    <div class="sig" style="margin-bottom: 5px;">
115
-	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
115
+	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
116 116
 	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
117 117
 	    </div>
118 118
 	  </form>
Browse code

Tor Browser Bundle to Tor Browser on download-easy

Matt Pagan authored on25/07/2014 19:47:54
Showing1 changed files
... ...
@@ -10,10 +10,10 @@
10 10
 <define-tag lang>en-US</define-tag>
11 11
 
12 12
 #<!-- Download button text for language enabled packages -->
13
-<define-tag button-win-tbb32>Tor Browser Bundle</define-tag>
13
+<define-tag button-win-tbb32>Tor Browser</define-tag>
14 14
 <define-tag button-win-tbb64>Currently Unused</define-tag>
15
-<define-tag button-osx-tbb32>Tor Browser Bundle</define-tag>
16
-<define-tag button-lin-tbb32>Tor Browser Bundle</define-tag>
15
+<define-tag button-osx-tbb32>Tor Browser</define-tag>
16
+<define-tag button-lin-tbb32>Tor Browser</define-tag>
17 17
 <define-tag button-lin-tbb64>GNU/Linux 64-bit</define-tag>
18 18
 
19 19
 #include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8"
... ...
@@ -38,7 +38,7 @@
38 38
       <div id="windows" class="easy windows">
39 39
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
40 40
 	  <div class="desc">
41
-	    <h2>Tor Browser Bundle for Windows</h2>
41
+	    <h2>Tor Browser for Windows</h2>
42 42
 	    <em>Version <version-torbrowserbundle> - Windows 8, 7, Vista, and XP</em>
43 43
 	    <p>Everything you need to safely browse the Internet. <br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
44 44
 	  </div>
... ...
@@ -59,7 +59,7 @@
59 59
       <div id="mac" class="easy mac">
60 60
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
61 61
 	  <div class="desc">
62
-	    <h2>Tor Browser Bundle for Mac</h2>
62
+	    <h2>Tor Browser for Mac</h2>
63 63
 	    <em>Version <version-torbrowserbundleosx32> - OS X (10.6+)</em>
64 64
 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
65 65
 	  </div>
... ...
@@ -80,7 +80,7 @@
80 80
       <div id="linux" class="easy linux">
81 81
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
82 82
 	  <div class="desc">
83
-	    <h2>Tor Browser Bundle for GNU/Linux</h2>
83
+	    <h2>Tor Browser for GNU/Linux</h2>
84 84
 	    <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em>
85 85
 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br />
86 86
 	    <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
... ...
@@ -102,7 +102,7 @@
102 102
       <div class="easy linux">
103 103
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
104 104
 	  <div class="desc">
105
-	    <h2>Tor Browser Bundle for 64-Bit GNU/Linux</h2>
105
+	    <h2>Tor Browser for 64-Bit GNU/Linux</h2>
106 106
 	    <em>Version <version-torbrowserbundlelinux64> - Linux, Unix, BSD (64-Bit)</em>
107 107
 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
108 108
 	  </div>
... ...
@@ -203,7 +203,7 @@ exactly as you are used to.</p>
203 203
 run it. Tor only protects your applications that are properly configured
204 204
 to send their Internet traffic through Tor. To avoid problems with
205 205
 Tor configuration, we strongly recommend you use the <a href="<page
206
-projects/torbrowser>">Tor Browser Bundle</a>. It is pre-configured to
206
+projects/torbrowser>">Tor Browser</a>. It is pre-configured to
207 207
 protect your privacy and anonymity on the web as long as you're browsing
208 208
 with the Tor Browser itself. Almost any other web browser configuration
209 209
 is likely to be unsafe to use with Tor.</p>
... ...
@@ -236,7 +236,7 @@ that works for some videos.</p>
236 236
 href="<page about/overview>#thesolution">to
237 237
 and within the Tor network</a>, but the encryption of your traffic to
238 238
 the final destination website depends upon on that website. To help
239
-ensure private encryption to websites, the Tor Browser Bundle includes
239
+ensure private encryption to websites, the Tor Browser includes
240 240
 <a href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a>
241 241
 to force the use of HTTPS encryption with major websites that
242 242
 support it. However, you should still watch the browser URL bar to
Browse code

fix the filename for the new osx tbb's

Roger Dingledine authored on30/04/2014 02:30:41
Showing1 changed files
... ...
@@ -64,13 +64,13 @@
64 64
 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
65 65
 	  </div>
66 66
 	  <form class="downloads">
67
-	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
67
+	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
68 68
 	    <select name="language" id="osx-tbb" class="lang">
69 69
 #include <lang.wmi>
70 70
 	    </select>
71 71
 	    <div class="sig" style="margin-bottom: 5px;">
72 72
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
73
-	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
73
+	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
74 74
 	    </div>
75 75
 	  </form>
76 76
 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p>
Browse code

add a sentence from download onto download-easy

pointed out in
https://blog.torproject.org/blog/tor-browser-353-released#comment-55024

Roger Dingledine authored on27/03/2014 04:55:06
Showing1 changed files
... ...
@@ -243,8 +243,11 @@ support it. However, you should still watch the browser URL bar to
243 243
 ensure that websites you provide sensitive information to display a <a
244 244
 href="https://support.mozilla.com/en-US/kb/Site%20Identity%20Button">blue
245 245
 or green URL bar button</a>, include <b>https://</b> in the URL, and
246
-display the
247
-proper expected name for the website.</p>
246
+display the proper expected name for the website.
247
+Also see EFF's interactive page
248
+explaining <a href="https://www.eff.org/pages/tor-and-https">how Tor
249
+and HTTPS relate</a>.
250
+</p>
248 251
 </li>
249 252
 
250 253
 <li><b>Don't open documents downloaded through Tor while online</b>
Browse code

whee, these links were broken before and we hadn't noticed. now we noticed.

Roger Dingledine authored on24/03/2014 08:05:46
Showing1 changed files
... ...
@@ -233,7 +233,7 @@ that works for some videos.</p>
233 233
 
234 234
 <li><b>Use HTTPS versions of websites</b>
235 235
 <p>Tor will encrypt your traffic <a
236
-href="<page overview>#thesolution">to
236
+href="<page about/overview>#thesolution">to
237 237
 and within the Tor network</a>, but the encryption of your traffic to
238 238
 the final destination website depends upon on that website. To help
239 239
 ensure private encryption to websites, the Tor Browser Bundle includes
Browse code

use the <page> tag consistently in the download pages too

Roger Dingledine authored on24/03/2014 07:54:56
Showing1 changed files
... ...
@@ -233,7 +233,7 @@ that works for some videos.</p>
233 233
 
234 234
 <li><b>Use HTTPS versions of websites</b>
235 235
 <p>Tor will encrypt your traffic <a
236
-href="https://www.torproject.org/about/overview.html.en#thesolution">to
236
+href="<page overview>#thesolution">to
237 237
 and within the Tor network</a>, but the encryption of your traffic to
238 238
 the final destination website depends upon on that website. To help
239 239
 ensure private encryption to websites, the Tor Browser Bundle includes
... ...
@@ -295,7 +295,7 @@ the issues</a>.</p>
295 295
 <li class="dropdown"><a href="#windows">Microsoft Windows</a></li>
296 296
 <li class="dropdown"><a href="#mac">Apple OS X</a></li>
297 297
 <li class="dropdown"><a href="#linux">Linux/Unix</a></li>
298
-<li class="dropdown"><a href="../download/download.html.en">All Downloads</a></li>
298
+<li class="dropdown"><a href="<page download/download>">All Downloads</a></li>
299 299
 </ul>
300 300
 </div>
301 301
 </div>
Browse code

Dropped the line that encourages extracting what is actually an installer.

Matt Pagan authored on14/03/2014 16:53:45
Showing1 changed files
... ...
@@ -40,7 +40,7 @@
40 40
 	  <div class="desc">
41 41
 	    <h2>Tor Browser Bundle for Windows</h2>
42 42
 	    <em>Version <version-torbrowserbundle> - Windows 8, 7, Vista, and XP</em>
43
-	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
43
+	    <p>Everything you need to safely browse the Internet. <br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
44 44
 	  </div>
45 45
 	  <form class="downloads">
46 46
 	    <a class="button win-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>
Browse code

update download page per ticket 10330

Andrew Lewman authored on30/01/2014 04:57:58
Showing1 changed files
... ...
@@ -19,21 +19,29 @@
19 19
 #include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8"
20 20
 
21 21
 <div id="content" class="clearfix">
22
-  <div id="breadcrumbs"><a href="<page index>">Home &raquo; </a><a href="<page download/download>">Download</a></div>
23
-  <div id="maincol-left">
24
-<!-- BEGIN TEASER WARNING -->
25
-    <div class="warning-top">
26
-      <h2>Want Tor to really work?</h2>
27
-	<p>You need to change some of your habits, as some things won't work exactly as
28
-you are used to. Please read the <a href="#warning">full list of warnings</a> for details.
29
-	</p>
30
-      </div>
31
-<!-- END TEASER WARNING -->
32
-<!-- START DOWNLOADS -->
33
-<!-- START DOWNLOADS -->
34
-<!-- START WINDOWS -->
22
+	<div id="breadcrumbs"><a href="<page index>">Home &raquo; </a><a href="<page download/download>">Download</a></div>
23
+	<!-- BEGIN TEASER WARNING -->
24
+	<div class="warning-top">
25
+		<h2>Want Tor to really work?</h2>
26
+		<p>You need to change some of your habits, as some things won't work exactly as you are used to. Please read the <a href="#warning">full list of warnings</a> for details.</p>
27
+	</div>
28
+	<!-- END TEASER WARNING -->
29
+	<div id="download-donate" class="clearfix">
30
+		<!-- START DOWNLOADS -->
31
+		<!-- START WINDOWS -->
32
+
33
+
34
+
35
+<div id="dow-don-left">
36
+
37
+
35 38
       <div id="windows" class="easy windows">
36 39
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
40
+	  <div class="desc">
41
+	    <h2>Tor Browser Bundle for Windows</h2>
42
+	    <em>Version <version-torbrowserbundle> - Windows 8, 7, Vista, and XP</em>
43
+	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
44
+	  </div>
37 45
 	  <form class="downloads">
38 46
 	    <a class="button win-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>
39 47
 	    <select name="language" id="win-tbb" class="lang">
... ...
@@ -44,17 +52,17 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
44 52
 	      (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
45 53
 	    </div>
46 54
 	  </form>
47
-	  <div class="desc">
48
-	    <h2>Tor Browser Bundle for Windows</h2>
49
-	    <em>Version <version-torbrowserbundle> - Windows 8, 7, Vista, and XP</em>
50
-	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
51
-	  </div>
52
-	  <p class="alt-dl">Not Using Windows? Download for <a href="#mac">Mac</a> or <a href="#linux">GNU/Linux</a></p>
55
+	  <p class="alt-dl">Not Using Windows?<br />Download for <a href="#mac">Mac</a> or <a href="#linux">GNU/Linux</a></p>
53 56
 	</div>
54 57
       </div>
55 58
 <!-- START MAC -->
56 59
       <div id="mac" class="easy mac">
57 60
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
61
+	  <div class="desc">
62
+	    <h2>Tor Browser Bundle for Mac</h2>
63
+	    <em>Version <version-torbrowserbundleosx32> - OS X (10.6+)</em>
64
+	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
65
+	  </div>
58 66
 	  <form class="downloads">
59 67
 	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
60 68
 	    <select name="language" id="osx-tbb" class="lang">
... ...
@@ -65,17 +73,18 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
65 73
 	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
66 74
 	    </div>
67 75
 	  </form>
68
-	  <div class="desc">
69
-	    <h2>Tor Browser Bundle for Mac</h2>
70
-	    <em>Version <version-torbrowserbundleosx32> - OS X (10.6+)</em>
71
-	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
72
-	  </div>
73 76
 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p>
74 77
         </div>
75 78
       </div>
76 79
 <!-- START LINUX -->
77 80
       <div id="linux" class="easy linux">
78 81
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
82
+	  <div class="desc">
83
+	    <h2>Tor Browser Bundle for GNU/Linux</h2>
84
+	    <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em>
85
+	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br />
86
+	    <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
87
+	  </div>
79 88
 	  <form class="downloads">
80 89
 	    <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>
81 90
 	    <select name="language" id="lin-tbb32" class="lang">
... ...
@@ -86,17 +95,17 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
86 95
 	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
87 96
 	    </div>
88 97
 	  </form>
89
-	  <div class="desc">
90
-	    <h2>Tor Browser Bundle for GNU/Linux</h2>
91
-	    <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em>
92
-	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
93
-	  </div>
94 98
 	  <p class="alt-dl">Not Using GNU/Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
95 99
 	</div>
96 100
       </div>
97 101
 <!-- START LINUX 64-Bit -->
98 102
       <div class="easy linux">
99 103
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
104
+	  <div class="desc">
105
+	    <h2>Tor Browser Bundle for 64-Bit GNU/Linux</h2>
106
+	    <em>Version <version-torbrowserbundlelinux64> - Linux, Unix, BSD (64-Bit)</em>
107
+	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
108
+	  </div>
100 109
 	  <form class="downloads">
101 110
 	    <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
102 111
 	    <select name="language" id="lin-tbb64" class="lang">
... ...
@@ -107,16 +116,78 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
107 116
 	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
108 117
 	    </div>
109 118
 	  </form>
110
-	  <div class="desc">
111
-	    <h2>Tor Browser Bundle for 64-Bit GNU/Linux</h2>
112
-	    <em>Version <version-torbrowserbundlelinux64> - Linux, Unix, BSD (64-Bit)</em>
113
-	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
114
-	  </div>
115 119
 	  <p class="alt-dl">Not Using GNU/Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
116 120
 	</div>
117 121
       </div>
118 122
       <p class="all-dl">Looking For Something Else? <a href="<page download/download>">View All Downloads</a></p>
119
-<!-- END DOWNLOADS --><br>
123
+		<!-- END DOWNLOADS --><br>
124
+</div> <!-- END dow-don-left -->
125
+
126
+
127
+
128
+
129
+<div id="dow-don-right">
130
+
131
+<!-- START DONATION WIDGET -->
132
+  <script async type="text/javascript">
133
+  function displayVals() {
134
+    var t3 = $("#t3").val();
135
+    var amount = $("#amount").val();
136
+    if(t3 != 0){
137
+      $('#a3').val(amount);
138
+      $('#p3').val(1);
139
+      $('#cmd').val('_xclick-subscriptions');
140
+      $('#item_name').val('Tor Project Membership');
141
+      $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>');
142
+    }else{
143
+      $('#a3').val(0);
144
+      $('#p3').val(0);
145
+      $('#cmd').val('_donations');
146
+      $('#item_name').val('Donation to the Tor Project');
147
+      $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
148
+    }
149
+    if( !t3 ) {
150
+      $('#cmd').val('_donations');
151
+      $('#item_name').val('Donation to the Tor Project');
152
+      $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
153
+    }
154
+  }
155
+  $(function(){
156
+    $("#amount").change(displayVals);
157
+    $("#t3").change(displayVals);
158
+    displayVals();
159
+  });
160
+  </script>
161
+<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post">
162
+    <h2><big style="font-weight: bold; font-size: 1.2em;">Help</big><small style="font-size: 0.9em;" > Create more </small><big style="font-weight: bold; font-size: 1.2em;">Tor</big><big style="font-size: 1.2em;">!</big></h2>
163
+      <p>
164
+	<input type="hidden" name="currency_code" class="cur" value="USD">
165
+	<input type="hidden" id="a3" name="a3" value="0">
166
+	<input type="hidden" id="t3" name="t3" value="0">
167
+	<input type="hidden" id="amount" class="amount" name="amount" value="10" size="10">
168
+	<input type="hidden" id="p3" name="p3" value="1">
169
+	<input type="hidden" name="sra" value="1">
170
+	<input type="hidden" name="src" value="1">
171
+	<input type="hidden" name="no_shipping" value="1">
172
+	<input type="hidden" name="no_note" value="1">
173
+	<input type="hidden" id="cmd" name="cmd" value="_donations">
174
+	<input type="hidden" name="business" value="donations@torproject.org">
175
+	<input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project">
176
+	<input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou">
177
+	<input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download-easy">
178
+      </p>
179
+      <h6 id="ppinfo" style="height:0px;"></h6>
180
+      <p>
181
+	<input class="donate-btn" type="submit" name="donate" value="Donate">
182
+      </p>
183
+      <p><a href="<page donate/donate>">Other donation options...</a></p>
184
+</form> <!-- END DONATION WIDGET -->
185
+</div> <!-- END dow-don-right -->
186
+
187
+
188
+
189
+	</div> <!-- END download-donate -->
190
+	<div id="maincol-left">
120 191
 <!-- BEGIN WARNING -->
121 192
 <div class="warning">
122 193
 <a name="warning"></a>
... ...
@@ -218,73 +289,6 @@ the issues</a>.</p>
218 289
 <!-- END MAINCOL -->
219 290
 <!-- START SIDECOL -->
220 291
 <div id="sidecol-right">
221
-<!-- START DONATION WIDGET -->
222
-  <script async type="text/javascript">
223
-  function displayVals() {
224
-    var t3 = $("#t3").val();
225
-    var amount = $("#amount").val();
226
-    if(t3 != 0){
227
-      $('#a3').val(amount);
228
-      $('#p3').val(1);
229
-      $('#cmd').val('_xclick-subscriptions');
230
-      $('#item_name').val('Tor Project Membership');
231
-      $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>');
232
-    }else{
233
-      $('#a3').val(0);
234
-      $('#p3').val(0);
235
-      $('#cmd').val('_donations');
236
-      $('#item_name').val('Donation to the Tor Project');
237
-      $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
238
-    }
239
-    if( !t3 ) {
240
-      $('#cmd').val('_donations');
241
-      $('#item_name').val('Donation to the Tor Project');
242
-      $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
243
-    }
244
-  }
245
-  $(function(){
246
-    $("#amount").change(displayVals);
247
-    $("#t3").change(displayVals);
248
-    displayVals();
249
-  });
250
-  </script>
251
-<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post">
252
-    <h2>Support more privacy!</h2>
253
-      <p>
254
-	<select name="currency_code" class="cur">
255
-	  <option value="USD" selected="selected">$</option>
256
-	  <option value="EUR">&euro;</option>
257
-	  <option value="GBP">&pound;</option>
258
-	  <option value="YEN">&yen;</option>
259
-	</select>
260
-	<input type="text" id="amount" class="amount" name="amount" value="10" size="10">
261
-      </p>
262
-      <p>
263
-	<input type="hidden" id="a3" name="a3" value="0">
264
-	  <select id="t3" name="t3">
265
-	    <option value="0">One-time Donation</option>
266
-	    <option value="M">Monthly Subscription</option>
267
-	  </select>
268
-      </p>
269
-      <p>
270
-	<input type="hidden" id="p3" name="p3" value="1">
271
-	<input type="hidden" name="sra" value="1">
272
-	<input type="hidden" name="src" value="1">
273
-	<input type="hidden" name="no_shipping" value="1">
274
-	<input type="hidden" name="no_note" value="1">
275
-	<input type="hidden" id="cmd" name="cmd" value="_donations">
276
-	<input type="hidden" name="business" value="donations@torproject.org">
277
-	<input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project">
278
-	<input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou.html">
279
-	<input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download.html">
280
-      </p>
281
-      <h6 id="ppinfo" style="height:0px;"></h6>
282
-      <p>
283
-	<input class="donate-btn" type="submit" name="donate" value="Donate">
284
-      </p>
285
-      <p><a href="<page donate/donate>">Other donation options...</a></p>
286
-</form>
287
-<!-- END DONATION WIDGET -->
288 292
 <div class="img-shadow sidenav-ez">
289 293
 <div class="sidenav-sub">
290 294
 <ul>
Browse code

change to $10 per ticket 10435

Andrew Lewman authored on22/12/2013 19:15:02
Showing1 changed files
... ...
@@ -257,7 +257,7 @@ the issues</a>.</p>
257 257
 	  <option value="GBP">&pound;</option>
258 258
 	  <option value="YEN">&yen;</option>
259 259
 	</select>
260
-	<input type="text" id="amount" class="amount" name="amount" value="5" size="10">
260
+	<input type="text" id="amount" class="amount" name="amount" value="10" size="10">
261 261
       </p>
262 262
       <p>
263 263
 	<input type="hidden" id="a3" name="a3" value="0">
Browse code

make the d-e donations text shorter

Andrew Lewman authored on22/12/2013 19:09:45
Showing1 changed files
... ...
@@ -249,7 +249,7 @@ the issues</a>.</p>
249 249
   });
250 250
   </script>
251 251
 <form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post">
252
-    <h2>Defend your privacy online!</h2>
252
+    <h2>Support more privacy!</h2>
253 253
       <p>
254 254
 	<select name="currency_code" class="cur">
255 255
 	  <option value="USD" selected="selected">$</option>
Browse code

change the text of the download-easy donation widget.

Andrew Lewman authored on22/12/2013 19:03:22
Showing1 changed files
... ...
@@ -249,7 +249,7 @@ the issues</a>.</p>
249 249
   });
250 250
   </script>
251 251
 <form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post">
252
-    <h2>Help create more Tor!</h2>
252
+    <h2>Defend your privacy online!</h2>
253 253
       <p>
254 254
 	<select name="currency_code" class="cur">
255 255
 	  <option value="USD" selected="selected">$</option>
Browse code

update osx tbb link on download-easy page

Erinn Clark authored on19/12/2013 04:01:32
Showing1 changed files
... ...
@@ -56,13 +56,13 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
56 56
       <div id="mac" class="easy mac">
57 57
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
58 58
 	  <form class="downloads">
59
-	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
59
+	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
60 60
 	    <select name="language" id="osx-tbb" class="lang">
61 61
 #include <lang.wmi>
62 62
 	    </select>
63 63
 	    <div class="sig" style="margin-bottom: 5px;">
64 64
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
65
-	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
65
+	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowserBundle-<version-torbrowserbundleosx32>-osx32_<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
66 66
 	    </div>
67 67
 	  </form>
68 68
 	  <div class="desc">
Browse code

fix the download-easy page so the donation box is in the right place

Erinn Clark authored on19/12/2013 01:32:47
Showing1 changed files
... ...
@@ -13,7 +13,6 @@
13 13
 <define-tag button-win-tbb32>Tor Browser Bundle</define-tag>
14 14
 <define-tag button-win-tbb64>Currently Unused</define-tag>
15 15
 <define-tag button-osx-tbb32>Tor Browser Bundle</define-tag>
16
-#<!-- Commented out until further notice. -EC <define-tag button-osx-tbb64>Mac 64-bit</define-tag> -->
17 16
 <define-tag button-lin-tbb32>Tor Browser Bundle</define-tag>
18 17
 <define-tag button-lin-tbb64>GNU/Linux 64-bit</define-tag>
19 18
 
... ...
@@ -72,30 +71,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
72 71
 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
73 72
 	  </div>
74 73
 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p>
75
-	</div>
76
-      </div>
77
-<!-- START MAC 64 -->
78
-<!-- Comment out MAC 64 until it exists. -EC
79
-      <div class="easy mac">
80
-	<div class="package" style="padding-top: 13px; border-top: 0px;">
81
-	  <form class="downloads">
82
-	    <a class="button osx-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>
83
-	    <select name="language" id="osx-tbb64" class="lang">
84
-#include <lang.wmi>
85
-	    </select>
86
-	    <div class="sig" style="margin-bottom: 5px;">
87
-	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
88
-	      (<a class="osx-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
89
-	    </div>
90
-	  </form>
91
-	  <div class="desc">
92
-	    <h2>Tor Browser Bundle for 64-Bit Mac</h2>
93
-	    <em>Version <version-torbrowserbundleosx64> - OS X (64-Bit) (10.6+)</em>
94
-	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
95
-	  </div>
96
-	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p>
97
-	</div>
74
+        </div>
98 75
       </div>
99 76
 <!-- START LINUX -->
100 77
       <div id="linux" class="easy linux">
Browse code

update the website for the big TBB 3.x release!

Erinn Clark authored on19/12/2013 01:10:44
Showing1 changed files
... ...
@@ -13,7 +13,7 @@
13 13
 <define-tag button-win-tbb32>Tor Browser Bundle</define-tag>
14 14
 <define-tag button-win-tbb64>Currently Unused</define-tag>
15 15
 <define-tag button-osx-tbb32>Tor Browser Bundle</define-tag>
16
-<define-tag button-osx-tbb64>Mac 64-bit</define-tag>
16
+#<!-- Commented out until further notice. -EC <define-tag button-osx-tbb64>Mac 64-bit</define-tag> -->
17 17
 <define-tag button-lin-tbb32>Tor Browser Bundle</define-tag>
18 18
 <define-tag button-lin-tbb64>GNU/Linux 64-bit</define-tag>
19 19
 
... ...
@@ -36,13 +36,13 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
36 36
       <div id="windows" class="easy windows">
37 37
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
38 38
 	  <form class="downloads">
39
-	    <a class="button win-tbb" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>
39
+	    <a class="button win-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>
40 40
 	    <select name="language" id="win-tbb" class="lang">
41 41
 #include <lang.wmi>
42 42
 	    </select>
43 43
 	    <div class="sig" style="margin-bottom: 5px;">
44 44
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a>
45
-	      (<a class="win-tbb-sig" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
45
+	      (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
46 46
 	    </div>
47 47
 	  </form>
48 48
 	  <div class="desc">
... ...
@@ -57,13 +57,13 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
57 57
       <div id="mac" class="easy mac">
58 58
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
59 59
 	  <form class="downloads">
60
-	    <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
60
+	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>
61 61
 	    <select name="language" id="osx-tbb" class="lang">
62 62
 #include <lang.wmi>
63 63
 	    </select>
64 64
 	    <div class="sig" style="margin-bottom: 5px;">
65 65
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
66
-	      (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
66
+	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
67 67
 	    </div>
68 68
 	  </form>
69 69
 	  <div class="desc">
... ...
@@ -74,17 +74,18 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
74 74
 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p>
75 75
 	</div>
76 76
       </div>
77
-<!-- START MAC 64-->
77
+<!-- START MAC 64 -->
78
+<!-- Comment out MAC 64 until it exists. -EC
78 79
       <div class="easy mac">
79 80
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
80 81
 	  <form class="downloads">
81
-	    <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>
82
+	    <a class="button osx-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>
82 83
 	    <select name="language" id="osx-tbb64" class="lang">
83 84
 #include <lang.wmi>
84 85
 	    </select>
85 86
 	    <div class="sig" style="margin-bottom: 5px;">
86 87
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
87
-	      (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
88
+	      (<a class="osx-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
88 89
 	    </div>
89 90
 	  </form>
90 91
 	  <div class="desc">
... ...
@@ -92,6 +93,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
92 93
 	    <em>Version <version-torbrowserbundleosx64> - OS X (64-Bit) (10.6+)</em>
93 94
 	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
94 95
 	  </div>
96
+-->
95 97
 	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p>
96 98
 	</div>
97 99
       </div>
... ...
@@ -99,13 +101,13 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
99 101
       <div id="linux" class="easy linux">
100 102
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
101 103
 	  <form class="downloads">
102
-	    <a class="button lin-tbb32" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>
104
+	    <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>
103 105
 	    <select name="language" id="lin-tbb32" class="lang">
104 106
 #include <lang.wmi>
105 107
 	    </select>
106 108
 	    <div class="sig" style="margin-bottom: 5px;">
107 109
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
108
-	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
110
+	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
109 111
 	    </div>
110 112
 	  </form>
111 113
 	  <div class="desc">
... ...
@@ -120,13 +122,13 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
120 122
       <div class="easy linux">
121 123
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
122 124
 	  <form class="downloads">
123
-	    <a class="button lin-tbb64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
125
+	    <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
124 126
 	    <sel