commit fe194ff0201348dd1fd9c9807666c3050acd0f89 Author: Mike Perry mikeperry-git@torproject.org Date: Tue Nov 3 15:32:07 2015 -0800

Bump TBB version to list 5.0.4 and 5.5a4. --- include/versions.wmi | 22 +++++++++++----------- projects/torbrowser/RecommendedTBBVersions | 10 +++++++++- 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi index 76cb6d1..7a22419 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -18,11 +18,11 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag>

-<define-tag version-torbrowserbundledir whitespace=delete>5.0.3</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>5.5a3</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>5.0.4</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>5.5a4</define-tag>

-<define-tag version-torbrowserbundle whitespace=delete>5.0.3</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>5.5a3</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>5.0.4</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>5.5a4</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> @@ -31,18 +31,18 @@ <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag>

-<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.0.3</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.0.3</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>5.5a3</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>5.5a3</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.0.4</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.0.4</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>5.5a4</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>5.5a4</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag>

-<define-tag version-torbrowserbundleosx32 whitespace=delete>5.0.3</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>5.0.3</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>5.5a3</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>5.0.4</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>5.0.4</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>5.5a4</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 0ad46cb..13bd09d 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -6,5 +6,13 @@ "5.5a3", "5.5a3-Linux", "5.5a3-MacOS", -"5.5a3-Windows" +"5.5a3-Windows", +"5.0.4", +"5.0.4-Linux", +"5.0.4-MacOS", +"5.0.4-Windows", +"5.5a4", +"5.5a4-Linux", +"5.5a4-MacOS", +"5.5a4-Windows" ]