[tor-commits] [tpo/staging] Merge branch 'master' into master

[emmapeel at torproject.org]

commit b7d1e5f56e83827b539cad1a3fe3584c745c4152
Merge: 59a96c3 a0931ab
Author: Antonela <hola at antonela.me>
Date:   Fri Apr 26 10:07:31 2019 -0300

    Merge branch 'master' into master

 content/about/people/boklm/contents.lr    |  2 +-
 content/about/people/ewyatt/contents.lr   |  2 +-
 content/about/people/sajolida/contents.lr |  2 +-
 content/menu/contents.lr                  | 16 ++++++++++++++++
 templates/download-options.html           |  1 -
 templates/download-tor.html               | 21 +++++++++++++++++++--
 6 files changed, 38 insertions(+), 6 deletions(-)