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

commit 185acdd066cdbfbfe58dec255c733dc678d68429 Merge: dbb16bef 0c73fa4b Author: gus gus@torproject.org Date: Mon Jul 20 13:24:24 2020 -0400

Merge branch 'membership' into staging

assets/static/images/membership/green.png | Bin 0 -> 239288 bytes 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 | 152 ++++++++++++++++++++++++++++ 5 files changed, 165 insertions(+)