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

[emmapeel at torproject.org]

commit 9cc3292334af9a8ea97e08ecbb97db08f59e295e
Merge: 0022d64 985626e
Author: hiro <hiro at torproject.org>
Date:   Tue Mar 26 21:13:45 2019 +0100

    Merge remote-tracking branch 'anto/master'

 assets/static/images/tb85/TB8.svg         | 179 ++++++++++++++++++++++++++++++
 assets/static/images/tb85/tb85.png        | Bin 46123 -> 58564 bytes
 assets/static/images/tb85/tb85 at 2x.png     | Bin 107230 -> 147986 bytes
 content/about/people/antonela/contents.lr |   2 +
 templates/download-android.html           |   2 +-
 templates/hero-home.html                  |   2 +-
 templates/history.html                    |   2 +-
 templates/navbar.html                     |   2 +-
 templates/people.html                     |   5 +-
 9 files changed, 188 insertions(+), 6 deletions(-)