[tor-commits] [community/staging] Merge branch 'gus-new/community-the-tor-network-update' into 'the-tor-network-update'

[gus at torproject.org]

commit d2ce15a8906ae4ce62404a7c6042b8e5351c046a
Merge: 09073fe 9b2a11a
Author: Gus <gus at torproject.org>
Date:   Fri Apr 16 18:33:17 2021 +0000

    Merge branch 'gus-new/community-the-tor-network-update' into 'the-tor-network-update'
    
    the tor network presentation
    
    See merge request gus/community!1

 .../training/resources/tor-training/contents.lr    | 98 +++++++++-------------
 1 file changed, 41 insertions(+), 57 deletions(-)