Browse code

Remove old osx32 variables and comments

Nicolas Vigier authored on 16/11/2017 12:34:53
Showing 1 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
 #<!-- Comment out until it's available again. -EC <define-tag button-osx-tbb64>64-bit</define-tag> -->
17 17
 <define-tag button-lin-tbb32>Tor Browser (32-Bit)</define-tag>
18 18
 <define-tag button-lin-tbb64>Tor Browser (64-Bit)</define-tag>
... ...
@@ -81,7 +81,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
81 81
 #<!-- NOTE - change language enabled button text at the top of this page -->
82 82
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
83 83
 	  <form class="downloads">
84
-	    <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>
84
+	    <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>
85 85
 	    <select name="language" id="osx-tbb" class="lang">
86 86
 #include <lang.wmi>
87 87
 	    </select>
... ...
@@ -90,20 +90,6 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
90 90
 	      (<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>
91 91
 	    </div>
92 92
 	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />
93
-# Comment out until 64-bit Mac OS X bundles are available again
94
-#	    <a class="button osx-tbb64" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>
95
-#	    <select name="language" id="osx-tbb64" class="lang">
96
-
97
-# NO #include <lang.wmi>
98
-#	    </select>
99
-#	    <div class="sig">
100
-#	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
101
-#<!-- Mac OS X 64. -EC
102
-#	      (<a class="osx-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
103
-#	    </div>
104
-#	    <a href="<page projects/torbrowser-details>#build">Source Code</a><br />
105
-#	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundleosx32alpha>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundleosx32alpha>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)
106
-
107 93
 	  </form>
108 94
 
109 95
 	  <h2>Tor Browser</h2>
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 on 27/07/2017 20:11:17
Showing 1 changed files
... ...
@@ -41,16 +41,16 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
41 41
 #<!-- NOTE - change language enabled button text at the top of this page -->
42 42
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
43 43
 	  <form class="downloads">
44
-	    <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>
44
+	    <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>
45 45
 	    <select name="language" id="win-tbb" class="lang">
46 46
 #include <lang.wmi>
47 47
 	    </select>
48 48
 	    <div class="sig">
49 49
 	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
50
-	      (<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>
50
+	      (<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>
51 51
 	    </div>
52 52
 	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />
53
-<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">sig</a>)-->
53
+<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundlealpha>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundlealpha>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">sig</a>)-->
54 54
 	  </form>
55 55
 
56 56
 	  <h2>Tor Browser</h2>
... ...
@@ -81,17 +81,17 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
81 81
 #<!-- NOTE - change language enabled button text at the top of this page -->
82 82
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
83 83
 	  <form class="downloads">
84
-	    <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>
84
+	    <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>
85 85
 	    <select name="language" id="osx-tbb" class="lang">
86 86
 #include <lang.wmi>
87 87
 	    </select>
88 88
 	    <div class="sig">
89 89
 	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
90
-	      (<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>
90
+	      (<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>
91 91
 	    </div>
92 92
 	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />
93 93
 # Comment out until 64-bit Mac OS X bundles are available again
94
-#	    <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>
94
+#	    <a class="button osx-tbb64" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>
95 95
 #	    <select name="language" id="osx-tbb64" class="lang">
96 96
 
97 97
 # NO #include <lang.wmi>
... ...
@@ -99,10 +99,10 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
99 99
 #	    <div class="sig">
100 100
 #	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
101 101
 #<!-- Mac OS X 64. -EC
102
-#	      (<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>
102
+#	      (<a class="osx-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
103 103
 #	    </div>
104 104
 #	    <a href="<page projects/torbrowser-details>#build">Source Code</a><br />
105
-#	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)
105
+#	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundleosx32alpha>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundleosx32alpha>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)
106 106
 
107 107
 	  </form>
108 108
 
... ...
@@ -121,26 +121,26 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
121 121
 #<!-- NOTE - change language enabled button text at the top of this page -->
122 122
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
123 123
 	  <form class="downloads">
124
-	    <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
+	    <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>
125 125
 	    <select name="language" id="lin-tbb64" class="lang">
126 126
 #include <lang.wmi>
127 127
 	    </select>
128 128
 	    <div class="sig">
129 129
 	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
130
-	      (<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>
130
+	      (<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>
131 131
 	    </div>
132 132
 	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />
133
-<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)-->
133
+<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundlelinux64alpha>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundlelinux64alpha>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)-->
134 134
 
135
-	    <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>
135
+	    <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>
136 136
 	    <select name="language" id="lin-tbb32" class="lang">
137 137
 #include <lang.wmi>
138 138
 	    </select>
139 139
 	    <div class="sig">
140 140
 	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
141
-	      (<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>
141
+	      (<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>
142 142
 	    </div>
143
-<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)<p>-->
143
+<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundlelinux32alpha>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundlelinux32alpha>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)<p>-->
144 144
 
145 145
 	  </form>
146 146
 
Browse code

Bug 20734: Fix links and redirects for new donation site

Arthur Edelstein authored on 22/11/2016 07:02:06
Showing 1 changed files
... ...
@@ -356,71 +356,7 @@ Code</a></li>
356 356
 </div>
357 357
 </div>
358 358
 <!-- START DONATION WIDGET -->
359
-  <script async type="text/javascript">
360
-  function displayVals() {
361
-    var t3 = $("#t3").val();
362
-    var amount = $("#amount").val();
363
-    if(t3 != 0){
364
-      $('#a3').val(amount);
365
-      $('#p3').val(1);
366
-      $('#cmd').val('_xclick-subscriptions');
367
-      $('#item_name').val('Tor Project Membership');
368
-      $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>');
369
-    }else{
370
-      $('#a3').val(0);
371
-      $('#p3').val(0);
372
-      $('#cmd').val('_donations');
373
-      $('#item_name').val('Donation to the Tor Project');
374
-      $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
375
-    }
376
-    if( !t3 ) {
377
-      $('#cmd').val('_donations');
378
-      $('#item_name').val('Donation to the Tor Project');
379
-      $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
380
-    }
381
-  }
382
-  $(function(){
383
-    $("#amount").change(displayVals);
384
-    $("#t3").change(displayVals);
385
-    displayVals();
386
-  });
387
-  </script>
388
-<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post" style="float:left; margin-bottom:10px;">
389
-    <h2>Donate to Tor</h2>
390
-      <p>
391
-	<select name="currency_code" class="cur">
392
-	  <option value="USD" selected="selected">$</option>
393
-	  <option value="EUR">&euro;</option>
394
-	  <option value="GBP">&pound;</option>
395
-	  <option value="YEN">&yen;</option>
396
-	</select>
397
-	<input type="text" id="amount" class="amount" name="amount" value="5" size="10">
398
-      </p>
399
-      <p>
400
-	<input type="hidden" id="a3" name="a3" value="0">
401
-	  <select id="t3" name="t3">
402
-	    <option value="0">One-time Donation</option>
403
-	    <option value="M">Monthly Subscription</option>
404
-	  </select>
405
-      </p>
406
-      <p>
407
-	<input type="hidden" id="p3" name="p3" value="1">
408
-	<input type="hidden" name="sra" value="1">
409
-	<input type="hidden" name="src" value="1">
410
-	<input type="hidden" name="no_shipping" value="1">
411
-	<input type="hidden" name="no_note" value="1">
412
-	<input type="hidden" id="cmd" name="cmd" value="_donations">
413
-	<input type="hidden" name="business" value="donations@torproject.org">
414
-	<input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project">
415
-	<input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou.html">
416
-	<input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download.html">
417
-      </p>
418
-      <h6 id="ppinfo" style="height:0px;"></h6>
419
-      <p>
420
-	<input class="donate-btn" type="submit" name="donate" value="Donate">
421
-      </p>
422
-      <p><a href="<page donate/donate>">Other donation options...</a></p>
423
-</form>
359
+<a href="<page donate/donate-download>"><img src="../images/btn_donateCC_LG.gif"></a>
424 360
 <!-- END DONATION WIDGET -->
425 361
 <!-- START INFO -->
426 362
 <div class="img-shadow">
Browse code

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

Arthur Edelstein authored on 25/10/2016 22:33:02
Showing 1 changed files
... ...
@@ -215,7 +215,7 @@ custom configurations. All an apt-get or yum install away.</p>
215 215
 you are used to.</p>
216 216
 
217 217
 <ol>
218
-<li><b>Use the Tor Browser</b>
218
+<li><b>Use Tor Browser</b>
219 219
 
220 220
 <p>
221 221
 
... ...
@@ -224,7 +224,7 @@ run it. Tor only protects your applications that are properly configured to
224 224
 send their Internet traffic through Tor. To avoid problems with Tor
225 225
 configuration, we strongly recommend you use the
226 226
 <a href="<page projects/torbrowser>">Tor Browser</a>. It is pre-configured to protect
227
-your privacy and anonymity on the web as long as you're browsing with the Tor
227
+your privacy and anonymity on the web as long as you're browsing with Tor
228 228
 Browser itself. Almost any other web browser configuration is likely to be
229 229
 unsafe to use with Tor.
230 230
 
... ...
@@ -249,10 +249,10 @@ traffic</a> this way, you also slow down the entire Tor network for everyone els
249 249
 
250 250
 <p>
251 251
 
252
-The Tor Browser will block browser plugins such as Flash, RealPlayer,
252
+Tor Browser will block browser plugins such as Flash, RealPlayer,
253 253
 Quicktime, and others: they can be manipulated into revealing your IP address.
254 254
 Similarly, we do not recommend installing additional addons or plugins into
255
-the Tor Browser, as these may bypass Tor or otherwise harm your anonymity and
255
+Tor Browser, as these may bypass Tor or otherwise harm your anonymity and
256 256
 privacy.
257 257
 
258 258
 </p>
... ...
@@ -267,7 +267,7 @@ Tor will encrypt your traffic
267 267
 <a href="<page about/overview>#thesolution">to and
268 268
 within the Tor network</a>, but the encryption of your traffic to the final
269 269
 destination website depends upon on that website. To help ensure private
270
-encryption to websites, the Tor Browser includes <a
270
+encryption to websites, Tor Browser includes <a
271 271
 href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> to force the
272 272
 use of HTTPS encryption with major websites that support it. However, you
273 273
 should still watch the browser URL bar to ensure that websites you provide
... ...
@@ -286,7 +286,7 @@ and HTTPS relate</a>.
286 286
 
287 287
 <p>
288 288
 
289
-The Tor Browser will warn you before automatically opening documents that are
289
+Tor Browser will warn you before automatically opening documents that are
290 290
 handled by external applications. <b>DO NOT IGNORE THIS WARNING</b>.  You
291 291
 should be very careful when downloading documents via Tor (especially DOC and
292 292
 PDF files, unless you use the PDF viewer that's built into Tor Browser) as
Browse code

Prefer 64bit on Linux

Sebastian Hahn authored on 17/08/2016 09:06:10
Showing 1 changed files
... ...
@@ -14,8 +14,8 @@
14 14
 <define-tag button-win-tbb64>Currently Unused</define-tag>
15 15
 <define-tag button-osx-tbb32>Tor Browser</define-tag>
16 16
 #<!-- Comment out until it's available again. -EC <define-tag button-osx-tbb64>64-bit</define-tag> -->
17
-<define-tag button-lin-tbb32>Tor Browser</define-tag>
18
-<define-tag button-lin-tbb64>64-bit</define-tag>
17
+<define-tag button-lin-tbb32>Tor Browser (32-Bit)</define-tag>
18
+<define-tag button-lin-tbb64>Tor Browser (64-Bit)</define-tag>
19 19
 
20 20
 #include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8"
21 21
 
... ...
@@ -121,26 +121,27 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
121 121
 #<!-- NOTE - change language enabled button text at the top of this page -->
122 122
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
123 123
 	  <form class="downloads">
124
-	    <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>
125
-	    <select name="language" id="lin-tbb32" class="lang">
124
+	    <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>
125
+	    <select name="language" id="lin-tbb64" class="lang">
126 126
 #include <lang.wmi>
127 127
 	    </select>
128 128
 	    <div class="sig">
129 129
 	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
130
-	      (<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>
130
+	      (<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>
131 131
 	    </div>
132
-<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)<p>-->
132
+	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />
133
+<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)-->
133 134
 
134
-	    <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>
135
-	    <select name="language" id="lin-tbb64" class="lang">
135
+	    <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>
136
+	    <select name="language" id="lin-tbb32" class="lang">
136 137
 #include <lang.wmi>
137 138
 	    </select>
138 139
 	    <div class="sig">
139 140
 	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
140
-	      (<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>
141
+	      (<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>
141 142
 	    </div>
142
-	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />
143
-<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)-->
143
+<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)<p>-->
144
+
144 145
 	  </form>
145 146
 
146 147
 	  <h2>Tor Browser</h2>
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 on 30/03/2016 09:32:11
Showing 1 changed files
... ...
@@ -114,7 +114,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
114 114
  <!-- END OS X -->
115 115
  <!-- START UNIX -->
116 116
       <div id="linux" class="accordionButton on">
117
-	<span class="linux24">GNU/Linux, BSD, and Unix</span></div>
117
+	<span class="linux24">Linux</span></div>
118 118
       <div class="accordionContent">
119 119
 	<div class="fauxhead"></div>
120 120
   <!-- TOR BROWSER BUNDLE -->
Browse code

mention that pdf.js is OK

Sebastian Hahn authored on 30/03/2016 00:35:57
Showing 1 changed files
... ...
@@ -288,10 +288,11 @@ and HTTPS relate</a>.
288 288
 The Tor Browser will warn you before automatically opening documents that are
289 289
 handled by external applications. <b>DO NOT IGNORE THIS WARNING</b>.  You
290 290
 should be very careful when downloading documents via Tor (especially DOC and
291
-PDF files) as these documents can contain Internet resources that will be
292
-downloaded outside of Tor by the application that opens them. This will reveal
293
-your non-Tor IP address. If you must work with DOC and/or PDF files, we
294
-strongly recommend either using a disconnected computer,
291
+PDF files, unless you use the PDF viewer that's built into Tor Browser) as
292
+these documents can contain Internet resources that will be downloaded outside
293
+of Tor by the application that opens them. This will reveal your non-Tor IP
294
+address. If you must work with DOC and/or PDF files, we strongly recommend
295
+either using a disconnected computer,
295 296
 downloading the free <a href="https://www.virtualbox.org/">VirtualBox</a> and
296 297
 using it with a <a href="http://virtualboxes.org/">virtual machine image</a>
297 298
 with networking disabled, or using <a href="https://tails.boum.org/">Tails</a>.
Browse code

Implement #8968

Sebastian Hahn authored on 27/02/2016 10:21:33
Showing 1 changed files
... ...
@@ -54,7 +54,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
54 54
 	  </form>
55 55
 
56 56
 	  <h2>Tor Browser</h2>
57
-	  <em>Version <version-torbrowserbundle> - Windows 10, 8, 7, Vista, and XP</em>
57
+	  <em>Version <version-torbrowserbundle> (<releasedate-torbrowserbundle>) - Windows 10, 8, 7, Vista, and XP</em>
58 58
 	  <p>Everything you need to safely browse the Internet. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
59 59
 	</div>
60 60
 <!-- EXPERT BUNDLE -->
... ...
@@ -107,7 +107,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
107 107
 	  </form>
108 108
 
109 109
 	  <h2>Tor Browser</h2>
110
-	  <em>Version <version-torbrowserbundleosx64> - OS X Intel</em>
110
+	  <em>Version <version-torbrowserbundleosx64> (<releasedate-torbrowserbundleosx64>)- OS X Intel</em>
111 111
 	  <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>
112 112
 	</div>
113 113
   </div>
... ...
@@ -144,7 +144,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
144 144
 	  </form>
145 145
 
146 146
 	  <h2>Tor Browser</h2>
147
-	  <em>Version <version-torbrowserbundlelinux32> - Linux, BSD, and Unix</em>
147
+	  <em>Version <version-torbrowserbundlelinux32> (<releasedate-torbrowserbundlelinux32>) - Linux, BSD, and Unix</em>
148 148
 	  <p>Everything you need to safely browse the Internet. This
149 149
 package requires no installation. Just extract it and run. <a
150 150
 href="<page projects/torbrowser>">Learn more &raquo;</a></p>
Browse code

Remove N900 instructions

Implements #16605. I think N900s are pretty rare now, and instructions
for 0.2.1.x aren't really that useful anymore anyway.

Sebastian Hahn authored on 05/02/2016 21:46:03
Showing 1 changed files
... ...
@@ -176,14 +176,6 @@ custom configurations. All an apt-get or yum install away.</p>
176 176
 	  <h2>Android Bundle</h2>
177 177
 	  <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>
178 178
 	</div>
179
-<!-- Nokia -->
180
-	<div class="package" style="border-bottom: 0px;">
181
-	  <div class="downloads">
182
-	    <a class="additional" style="font-weight: bold;" href="<page docs/N900>">Experimental Instructions</a>
183
-	  </div>
184
-
185
-	  <h2>Nokia Maemo/N900</h2>
186
-	</div>
187 179
       </div>
188 180
 <!-- END SMARTPHONES -->
189 181
 <!-- BEGIN SOURCE -->
Browse code

Bug 17445: State Windows 10 support explicitly

Georg Koppen authored on 03/11/2015 11:56:42 • Sebastian Hahn committed on 03/11/2015 12:51:14
Showing 1 changed files
... ...
@@ -54,7 +54,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
54 54
 	  </form>
55 55
 
56 56
 	  <h2>Tor Browser</h2>
57
-	  <em>Version <version-torbrowserbundle> - Windows 8, 7, Vista, and XP</em>
57
+	  <em>Version <version-torbrowserbundle> - Windows 10, 8, 7, Vista, and XP</em>
58 58
 	  <p>Everything you need to safely browse the Internet. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
59 59
 	</div>
60 60
 <!-- EXPERT BUNDLE -->
... ...
@@ -67,7 +67,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
67 67
 	  </div>
68 68
 
69 69
 	  <h2>Expert Bundle</h2>
70
-	  <em>Windows 8, 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE</em>
70
+	  <em>Windows 10, 8, 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE</em>
71 71
 	  <p>Contains just Tor and nothing else. You'll need to configure Tor and all of your applications manually. This installer must be run as Administrator.</p>
72 72
 	</div>
73 73
       </div>
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 on 28/04/2015 12:53:42
Showing 1 changed files
... ...
@@ -81,13 +81,13 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
81 81
 #<!-- NOTE - change language enabled button text at the top of this page -->
82 82
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
83 83
 	  <form class="downloads">
84
-	    <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>
84
+	    <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>
85 85
 	    <select name="language" id="osx-tbb" class="lang">
86 86
 #include <lang.wmi>
87 87
 	    </select>
88 88
 	    <div class="sig">
89 89
 	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
90
-	      (<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>
90
+	      (<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>
91 91
 	    </div>
92 92
 	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />
93 93
 # Comment out until 64-bit Mac OS X bundles are available again
... ...
@@ -107,7 +107,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
107 107
 	  </form>
108 108
 
109 109
 	  <h2>Tor Browser</h2>
110
-	  <em>Version <version-torbrowserbundleosx32> - OS X Intel</em>
110
+	  <em>Version <version-torbrowserbundleosx64> - OS X Intel</em>
111 111
 	  <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>
112 112
 	</div>
113 113
   </div>
Browse code

People like spelling it OS X

Sebastian Hahn authored on 11/02/2015 12:41:26
Showing 1 changed files
... ...
@@ -90,7 +90,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
90 90
 	      (<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>
91 91
 	    </div>
92 92
 	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />
93
-# Comment out until 64-bit OSX bundles are available again
93
+# Comment out until 64-bit Mac OS X bundles are available again
94 94
 #	    <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>
95 95
 #	    <select name="language" id="osx-tbb64" class="lang">
96 96
 
... ...
@@ -98,7 +98,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
98 98
 #	    </select>
99 99
 #	    <div class="sig">
100 100
 #	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
101
-#<!-- OSX 64. -EC
101
+#<!-- Mac OS X 64. -EC
102 102
 #	      (<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>
103 103
 #	    </div>
104 104
 #	    <a href="<page projects/torbrowser-details>#build">Source Code</a><br />
Browse code

Remove vidalia-related docs and downloads

The downloads are horribly outdated, the docs are confusing and long.
Without a proper Vidalia maintainer and someone making packages, this
has no future.

Sebastian Hahn authored on 08/02/2015 17:55:35
Showing 1 changed files
... ...
@@ -57,45 +57,6 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
57 57
 	  <em>Version <version-torbrowserbundle> - Windows 8, 7, Vista, and XP</em>
58 58
 	  <p>Everything you need to safely browse the Internet. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
59 59
 	</div>
60
-<!-- VIDALIA BRIDGE BUNDLE -->
61
-	<div class="package">
62
-	  <div class="downloads">
63
-	    <a class="button" href="<package-win32-bridge-bundle-stable>"><span class="strong">Download</span><span class="normal">Vidalia Bridge Bundle </span></a>
64
-	    <div class="sig">
65
-	      (<a href="<package-win32-bridge-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
66
-	    </div>
67
-	  </div>
68
-
69
-	  <h2>Vidalia Bridge Bundle</h2>
70
-	  <em>Windows 8, 7, Vista, and XP</em>
71
-	  <p>A Vidalia Bundle which is configured to be a <a href="<page docs/bridges>">bridge</a> by default. This helps censored users reach the Tor network.</p>
72
-	</div>
73
-<!-- VIDALIA RELAY BUNDLE -->
74
-	<div class="package">
75
-	  <div class="downloads">
76
-	    <a class="button" href="<package-win32-relay-bundle-stable>"><span class="strong">Download</span><span class="normal">Vidalia Relay Bundle </span></a>
77
-	    <div class="sig">
78
-	      (<a href="<package-win32-relay-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
79
-	    </div>
80
-	  </div>
81
-
82
-	  <h2>Vidalia Relay Bundle</h2>
83
-	  <em>Windows 8, 7, Vista, and XP</em>
84
-	  <p>A Vidalia Bundle which is configured to be a non-exit <a href="<page docs/tor-doc-relay>">relay</a> by default. This helps grow the Tor network.</p>
85
-	</div>
86
-<!-- VIDALIA EXIT BUNDLE -->
87
-	<div class="package">
88
-	  <div class="downloads">
89
-	    <a class="button" href="<package-win32-exit-bundle-stable>"><span class="strong">Download</span><span class="normal">Vidalia Exit Bundle</span></a>
90
-	    <div class="sig">
91
-	      (<a href="<package-win32-exit-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
92
-	    </div>
93
-	  </div>
94
-
95
-	  <h2>Vidalia Exit Bundle</h2>
96
-	  <em>Windows 8, 7, Vista, and XP</em>
97
-	  <p>A Vidalia Bundle which is configured to be an <a href="<page docs/tor-doc-relay>">exit relay</a> by default. <strong>Please read these <a href="https://blog.torproject.org/running-exit-node">tips for running an exit node with minimal harassment</a> before you get started!</strong></p>
98
-	</div>
99 60
 <!-- EXPERT BUNDLE -->
100 61
 	<div class="package">
101 62
 	  <div class="downloads">
Browse code

youtube no longer breaks when used without flash

Sebastian Hahn authored on 11/01/2015 20:40:18
Showing 1 changed files
... ...
@@ -299,10 +299,7 @@ The Tor Browser will block browser plugins such as Flash, RealPlayer,
299 299
 Quicktime, and others: they can be manipulated into revealing your IP address.
300 300
 Similarly, we do not recommend installing additional addons or plugins into
301 301
 the Tor Browser, as these may bypass Tor or otherwise harm your anonymity and
302
-privacy. The lack of plugins means that Youtube videos are blocked by default,
303
-but Youtube does provide an experimental opt-in feature
304
-<a href="https://www.youtube.com/html5">(enable it here)</a> that works for some
305
-videos.
302
+privacy.
306 303
 
307 304
 </p>
308 305
 
Browse code

linking to git from tags works again.

Matt Pagan authored on 12/12/2014 08:29:59 • Sebastian Hahn committed on 12/12/2014 08:38:55
Showing 1 changed files
... ...
@@ -244,7 +244,7 @@ custom configurations. All an apt-get or yum install away.</p>
244 244
 
245 245
 	  <h2>Source Tarball</h2>
246 246
 	  <p> Configure with: <code style="color: #666666;">./configure &amp;&amp; make &amp;&amp; src/or/tor</code></p>
247
-	  <p>The current stable version of Tor is <version-stable>. Its <a href="<gitblobstable>ReleaseNotes">release notes</a> are available.</p>
247
+	  <p>The current stable version of Tor is <version-stable>. Its <a href="<gitblob>ReleaseNotes<cgitstable>">release notes</a> are available.</p>
248 248
 	  <p>The current unstable/alpha version of Tor is <version-alpha>. Its <a href="<gitblob>ChangeLog">Changelog</a> is available.</p>
249 249
 	</div>
250 250
       </div>
Browse code

Fixed GooglePlay Orbot link

Colin authored on 20/10/2014 01:00:31
Showing 1 changed files
... ...
@@ -213,7 +213,7 @@ custom configurations. All an apt-get or yum install away.</p>
213 213
 	  </div>
214 214
 
215 215
 	  <h2>Android Bundle</h2>
216
-	  <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://market.android.com/search?q=guardianproject&so=1&c=apps">Google Play Store</a>.</p>
216
+	  <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>
217 217
 	</div>
218 218
 <!-- Nokia -->
219 219
 	<div class="package" style="border-bottom: 0px;">
Browse code

Fix download link anchors.

David Fifield authored on 19/10/2014 07:23:54
Showing 1 changed files
... ...
@@ -46,7 +46,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
46 46
 #include <lang.wmi>
47 47
 	    </select>
48 48
 	    <div class="sig">
49
-	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a>
49
+	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
50 50
 	      (<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>
51 51
 	    </div>
52 52
 	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />
... ...
@@ -125,7 +125,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
125 125
 #include <lang.wmi>
126 126
 	    </select>
127 127
 	    <div class="sig">
128
-	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
128
+	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
129 129
 	      (<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>
130 130
 	    </div>
131 131
 	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />
... ...
@@ -136,7 +136,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
136 136
 # NO #include <lang.wmi>
137 137
 #	    </select>
138 138
 #	    <div class="sig">
139
-#	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
139
+#	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
140 140
 #<!-- OSX 64. -EC
141 141
 #	      (<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>
142 142
 #	    </div>
... ...
@@ -165,7 +165,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
165 165
 #include <lang.wmi>
166 166
 	    </select>
167 167
 	    <div class="sig">
168
-	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
168
+	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
169 169
 	      (<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>
170 170
 	    </div>
171 171
 <!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)<p>-->
... ...
@@ -175,7 +175,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
175 175
 #include <lang.wmi>
176 176
 	    </select>
177 177
 	    <div class="sig">
178
-	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
178
+	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
179 179
 	      (<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>
180 180
 	    </div>
181 181
 	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />
Browse code

fix broken anchor

Roger Dingledine authored on 16/10/2014 07:05:52
Showing 1 changed files
... ...
@@ -49,7 +49,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
49 49
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a>
50 50
 	      (<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>
51 51
 	    </div>
52
-	    <a class="additional" href="<page projects/torbrowser>#downloads-beta">Download Unstable</a><br />
52
+	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />
53 53
 <!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">sig</a>)-->
54 54
 	  </form>
55 55
 
... ...
@@ -128,7 +128,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
128 128
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
129 129
 	      (<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>
130 130
 	    </div>
131
-	    <a class="additional" href="<page projects/torbrowser>#downloads-beta">Download Unstable</a><br />
131
+	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />
132 132
 # Comment out until 64-bit OSX bundles are available again
133 133
 #	    <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>
134 134
 #	    <select name="language" id="osx-tbb64" class="lang">
... ...
@@ -178,7 +178,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
178 178
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
179 179
 	      (<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>
180 180
 	    </div>
181
-	    <a class="additional" href="<page projects/torbrowser>#downloads-beta">Download Unstable</a><br />
181
+	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />
182 182
 <!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)-->
183 183
 	  </form>
184 184
 
Browse code

Windows installer must be run as Administrator.

Matt Pagan authored on 14/07/2014 12:42:40
Showing 1 changed files
... ...
@@ -107,7 +107,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
107 107
 
108 108
 	  <h2>Expert Bundle</h2>
109 109
 	  <em>Windows 8, 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE</em>
110
-	  <p>Contains just Tor and nothing else. You'll need to configure Tor and all of your applications manually.</p>
110
+	  <p>Contains just Tor and nothing else. You'll need to configure Tor and all of your applications manually. This installer must be run as Administrator.</p>
111 111
 	</div>
112 112
       </div>
113 113
 <!-- END WINDOWS -->
Browse code

Changed non-tag "Tor Browser Bundle"s to "Tor Browser"s.

Matt Pagan authored on 08/07/2014 04:24:40
Showing 1 changed files
... ...
@@ -10,11 +10,11 @@
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>
15
+<define-tag button-osx-tbb32>Tor Browser</define-tag>
16 16
 #<!-- Comment out until it's available again. -EC <define-tag button-osx-tbb64>64-bit</define-tag> -->
17
-<define-tag button-lin-tbb32>Tor Browser Bundle</define-tag>
17
+<define-tag button-lin-tbb32>Tor Browser</define-tag>
18 18
 <define-tag button-lin-tbb64>64-bit</define-tag>
19 19
 
20 20
 #include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8"
... ...
@@ -53,7 +53,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
53 53
 <!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">sig</a>)-->
54 54
 	  </form>
55 55
 
56
-	  <h2>Tor Browser Bundle</h2>
56
+	  <h2>Tor Browser</h2>
57 57
 	  <em>Version <version-torbrowserbundle> - Windows 8, 7, Vista, and XP</em>
58 58
 	  <p>Everything you need to safely browse the Internet. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
59 59
 	</div>
... ...
@@ -145,7 +145,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
145 145
 
146 146
 	  </form>
147 147
 
148
-	  <h2>Tor Browser Bundle</h2>
148
+	  <h2>Tor Browser</h2>
149 149
 	  <em>Version <version-torbrowserbundleosx32> - OS X Intel</em>
150 150
 	  <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>
151 151
 	</div>
... ...
@@ -182,7 +182,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
182 182
 <!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)-->
183 183
 	  </form>
184 184
 
185
-	  <h2>Tor Browser Bundle</h2>
185
+	  <h2>Tor Browser</h2>
186 186
 	  <em>Version <version-torbrowserbundlelinux32> - Linux, BSD, and Unix</em>
187 187
 	  <p>Everything you need to safely browse the Internet. This
188 188
 package requires no installation. Just extract it and run. <a
... ...
@@ -269,7 +269,7 @@ Tor does not protect all of your computer's Internet traffic when you
269 269
 run it. Tor only protects your applications that are properly configured to
270 270
 send their Internet traffic through Tor. To avoid problems with Tor
271 271
 configuration, we strongly recommend you use the
272
-<a href="<page projects/torbrowser>">Tor Browser Bundle</a>. It is pre-configured to protect
272
+<a href="<page projects/torbrowser>">Tor Browser</a>. It is pre-configured to protect
273 273
 your privacy and anonymity on the web as long as you're browsing with the Tor
274 274
 Browser itself. Almost any other web browser configuration is likely to be
275 275
 unsafe to use with Tor.
... ...
@@ -316,7 +316,7 @@ Tor will encrypt your traffic
316 316
 <a href="<page about/overview>#thesolution">to and
317 317
 within the Tor network</a>, but the encryption of your traffic to the final
318 318
 destination website depends upon on that website. To help ensure private
319
-encryption to websites, the Tor Browser Bundle includes <a
319
+encryption to websites, the Tor Browser includes <a
320 320
 href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> to force the
321 321
 use of HTTPS encryption with major websites that support it. However, you
322 322
 should still watch the browser URL bar to ensure that websites you provide
Browse code

Vidalia bundles no longer come in "unstable" flavor.

Matt Pagan authored on 08/07/2014 03:59:34
Showing 1 changed files
... ...
@@ -64,7 +64,6 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
64 64
 	    <div class="sig">
65 65
 	      (<a href="<package-win32-bridge-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
66 66
 	    </div>
67
-            <a class="additional" href="<package-win32-bridge-bundle-alpha>">Download Unstable</a> (<a href="<package-win32-bridge-bundle-alpha>.asc">sig</a>)
68 67
 	  </div>
69 68
 
70 69
 	  <h2>Vidalia Bridge Bundle</h2>
... ...
@@ -78,7 +77,6 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
78 77
 	    <div class="sig">
79 78
 	      (<a href="<package-win32-relay-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
80 79
 	    </div>
81
-            <a class="additional" href="<package-win32-relay-bundle-alpha>">Download Unstable</a> (<a href="<package-win32-relay-bundle-alpha>.asc">sig</a>)
82 80
 	  </div>
83 81
 
84 82
 	  <h2>Vidalia Relay Bundle</h2>
... ...
@@ -92,7 +90,6 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
92 90
 	    <div class="sig">
93 91
 	      (<a href="<package-win32-exit-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
94 92
 	    </div>
95
-            <a class="additional" href="<package-win32-exit-bundle-alpha>">Download Unstable</a> (<a href="<package-win32-exit-bundle-alpha>.asc">sig</a>)
96 93
 	  </div>
97 94
 
98 95
 	  <h2>Vidalia Exit Bundle</h2>
... ...
@@ -106,7 +103,6 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
106 103
 	    <div class="sig">
107 104
 	      (<a href="<package-win32-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
108 105
 	    </div>
109
-	    <a class="additional" href="<package-win32-alpha>">Download Unstable</a> (<a href="<package-win32-alpha>.asc">sig</a>)
110 106
 	  </div>
111 107
 
112 108
 	  <h2>Expert Bundle</h2>
Browse code

fix the filename for the new osx tbb's

Roger Dingledine authored on 30/04/2014 02:30:41
Showing 1 changed files
... ...
@@ -124,13 +124,13 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
124 124
 #<!-- NOTE - change language enabled button text at the top of this page -->
125 125
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
126 126
 	  <form class="downloads">
127
-	    <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>
127
+	    <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>
128 128
 	    <select name="language" id="osx-tbb" class="lang">
129 129
 #include <lang.wmi>
130 130
 	    </select>
131 131
 	    <div class="sig">
132 132
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
133
-	      (<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>
133
+	      (<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>
134 134
 	    </div>
135 135
 	    <a class="additional" href="<page projects/torbrowser>#downloads-beta">Download Unstable</a><br />
136 136
 # Comment out until 64-bit OSX bundles are available again
Browse code

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

Roger Dingledine authored on 24/03/2014 08:05:46
Showing 1 changed files
... ...
@@ -317,7 +317,7 @@ videos.
317 317
 <p>
318 318
 
319 319
 Tor will encrypt your traffic
320
-<a href="<page overview>#thesolution">to and
320
+<a href="<page about/overview>#thesolution">to and
321 321
 within the Tor network</a>, but the encryption of your traffic to the final
322 322
 destination website depends upon on that website. To help ensure private
323 323
 encryption to websites, the Tor Browser Bundle includes <a
Browse code

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

Roger Dingledine authored on 24/03/2014 07:54:56
Showing 1 changed files
... ...
@@ -317,7 +317,7 @@ videos.
317 317
 <p>
318 318
 
319 319
 Tor will encrypt your traffic
320
-<a href="https://www.torproject.org/about/overview.html.en#thesolution">to and
320
+<a href="<page overview>#thesolution">to and
321 321
 within the Tor network</a>, but the encryption of your traffic to the final
322 322
 destination website depends upon on that website. To help ensure private
323 323
 encryption to websites, the Tor Browser Bundle includes <a
Browse code

Link to the TBB beta table too.

Also remove the links that alleged to point to the TBB source code,
since they were lies anyway. :(

Roger Dingledine authored on 19/03/2014 07:30:41
Showing 1 changed files
... ...
@@ -49,7 +49,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
49 49
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a>
50 50
 	      (<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>
51 51
 	    </div>
52
-	    <a class="additional" href="<page projects/torbrowser-details>#build">Source Code</a><br />
52
+	    <a class="additional" href="<page projects/torbrowser>#downloads-beta">Download Unstable</a><br />
53 53
 <!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">sig</a>)-->
54 54
 	  </form>
55 55
 
... ...
@@ -132,6 +132,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
132 132
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
133 133
 	      (<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>
134 134
 	    </div>
135
+	    <a class="additional" href="<page projects/torbrowser>#downloads-beta">Download Unstable</a><br />
135 136
 # Comment out until 64-bit OSX bundles are available again
136 137
 #	    <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>
137 138
 #	    <select name="language" id="osx-tbb64" class="lang">
... ...
@@ -181,7 +182,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
181 182
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a>
182 183
 	      (<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>
183 184
 	    </div>
184
-	    <a class="additional" href="<page projects/torbrowser-details>#build">Source Code</a><br />
185
+	    <a class="additional" href="<page projects/torbrowser>#downloads-beta">Download Unstable</a><br />
185 186
 <!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)-->
186 187
 	  </form>
187 188
 
Browse code

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

Matt Pagan authored on 14/03/2014 16:53:45
Showing 1 changed files
... ...
@@ -55,7 +55,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
55 55
 
56 56
 	  <h2>Tor Browser Bundle</h2>
57 57
 	  <em>Version <version-torbrowserbundle> - Windows 8, 7, Vista, and XP</em>
58
-	  <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>
58
+	  <p>Everything you need to safely browse the Internet. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
59 59
 	</div>
60 60
 <!-- VIDALIA BRIDGE BUNDLE -->
61 61
 	<div class="package">
Browse code

comment out more 64-bit osx stuff. I apologize to future people who have to edit my wml changes, especially if that future person is me.

Erinn Clark authored on 19/12/2013 06:18:39
Showing 1 changed files
... ...
@@ -132,19 +132,20 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
132 132
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
133 133
 	      (<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>
134 134
 	    </div>
135
-<!-- Comment out until 64-bit OSX bundles are available again
136
-	    <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>
137
-	    <select name="language" id="osx-tbb64" class="lang">
138
-#include <lang.wmi>
139
-<!-- OSX 64. -EC
140
-	    </select>
141
-	    <div class="sig">
142
-	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
143
-	      (<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>
144
-	    </div>
145
-	    <a href="<page projects/torbrowser-details>#build">Source Code</a><br />
146
-	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)-->
135
+# Comment out until 64-bit OSX bundles are available again
136
+#	    <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>
137
+#	    <select name="language" id="osx-tbb64" class="lang">
138
+
139
+# NO #include <lang.wmi>
140
+#	    </select>
141
+#	    <div class="sig">
142
+#	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
143
+#<!-- OSX 64. -EC
144
+#	      (<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>
145
+#	    </div>
146
+#	    <a href="<page projects/torbrowser-details>#build">Source Code</a><br />
147
+#	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)
148
+
147 149
 	  </form>
148 150
 
149 151
 	  <h2>Tor Browser Bundle</h2>
Browse code

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

Erinn Clark authored on 19/12/2013 01:10:44
Showing 1 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>64-bit</define-tag>
16
+#<!-- Comment out until it's available again. -EC <define-tag button-osx-tbb64>64-bit</define-tag> -->
17 17
 <define-tag button-lin-tbb32>Tor Browser Bundle</define-tag>
18 18
 <define-tag button-lin-tbb64>64-bit</define-tag>
19 19
 
... ...
@@ -41,16 +41,16 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
41 41
 #<!-- NOTE - change language enabled button text at the top of this page -->
42 42
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
43 43
 	  <form class="downloads">
44
-	    <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>
44
+	    <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>
45 45
 	    <select name="language" id="win-tbb" class="lang">
46 46
 #include <lang.wmi>
47 47
 	    </select>
48 48
 	    <div class="sig">
49 49
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a>
50
-	      (<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>
50
+	      (<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>
51 51
 	    </div>
52 52
 	    <a class="additional" href="<page projects/torbrowser-details>#build">Source Code</a><br />
53
-<!--	    <a class="additional" href="../dist/torbrowser/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">Download Unstable</a> (<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">sig</a>)-->
53
+<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">sig</a>)-->
54 54
 	  </form>
55 55
 
56 56
 	  <h2>Tor Browser Bundle</h2>
... ...
@@ -124,24 +124,27 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
124 124
 #<!-- NOTE - change language enabled button text at the top of this page -->
125 125
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
126 126
 	  <form class="downloads">
127
-	    <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>
127
+	    <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>
128 128
 	    <select name="language" id="osx-tbb" class="lang">
129 129
 #include <lang.wmi>
130 130
 	    </select>
131 131
 	    <div class="sig">
132 132
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
133
-	      (<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>
133
+	      (<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>
134 134
 	    </div>
135
-	    <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>
135
+<!-- Comment out until 64-bit OSX bundles are available again
136
+	    <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>
136 137
 	    <select name="language" id="osx-tbb64" class="lang">
138
+-->
137 139
 #include <lang.wmi>
140
+<!-- OSX 64. -EC
138 141
 	    </select>
139 142
 	    <div class="sig">
140 143
 	      <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a>
141
-	      (<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>
144
+	      (<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>
142 145
 	    </div>
143 146
 	    <a href="<page projects/torbrowser-details>#build">Source Code</a><br />
144
-<!--	    <a class="additional" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">Download Unstable</a> (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)-->
147
+	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)-->
145 148
 	  </form>
146 149
 
147 150
 	  <h2>Tor Browser Bundle</h2>
... ...
@@ -159,26 +162,26 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
159 162
 #<!-- NOTE - change language enabled button text at the top of this page -->
160 163
 	<div class="package" style="padding-top: 13px; border-top: 0px;">
161 164
 	  <form class="downloads">
162
-	    <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="