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

[emmapeel at torproject.org]

commit 4c0501626f8c2650e71696763ef3711f7a6499a3
Merge: e168cfa 4743c46
Author: Antonela <hola at antonela.me>
Date:   Tue Apr 16 13:25:01 2019 -0300

    Merge pull request #18 from torproject/master
    
    rebase

 databags/versions.ini           | 10 ++++++++--
 templates/download-android.html |  9 +++++----
 templates/download-tor.html     | 22 ++++++++++++++++++++--
 templates/hero-download.html    |  5 ++++-
 4 files changed, 37 insertions(+), 9 deletions(-)