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

[hiro at torproject.org]

commit 4e7e21a366f1f364cadd45d563581ddf77484f04
Merge: 781630f2 351ebba5
Author: Antonela <antonela at torproject.org>
Date:   Mon Aug 31 14:00:37 2020 +0000

    Merge branch 'update-membership' into 'master'
    
    Update membership
    
    Closes tpo/operations/communications#11
    
    See merge request antonela/tpo!1

 assets/static/images/membership/logos/Avast.png    | Bin 78009 -> 25859 bytes
 assets/static/images/membership/logos/Cymru.png    | Bin 0 -> 32671 bytes
 .../static/images/membership/logos/MullvadVPN.png  | Bin 21976 -> 0 bytes
 .../static/images/membership/logos/MullvadVPN.svg  | 197 ---------------------
 assets/static/images/membership/logos/mullvad.png  | Bin 0 -> 28521 bytes
 templates/membership.html                          |  43 +++--
 6 files changed, 27 insertions(+), 213 deletions(-)