Author: kloesing Date: 2011-08-31 13:56:36 +0000 (Wed, 31 Aug 2011) New Revision: 24998

Modified: website/trunk/download/en/download.wml website/trunk/include/versions.wmi Log: Add relay-/exit-by-default packages to the download page

Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-08-30 16:32:15 UTC (rev 24997) +++ website/trunk/download/en/download.wml 2011-08-31 13:56:36 UTC (rev 24998) @@ -61,16 +61,42 @@ <!-- VIDALIA BRIDGE BUNDLE --> <div class="package"> <div class="downloads"> - <a class="button" href="../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-bridge-bundle-alpha>.exe"><span class="strong">Download</span><span class="normal">Vidalia Bridge Bundle (Beta)</span></a> + <a class="button" href="../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-bridge-bundle-stable>.exe"><span class="strong">Download</span><span class="normal">Vidalia Bridge Bundle (Beta)</span></a> <div class="sig"> - (<a href="../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-bridge-bundle-alpha>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a href="../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-bridge-bundle-stable>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </div>

<h2>Vidalia Bridge Bundle</h2> <em>Windows 7, Vista, and XP</em> - <p>A Vidalia Bundle which is configured to be a <a href="<page docs/bridges>">bridge</a> by default. This helps censored users reach the Tor network. <a href="<page docs/tor-doc-windows>">Installation Guide &raquo;</a></p> + <p>A Vidalia Bundle which is configured to be a <a href="<page docs/bridges>">bridge</a> by default. This helps censored users reach the Tor network.</p> </div> +<!-- VIDALIA RELAY BUNDLE --> + <div class="package"> + <div class="downloads"> + <a class="button" href="https://archive.torproject.org/tor-package-archive/technology-preview/vidalia-relay-bundle-<version-win32-relay-bundle-stable>.exe"><span class="strong">Download</span><span class="normal">Vidalia Relay Bundle (Beta)</span></a> + <div class="sig"> + (<a href="https://archive.torproject.org/tor-package-archive/technology-preview/vidalia-relay-bundle-<version-win32-relay-bundle-stable>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + </div> + </div> + + <h2>Vidalia Relay Bundle</h2> + <em>Windows 7, Vista, and XP</em> + <p>A Vidalia Bundle which is configured to be a non-exit <a href="<page docs/tor-doc-relay>">relay</a> by default. This helps grow the Tor network.</p> + </div> +<!-- VIDALIA EXIT BUNDLE --> + <div class="package"> + <div class="downloads"> + <a class="button" href="https://archive.torproject.org/tor-package-archive/technology-preview/vidalia-exit-bundle-<version-win32-exit-bundle-stable>.exe"><span class="strong">Download</span><span class="normal">Vidalia Exit Bundle (Beta)</span></a> + <div class="sig"> + (<a href="https://archive.torproject.org/tor-package-archive/technology-preview/vidalia-exit-bundle-<version-win32-exit-bundle-stable>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + </div> + </div> + + <h2>Vidalia Exit Bundle</h2> + <em>Windows 7, Vista, and XP</em> + <p>A Vidalia Bundle which is configured to be an <a href="<page docs/tor-doc-relay>">exit relay</a> by default. <strong>Please read these <a href="https://blog.torproject.org/running-exit-node">tips for running an exit node with minimal harassment</a> before you get started!</strong></p> + </div> <!-- EXPERT BUNDLE --> <div class="package"> <div class="downloads">

Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-08-30 16:32:15 UTC (rev 24997) +++ website/trunk/include/versions.wmi 2011-08-31 13:56:36 UTC (rev 24998) @@ -7,7 +7,9 @@ <define-tag version-win32-bundle-stable whitespace=delete>0.2.2.32</define-tag> <define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.32</define-tag>

-<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.32-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-stable whitespace=delete>0.2.2.32-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-stable whitespace=delete>0.2.2.32-<version-vidalia-stable>-1</define-tag> +<define-tag version-win32-exit-bundle-stable whitespace=delete>0.2.2.32-<version-vidalia-stable>-2</define-tag>

<define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.32</define-tag> <define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.32</define-tag>