commit 078afab02ee51138c3d845aa0cc205b8a33dbced Merge: a11333fe 9e1c4d7c Author: hiro hiro@torproject.org Date: Mon Oct 19 20:31:05 2020 +0200

Git merge changes from staging

content/champions-of-privacy/contents.lr | 68 +++++++++ content/contents.lr | 14 +- content/donor-faq/contents.lr | 251 +++++++++++++++++++++++++++++++ content/monthly-giving/contents.lr | 110 ++++++++++++++ content/state-disclosures/contents.lr | 42 ++++++ templates/layout.html | 2 +- 6 files changed, 479 insertions(+), 8 deletions(-)