From 4c12ac2e891fe435af0e3e634c4fd4efe41773be Mon Sep 17 00:00:00 2001
From: Erinn Clark <erinn@torproject.org>
Date: Thu, 15 Sep 2011 00:59:43 +0000
Subject: [PATCH] add 0.2.2.33 & 0.2.3.4-alpha win/osx packages and update
 download page accordingly

---
 download/en/download.wml | 15 +++++++-----
 include/versions.wmi     | 51 +++++++++++++++++++++++++++-------------
 2 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/download/en/download.wml b/download/en/download.wml
index 0cee57ec..e41afd30 100644
--- a/download/en/download.wml
+++ b/download/en/download.wml
@@ -71,10 +71,11 @@
 <!-- VIDALIA BRIDGE BUNDLE -->
 	<div class="package">
 	  <div class="downloads">
-	    <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>
+	    <a class="button" href="<package-win32-bridge-bundle-stable>"><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-stable>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
+	      (<a href="<package-win32-bridge-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
 	    </div>
+            <a class="additional" href="<package-win32-bridge-bundle-alpha>">Download Unstable</a> (<a href="<package-win32-bridge-bundle-alpha>.asc">sig</a>)
 	  </div>
 
 	  <h2>Vidalia Bridge Bundle</h2>
@@ -84,10 +85,11 @@
 <!-- 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>
+	    <a class="button" href="<package-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>
+	      (<a href="<package-win32-relay-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
 	    </div>
+            <a class="additional" href="<package-win32-relay-bundle-alpha>">Download Unstable</a> (<a href="<package-win32-relay-bundle-alpha>.asc">sig</a>)
 	  </div>
 
 	  <h2>Vidalia Relay Bundle</h2>
@@ -97,10 +99,11 @@
 <!-- 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>
+	    <a class="button" href="<package-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>
+	      (<a href="<package-win32-exit-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
 	    </div>
+            <a class="additional" href="<package-win32-exit-bundle-alpha>">Download Unstable</a> (<a href="<package-win32-exit-bundle-alpha>.asc">sig</a>)
 	  </div>
 
 	  <h2>Vidalia Exit Bundle</h2>
diff --git a/include/versions.wmi b/include/versions.wmi
index d4529427..7b986f0f 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,27 +1,31 @@
 <define-tag version-stable whitespace=delete>0.2.2.33</define-tag>
 <define-tag version-alpha whitespace=delete>0.2.3.4-alpha</define-tag>
 
-<define-tag version-win32-stable whitespace=delete>0.2.2.32</define-tag>
-<define-tag version-win32-alpha whitespace=delete>0.2.2.32</define-tag>
+<define-tag version-win32-stable whitespace=delete>0.2.2.33</define-tag>
+<define-tag version-win32-alpha whitespace=delete>0.2.3.4-alpha</define-tag>
 
-<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-bundle-stable whitespace=delete>0.2.2.33</define-tag>
+<define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.4-alpha</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-win32-bridge-bundle-stable whitespace=delete>0.2.2.33-<version-vidalia-stable></define-tag>
+<define-tag version-win32-relay-bundle-stable whitespace=delete>0.2.2.33-<version-vidalia-stable></define-tag>
+<define-tag version-win32-exit-bundle-stable whitespace=delete>0.2.2.33-<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>
+<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.4-alpha-<version-vidalia-stable></define-tag>
+<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.4-alpha-<version-vidalia-stable></define-tag>
+<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.4-alpha-<version-vidalia-stable></define-tag>
 
-<define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.32</define-tag>
-<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.32</define-tag>
+<define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.33</define-tag>
+<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.4-alpha</define-tag>
 
-<define-tag version-osx-x86-stable whitespace=delete>0.2.2.32</define-tag>
-<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.32</define-tag>
+<define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.33</define-tag>
+<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.4-alpha</define-tag>
 
-<define-tag version-osx-ppc-stable whitespace=delete>0.2.2.32</define-tag>
-<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.32</define-tag>
+<define-tag version-osx-x86-stable whitespace=delete>0.2.2.33</define-tag>
+<define-tag version-osx-x86-alpha whitespace=delete>0.2.3.4-alpha</define-tag>
+
+<define-tag version-osx-ppc-stable whitespace=delete>0.2.2.33</define-tag>
+<define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.4-alpha</define-tag>
 
 <define-tag version-torbrowserbundle whitespace=delete>2.2.32-4</define-tag>
 <define-tag version-torbrowser-tor whitespace=delete>0.2.2.32</define-tag>
@@ -58,11 +62,26 @@
 <define-tag package-win32-stable whitespace=delete>/dist/win32/tor-<version-win32-stable>-win32.exe</define-tag>
 <define-tag package-win32-alpha whitespace=delete>/dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag>
 
-<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14-1.exe</define-tag>
+<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag>
 <define-tag package-win32-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag>
 <define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.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-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag>
+<define-tag package-win32-bridge-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag>
+<define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag>
+<define-tag package-win32-bridge-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag>
+
+<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag>
+<define-tag package-win32-relay-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag>
+<define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag>
+<define-tag package-win32-relay-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag>
+
+<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag>
+<define-tag package-win32-exit-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag>
+<define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag>
+<define-tag package-win32-exit-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag>
+
 <define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.14-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.14-i386.dmg</define-tag>