Author: erinn Date: 2013-02-08 15:39:20 +0000 (Fri, 08 Feb 2013) New Revision: 26054 Modified: website/trunk/images/android/ website/trunk/include/versions.wmi Log: revert previous commit and downgrade all alpha and stable bundles until we get a new openssl Property changes on: website/trunk/images/android ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2013-02-08 13:10:05 UTC (rev 26053) +++ website/trunk/include/versions.wmi 2013-02-08 15:39:20 UTC (rev 26054) @@ -2,30 +2,30 @@ <define-tag version-alpha whitespace=delete>0.2.4.10-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.4.10-alpha</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.4.9-alpha</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.4.10-alpha</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.4.9-alpha</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.4.10-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.4.10-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.4.10-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.4.9-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.4.9-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.4.9-alpha-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.4.10-alpha</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.4.9-alpha</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.4.10-alpha</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.4.9-alpha</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.4.10-alpha</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.4.9-alpha</define-tag> <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.10-alpha</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.9-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.3.25-3</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.3.25-2</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.7, openssl-1.0.1d</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>10.0.12esr</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.4.6.3</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> @@ -35,10 +35,10 @@ <define-tag version-torbrowserbundlealpha whitespace=delete>2.4.9-alpha-1</define-tag> <define-tag version-torobfsbundlealpha whitespace=delete>2.4.7-alpha-1</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-3</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-3</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-2</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-2</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> -<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.7, openssl-1.0.1d</define-tag> +<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>10.0.12esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.6.3</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> @@ -47,8 +47,8 @@ <define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.4.7-alpha-1</define-tag> <define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.4.7-alpha-1</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.3.25-3</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-3</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.3.25-2</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-2</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>10.0.12esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.6.3</define-tag> @@ -75,27 +75,27 @@ <define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.21.exe</define-tag> <define-tag package-win32-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> -<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.21-1.exe</define-tag> +<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.21.exe</define-tag> <define-tag package-win32-bridge-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-bridge-bundle-stable></define-tag> <define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-alpha>-0.2.21.exe</define-tag> <define-tag package-win32-bridge-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-bridge-bundle-alpha></define-tag> -<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.21-1.exe</define-tag> +<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.21.exe</define-tag> <define-tag package-win32-relay-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-relay-bundle-stable></define-tag> <define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-alpha>-0.2.21.exe</define-tag> <define-tag package-win32-relay-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-relay-bundle-alpha></define-tag> -<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.21-1.exe</define-tag> +<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.21.exe</define-tag> <define-tag package-win32-exit-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-stable></define-tag> <define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-alpha>-0.2.21.exe</define-tag> <define-tag package-win32-exit-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-alpha></define-tag> -<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.21-i386-1.dmg</define-tag> +<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.21-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-osx-x86-bundle-stable></define-tag> <define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.21-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-osx-x86-bundle-alpha></define-tag> -<define-tag package-osx-ppc-bundle-stable whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.21-ppc-1.dmg</define-tag> +<define-tag package-osx-ppc-bundle-stable whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.21-ppc.dmg</define-tag> <define-tag package-osx-ppc-bundle-alpha whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-alpha>-0.2.21-ppc.dmg</define-tag> <define-tag package-osx-x86-stable whitespace=delete>../dist/osx-x86/Tor-<version-osx-stable>-i386-Bundle.dmg</define-tag>