[tor-commits] [community/master] Merge branch 'gsoc-2021-updates'

[gus at torproject.org]

commit 068dc3e435fd10f3d629b319470aa88c080ec8b3
Merge: 63550a6 8bca787
Author: gus <gus at torproject.org>
Date:   Thu Feb 18 11:32:04 2021 -0500

    Merge branch 'gsoc-2021-updates'

 content/gsoc/gettor-distribution/contents.lr            | 2 +-
 content/gsoc/onion-toolbox/contents.lr                  | 2 +-
 content/gsoc/ooni-explorer-testing/contents.lr          | 2 +-
 content/gsoc/ooni-probe-desktop-custom-urls/contents.lr | 2 +-
 content/gsoc/ooni-probe-experiments/contents.lr         | 2 +-
 content/gsoc/privacy-aware-geo-lookup/contents.lr       | 2 +-
 content/gsoc/privacy-friendly-web/contents.lr           | 2 +-
 content/gsoc/salmon-bridge-distribution/contents.lr     | 2 +-
 content/gsoc/tor-keygen/contents.lr                     | 2 +-
 content/gsoc/tor-relay-ipv6-support/contents.lr         | 4 +++-
 content/gsoc/tor-weather/contents.lr                    | 1 -
 11 files changed, 12 insertions(+), 11 deletions(-)