Browse code

Merge remote-tracking branch 'origin/master' into staging

Sebastian Hahn authored on17/11/2015 14:33:16
Showing7 changed files
... ...
@@ -27,10 +27,10 @@
27 27
     torproject.repo.  Edit this file with the following information:
28 28
     </p>
29 29
 
30
-    <h3>Fedora 21/22 and EL6/7 packages</h3>
30
+    <h3>Fedora 22/23 and EL6/7 packages</h3>
31 31
 
32
-    <p>For Fedora 21, Fedora 22, RHEL 6, RHEL 7 (and clones), use following
33
-    repo file - substitute DISTRIBUTION with one of the following: fc/21, fc/22,
32
+    <p>For Fedora 22, Fedora 23, RHEL 6, RHEL 7 (and clones), use following
33
+    repo file - substitute DISTRIBUTION with one of the following: fc/22, fc/23,
34 34
     el/6, el/7 according to your distribution.
35 35
     </p>
36 36
     
... ...
@@ -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">
... ...
@@ -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>
... ...
@@ -1271,7 +1271,7 @@ So we need better unit tests, and we need better integration tests too.
1271 1271
     </p>
1272 1272
 
1273 1273
     <p>
1274
-Improving unit tests would would involve refactoring functions to be more
1274
+Improving unit tests would involve refactoring functions to be more
1275 1275
 testable, and writing a bunch of unit tests.
1276 1276
     </p>
1277 1277
 
... ...
@@ -18,11 +18,11 @@
18 18
 <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag>
19 19
 <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag>
20 20
 
21
-<define-tag version-torbrowserbundledir whitespace=delete>5.0.3</define-tag>
22
-<define-tag version-torbrowserbundlebetadir whitespace=delete>5.5a3</define-tag>
21
+<define-tag version-torbrowserbundledir whitespace=delete>5.0.4</define-tag>
22
+<define-tag version-torbrowserbundlebetadir whitespace=delete>5.5a4</define-tag>
23 23
 
24
-<define-tag version-torbrowserbundle whitespace=delete>5.0.3</define-tag>
25
-<define-tag version-torbrowserbundlebeta whitespace=delete>5.5a3</define-tag>
24
+<define-tag version-torbrowserbundle whitespace=delete>5.0.4</define-tag>
25
+<define-tag version-torbrowserbundlebeta whitespace=delete>5.5a4</define-tag>
26 26
 <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>
27 27
 <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag>
28 28
 <define-tag version-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag>
... ...
@@ -31,18 +31,18 @@
31 31
 <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag>
32 32
 <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag>
33 33
 
34
-<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.0.3</define-tag>
35
-<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.0.3</define-tag>
36
-<define-tag version-torbrowserbundlelinux32beta whitespace=delete>5.5a3</define-tag>
37
-<define-tag version-torbrowserbundlelinux64beta whitespace=delete>5.5a3</define-tag>
34
+<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.0.4</define-tag>
35
+<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.0.4</define-tag>
36
+<define-tag version-torbrowserbundlelinux32beta whitespace=delete>5.5a4</define-tag>
37
+<define-tag version-torbrowserbundlelinux64beta whitespace=delete>5.5a4</define-tag>
38 38
 <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>
39 39
 <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag>
40 40
 <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag>
41 41
 <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag>
42 42
 
43
-<define-tag version-torbrowserbundleosx32 whitespace=delete>5.0.3</define-tag>
44
-<define-tag version-torbrowserbundleosx64 whitespace=delete>5.0.3</define-tag>
45
-<define-tag version-torbrowserbundleosx64beta whitespace=delete>5.5a3</define-tag>
43
+<define-tag version-torbrowserbundleosx32 whitespace=delete>5.0.4</define-tag>
44
+<define-tag version-torbrowserbundleosx64 whitespace=delete>5.0.4</define-tag>
45
+<define-tag version-torbrowserbundleosx64beta whitespace=delete>5.5a4</define-tag>
46 46
 <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>
47 47
 <define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag>
48 48
 <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag>
... ...
@@ -409,9 +409,9 @@
409 409
           <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_ja.exe">32/64-bit</a>
410 410
           <em>(<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_ja.exe.asc">sig</a>)</em></td>
411 411
           <td><a
412
-          href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_ja-JP-mac.dmg">64-bit</a>
412
+          href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_ja.dmg">64-bit</a>
413 413
           <em>(<a
414
-              href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_ja-JP-mac.dmg.asc">sig</a>)</em> 
414
+              href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_ja.dmg.asc">sig</a>)</em> 
415 415
           <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_ja.tar.xz">32-bit</a> 
416 416
           <em>(<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_ja.tar.xz.asc">sig</a>)</em> 
417 417
           &bull; <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_ja.tar.xz">64-bit</a> 
... ...
@@ -525,6 +525,30 @@
525 525
         </table>
526 526
       </div>
527 527
       </div>
528
+    <hr>
529
+    <p></p>
530
+    <div id="downloads-hardened" class="anchor"></div>
531
+    <center><h3>Hardened Tor Browser</h3></center>
532
+     <div class="pjtext">
533
+      <div class="dltable" style="margin-top: -35px;">
534
+        <table>
535
+          <thead>
536
+        <tr>
537
+          <th><br>Language</th>
538
+          <th>Linux<br><em>(<version-torbrowserbundlelinux64beta>-hardened)</em></th>
539
+        </tr>
540
+          </thead>
541
+          <tbody>
542
+        <tr class="alt">
543
+          <td>All</td>
544
+          <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>-hardened/tor-browser-linux64-<version-torbrowserbundlelinux64beta>-hardened_ALL.tar.xz">64-bit</a>
545
+          <em>(<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>-hardened/tor-browser-linux64-<version-torbrowserbundlelinux64beta>-hardened_ALL.tar.xz.asc">sig</a>)</em>
546
+          </td>
547
+        </tr>
548
+          </tbody>
549
+        </table>
550
+      </div>
551
+      </div>
528 552
     </div>
529 553
       </div>
530 554
 
... ...
@@ -1,10 +1,12 @@
1 1
 [
2
-"5.0.3",
3
-"5.0.3-Linux",
4
-"5.0.3-MacOS",
5
-"5.0.3-Windows",
6
-"5.5a3",
7
-"5.5a3-Linux",
8
-"5.5a3-MacOS",
9
-"5.5a3-Windows"
2
+"5.0.4",
3
+"5.0.4-Linux",
4
+"5.0.4-MacOS",
5
+"5.0.4-Windows",
6
+"5.5a4",
7
+"5.5a4-Linux",
8
+"5.5a4-MacOS",
9
+"5.5a4-Windows",
10
+"5.5a4-hardened",
11
+"5.5a4-hardened-Linux"
10 12
 ]