commit 8579a74007a32bf320db5d4bb8c8d8ccd631a280 Merge: e1191f1a b461b88a Author: emma peel emma.peel@riseup.net Date: Sat Oct 19 10:00:21 2019 +0200

Merge branch 'master' into staging

content/about/sponsors/DARPA-georgetown/contents.lr | 2 ++ content/about/sponsors/USSD-DHRL-harvard/contents.lr | 4 ++-- content/about/sponsors/USSD-DHRL/contents.lr | 3 ++- content/about/sponsors/nsf-rochester/contents.lr | 4 ++-- content/about/sponsors/otf/contents.lr | 3 ++- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- databags/versions.ini | 2 +- 7 files changed, 16 insertions(+), 8 deletions(-)