[tor-commits] [tpo/staging] Merge remote-tracking branch 'anto/master'

[emmapeel at torproject.org]

commit a5e1f7e5725a0c33af45a0ee0a9b5930cd60d37c
Merge: 2da591e 26fa04a
Author: hiro <hiro at torproject.org>
Date:   Tue Apr 16 16:18:14 2019 +0200

    Merge remote-tracking branch 'anto/master'

 content/download/tor/contents.lr | 13 +++++++++++++
 templates/download-tor.html      | 23 +++++++++++++++++++++++
 templates/hero-download-tor.html |  6 ++++++
 templates/hero-download.html     |  5 ++---
 4 files changed, 44 insertions(+), 3 deletions(-)