[tor-commits] [tpo/master] Update sig and links for android downloads

[hiro at torproject.org]

commit b4b59e5868c9acda38ec799fe3e1424ce378db9e
Merge: b2e8c07 387f140
Author: hiro <hiro at torproject.org>
Date:   Tue Apr 16 17:55:42 2019 +0200

    Update sig and links for android downloads

 databags/versions.ini           |  4 ++--
 templates/download-android.html | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --cc databags/versions.ini
index e8dbb3e,cbba14e..5fdd461
--- a/databags/versions.ini
+++ b/databags/versions.ini
@@@ -4,8 -4,8 +4,8 @@@ release_date = 2019-03-2
  win32 = 0.3.5.8
  
  [torbrowser-alpha]
- version = 8.5a11
- release_date = 2019-04-15
+ version = 8.5a10
 -release_date = 2019-03-25
++release_date = 2019-03-23
  
  [torbrowser-develop-branch]
  version = maint-8.0
diff --cc templates/download-android.html
index fc33533,796fa4c..6248c8a
--- a/templates/download-android.html
+++ b/templates/download-android.html
@@@ -15,11 -15,20 +15,21 @@@
          <h3 class="mx-auto defend text-white">{{ _('Protect yourself against tracking, surveillance, and censorship.') }}</h3>
        </div>
        <div class="row my-5">
-         {% set t = bag('versions', 'torbrowser-alpha') %}
-         <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }}</a>
-         <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alpha">{{ _('Go to Google Play') }}</a>
-         {% from "macros/downloads.html" import render_fdroid %}
-         <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a>
+           <div class="col-md-6 text-center">
 -            <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" href="https://dist.torproject.org/torbrowser/8.5a10/tor-browser-8.5a10-android-armv7-multi.apk">{{ _('Download .apk') }}  <small class="badge-pill badge-dark mx-1 nick">arm</small></a>
 -            <a class="btn btn-primary btn-sm nick mx-3 my-2" href="#"><small>sig</small></a>
 -            <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" href="https://dist.torproject.org/torbrowser/8.5a10/tor-browser-8.5a10-android-armv7-multi.apk">{{ _('Download .apk') }}  <small class="badge-pill badge-dark mx-1 nick">x86</small></a>
 -            <a class="btn btn-primary btn-sm nick mx-3 my-2" href="#"><small>sig</small></a>
++            {% set t = bag('versions', 'torbrowser-alpha') %}
++            <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }}  <small class="badge-pill badge-dark mx-1 nick">arm</small></a>
++            <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk.asc"><small>sig</small></a>
++            <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk">{{ _('Download .apk') }}  <small class="badge-pill badge-dark mx-1 nick">x86</small></a>
++            <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk.asc"><small>sig</small></a>
+           </div>
+           <div class="col-md-3 text-center">
+             <a class="btn btn-lg btn-light text-primary py-3 my-1" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alpha">{{ _('Go to Google Play') }}</a>
+           </div>
+           {% from "macros/downloads.html" import render_fdroid %}
+           <div class="col-md-3 text-center">
+             <a class="btn btn-lg btn-light text-primary py-3 my-1 disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a>
+             <!--a class="btn btn-primary btn-sm nick mx-5 my-4" href="#"><small>sig</small></a-->
+           </div>
        </div>
        <div class="row">
          <a class="text-light mx-auto nick" href="https://itunes.apple.com/us/app/onion-browser/id519296448?mt=8">{{ _('Are you a iOS user? We encourage you to try Onion Browser.') }} </a>