[tor-commits] [webwml/staging] Merge remote-tracking branch 'origin' into staging

[hiro at torproject.org]

commit b9ee58ae8b1621deac80f00db08e6aae26d832df
Merge: 662f9241 0756fda8
Author: hiro <hiro at torproject.org>
Date:   Tue Sep 4 18:05:08 2018 +0200

    Merge remote-tracking branch 'origin' into staging

 about/en/jobs.wml             |   4 +--
 about/en/sponsors.wml         |   2 +-
 css/layout                    |   1 +
 css/layout.css                |  14 +++++++++-
 css/layout.min.css            |   2 +-
 docs/en/documentation.wml     |   5 ++--
 docs/en/onion-services.wml    |   2 +-
 download/en/download-easy.wml |  44 +++++++++++++++++++----------
 download/en/download.wml      |  63 +++++++++++++++++++++++++++++-------------
 images/icon-android24.png     | Bin 0 -> 13418 bytes
 include/versions.wmi          |   8 ++++--
 11 files changed, 101 insertions(+), 44 deletions(-)

diff --cc include/versions.wmi
index 7ef24bcf,b0ae6963..5442a3b5
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@@ -43,15 -40,8 +45,12 @@@
  <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>