[tor-commits] [tpo/master] Merge pull request #19 from torproject/master

[hiro at torproject.org]

commit 3602b9039685b86f88b296a988848eca68ad70c6
Merge: 988c3f7 48d4c4c
Author: Antonela <hola at antonela.me>
Date:   Tue Apr 23 14:26:38 2019 -0300

    Merge pull request #19 from torproject/master
    
    rebase

 .htaccess                                          |  2 --
 content/about/reports/2011-form-pc/contents.lr     |  2 +-
 .../torbrowser/RecommendedTBBVersions/contents.lr  |  6 +++-
 databags/versions.ini                              | 10 ++----
 models/text.ini                                    |  2 +-
 templates/download-android.html                    | 28 +++++++++-------
 templates/download-options.html                    |  1 +
 templates/download-tor.html                        | 37 ++++++++--------------
 templates/download.html                            |  8 ++---
 templates/hero-download.html                       | 13 +++++---
 templates/macros/downloads.html                    | 14 ++++++++
 11 files changed, 67 insertions(+), 56 deletions(-)