commit e85cab01121b8d972e7e0d8c22e6b0428f783966 Author: Georg Koppen gk@torproject.org Date: Mon Feb 15 13:40:57 2016 +0000

Add new Tor Browser versions --- include/versions.wmi | 10 +++++----- projects/torbrowser/RecommendedTBBVersions | 8 +++++++- 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi index 3f59644..f135692 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -5,19 +5,19 @@

<define-tag version-torbrowserdevelopbranch whitespace=delete>maint-5.5</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>5.5.2</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>6.0a1</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>6.0a2</define-tag>

<define-tag version-torbrowserbundle whitespace=delete>5.5.2</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>6.0a1</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>6.0a2</define-tag>

<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.5.2</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>5.5.2</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.0a1</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.0a1</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.0a2</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.0a2</define-tag>

<define-tag version-torbrowserbundleosx32 whitespace=delete>5.5.2</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>5.5.2</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.0a1</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.0a2</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 c7e8114..7fabb7e 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -7,6 +7,12 @@ "6.0a1-Linux", "6.0a1-MacOS", "6.0a1-Windows", +"6.0a2", +"6.0a2-Linux", +"6.0a2-MacOS", +"6.0a2-Windows", "6.0a1-hardened", -"6.0a1-hardened-Linux" +"6.0a1-hardened-Linux", +"6.0a2-hardened", +"6.0a2-hardened-Linux" ]