commit 081f7d12d13a8835598fccf3f56f267558b4ef02 Merge: 81066907 56d4e85e Author: gus gus@torproject.org Date: Fri Jul 24 13:33:50 2020 -0400

Merge branch 'membership'

assets/static/images/membership/green.png | Bin 0 -> 239288 bytes assets/static/images/membership/header.png | Bin 0 -> 334841 bytes assets/static/images/membership/logos/Avast.png | Bin 0 -> 78009 bytes .../static/images/membership/logos/MullvadVPN.svg | 197 +++++++++++++++++++++ assets/static/images/membership/shallot.png | Bin 0 -> 208458 bytes assets/static/images/membership/vidalia.png | Bin 0 -> 169283 bytes content/about/membership/contents.lr | 13 ++ templates/membership.html | 138 +++++++++++++++ 8 files changed, 348 insertions(+)