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

[emmapeel at torproject.org]

commit 2da591e7e6a791b7f235927fa5ee3457c20bd094
Merge: 5832fc2 b06deec
Author: hiro <hiro at torproject.org>
Date:   Tue Apr 16 15:16:18 2019 +0200

    Merge remote-tracking branch 'anto/master'

 assets/static/images/home/png/block-trackers.png       | Bin 0 -> 18192 bytes
 assets/static/images/home/png/block-trackers at 2x.png    | Bin 0 -> 42047 bytes
 assets/static/images/home/png/block-trackers at 3x.png    | Bin 0 -> 66496 bytes
 assets/static/images/home/png/browse-freely.png        | Bin 0 -> 27282 bytes
 assets/static/images/home/png/browse-freely at 2x.png     | Bin 0 -> 62800 bytes
 assets/static/images/home/png/browse-freely at 3x.png     | Bin 0 -> 99137 bytes
 assets/static/images/home/png/encryption.png           | Bin 0 -> 19727 bytes
 assets/static/images/home/png/encryption at 2x.png        | Bin 0 -> 44050 bytes
 assets/static/images/home/png/encryption at 3x.png        | Bin 0 -> 70895 bytes
 assets/static/images/home/png/fingerprinting.png       | Bin 0 -> 28619 bytes
 assets/static/images/home/png/fingerprinting at 2x.png    | Bin 0 -> 64240 bytes
 assets/static/images/home/png/fingerprinting at 3x.png    | Bin 0 -> 100068 bytes
 assets/static/images/home/png/surveillance.png         | Bin 0 -> 18021 bytes
 assets/static/images/home/png/surveillance at 2x.png      | Bin 0 -> 40297 bytes
 assets/static/images/home/png/surveillance at 3x.png      | Bin 0 -> 63810 bytes
 assets/static/images/home/{ => svg}/block-trackers.svg |   0
 assets/static/images/home/{ => svg}/browse-freely.svg  |   0
 assets/static/images/home/{ => svg}/encryption.svg     |   0
 assets/static/images/home/{ => svg}/fingerprinting.svg |   0
 assets/static/images/home/{ => svg}/surveillance.svg   |   0
 20 files changed, 0 insertions(+), 0 deletions(-)