[tor-commits] [webwml/staging] tor: add oldstable, testing and beta (#17805, #26298)

[hiro at torproject.org]

commit 0806912739889220df46130bd89a7e2caed1c01b
Author: traumschule <traumschuleriebau at riseup.net>
Date:   Sat Aug 25 10:41:00 2018 +0200

    tor: add oldstable, testing and beta (#17805, #26298)
---
 download/en/tor.wml  | 14 ++++++++++++--
 include/versions.wmi | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/download/en/tor.wml b/download/en/tor.wml
index 1fb1fc8b..588d4e9d 100644
--- a/download/en/tor.wml
+++ b/download/en/tor.wml
@@ -35,11 +35,21 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
           <p class="all-dl"><a href="<page download/download>">What is Tor</a>? Looking for <a href="<page download/download>">Tor Browser</a>,
             <a href="<page download/download-unix>">Tor packages</a>  or <a href="<page download/download>">other downloads</a>? <a href="<page projects/projects>">All projects</a></p>
 	  <div class="downloads">
-	    <a class="button" href="../dist/tor-<version-stable>.tar.gz"><span class="strong">Download</span><span class="normal">Source Code</span></a>
+	    <a class="button" href="../dist/tor-<version-stable>.tar.gz"><span class="strong">Download</span><span class="normal">Source Code (Stable)</span></a>
 	    <div class="sig">
 	      (<a href="../dist/tor-<version-stable>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
 	    </div>
-	    <a class="button" href="../dist/tor-<version-alpha>.tar.gz"><span class="strong">Download</span><span class="normal">Source Code (Unstable)</span></a>
+	    <a class="button" href="../dist/tor-<version-oldstable>.tar.gz"><span class="strong">Download</span><span class="normal">Source Code (Oldstable)</span></a>
+	    <div class="sig">
+	      (<a href="../dist/tor-<version-oldstable>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
+	    </div>
+	    <a class="button" href="../dist/tor-<version-testing>.tar.gz"><span class="strong">Download</span><span class="normal">Source Code (Testing)</span></a>
+	    <div class="sig">
+	      (<a href="../dist/tor-<version-testing>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
+	    <a class="button" href="../dist/tor-<version-beta>.tar.gz"><span class="strong">Download</span><span class="normal">Source Code (Unstable - beta)</span></a>
+	    <div class="sig">
+	      (<a href="../dist/tor-<version-beta>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
+	    <a class="button" href="../dist/tor-<version-alpha>.tar.gz"><span class="strong">Download</span><span class="normal">Source Code (Unstable - alpha)</span></a>
 	    <div class="sig">
 	      (<a href="../dist/tor-<version-alpha>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
 	    </div>
diff --git a/include/versions.wmi b/include/versions.wmi
index c85a1b8f..7ef24bcf 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,6 +1,11 @@
+# Tor
+<define-tag version-oldstable whitespace=delete>0.2.9.16</define-tag>
 <define-tag version-stable whitespace=delete>0.3.3.9</define-tag>
+<define-tag version-testing whitespace=delete>0.3.4.5-rc</define-tag>
+<define-tag version-beta whitespace=delete>0.3.4.6-rc</define-tag>
 <define-tag version-alpha whitespace=delete>0.3.4.7-rc</define-tag>
 
+# Tor Browser - development branch
 <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.5</define-tag>
 
 # *** tor browser stable ***
@@ -38,9 +43,15 @@
 <let version-torbrowserbundleosx64beta=version-torbrowserbundlebeta-all />
 <let releasedate-torbrowserbundleosx64beta=releasedate-torbrowserbundlebeta-all />
 
-
+# Tor files
+<define-tag file-source-oldstable whitespace=delete>tor-<version-oldstable>.tar.gz</define-tag>
+<define-tag package-source-oldstable whitespace=delete>../dist/<file-source-oldstable></define-tag>
 <define-tag file-source-stable whitespace=delete>tor-<version-stable>.tar.gz</define-tag>
 <define-tag package-source-stable whitespace=delete>../dist/<file-source-stable></define-tag>
+<define-tag file-source-testing whitespace=delete>tor-<version-testing>.tar.gz</define-tag>
+<define-tag package-source-testing whitespace=delete>../dist/<file-source-testing></define-tag>
+<define-tag file-source-beta whitespace=delete>tor-<version-beta>.tar.gz</define-tag>
+<define-tag package-source-beta whitespace=delete>../dist/<file-source-beta></define-tag>
 <define-tag file-source-alpha whitespace=delete>tor-<version-alpha>.tar.gz</define-tag>
 <define-tag package-source-alpha whitespace=delete>../dist/<file-source-alpha></define-tag>