[tor-commits] [webwml/master] Add new Tor Browser versions: 5.5.4, 6.0a4

[boklm at torproject.org]

commit 60091053c7e0eebecdd596a45e7f195ff88b729b
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri Mar 18 20:43:13 2016 +0100

    Add new Tor Browser versions: 5.5.4, 6.0a4
---
 include/versions.wmi                       | 46 +++++++++++++++---------------
 projects/torbrowser/RecommendedTBBVersions | 12 +++++++-
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 88ddb98..2f1c042 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -4,29 +4,29 @@
 <define-tag version-win32-stable whitespace=delete>0.2.7.6</define-tag>
 
 <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-5.5</define-tag>
-<define-tag version-torbrowserbundledir whitespace=delete>5.5.3</define-tag>
-<define-tag version-torbrowserbundlebetadir whitespace=delete>6.0a3</define-tag>
-
-<define-tag version-torbrowserbundle whitespace=delete>5.5.3</define-tag>
-<define-tag releasedate-torbrowserbundle whitespace=delete>2016-03-08</define-tag>
-<define-tag version-torbrowserbundlebeta whitespace=delete>6.0a3</define-tag>
-<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-03-08</define-tag>
-
-<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.5.3</define-tag>
-<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2016-03-08</define-tag>
-<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.5.3</define-tag>
-<define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2016-03-08</define-tag>
-<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.0a3</define-tag>
-<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-03-08</define-tag>
-<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.0a3</define-tag>
-<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-03-08</define-tag>
-
-<define-tag version-torbrowserbundleosx32 whitespace=delete>5.5.3</define-tag>
-<define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2016-03-08</define-tag>
-<define-tag version-torbrowserbundleosx64 whitespace=delete>5.5.3</define-tag>
-<define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2016-03-08</define-tag>
-<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.0a3</define-tag>
-<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-03-08</define-tag>
+<define-tag version-torbrowserbundledir whitespace=delete>5.5.4</define-tag>
+<define-tag version-torbrowserbundlebetadir whitespace=delete>6.0a4</define-tag>
+
+<define-tag version-torbrowserbundle whitespace=delete>5.5.4</define-tag>
+<define-tag releasedate-torbrowserbundle whitespace=delete>2016-03-18</define-tag>
+<define-tag version-torbrowserbundlebeta whitespace=delete>6.0a4</define-tag>
+<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-03-18</define-tag>
+
+<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.5.4</define-tag>
+<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2016-03-18</define-tag>
+<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.5.4</define-tag>
+<define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2016-03-18</define-tag>
+<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.0a4</define-tag>
+<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-03-18</define-tag>
+<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.0a4</define-tag>
+<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-03-18</define-tag>
+
+<define-tag version-torbrowserbundleosx32 whitespace=delete>5.5.4</define-tag>
+<define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2016-03-18</define-tag>
+<define-tag version-torbrowserbundleosx64 whitespace=delete>5.5.4</define-tag>
+<define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2016-03-18</define-tag>
+<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.0a4</define-tag>
+<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-03-18</define-tag>
 
 <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundledir>/tor-win32-<version-win32-stable>.zip</define-tag>
 
diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions
index 1382c17..b18a5b6 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -3,10 +3,20 @@
 "5.5.3-Linux",
 "5.5.3-MacOS",
 "5.5.3-Windows",
+"5.5.4",
+"5.5.4-Linux",
+"5.5.4-MacOS",
+"5.5.4-Windows",
 "6.0a3",
 "6.0a3-Linux",
 "6.0a3-MacOS",
 "6.0a3-Windows",
+"6.0a4",
+"6.0a4-Linux",
+"6.0a4-MacOS",
+"6.0a4-Windows",
 "6.0a3-hardened",
-"6.0a3-hardened-Linux"
+"6.0a3-hardened-Linux",
+"6.0a4-hardened",
+"6.0a4-hardened-Linux"
 ]