[tor-commits] [community/translations] Merge branch 'master' into translations

[emmapeel at torproject.org]

commit 6a64fdacd6b34f8e1d99af6208553a60a03a7de0
Merge: 92ceedd 09a8124
Author: emma peel <emma.peel at riseup.net>
Date:   Wed Jan 15 17:38:42 2020 +0100

    Merge branch 'master' into translations

 .htaccess                                           | 18 ++++++++++++++++++
 .../becoming-tor-translator/contents.lr             | 21 ++++++++++++++-------
 content/onion-services/setup/contents.lr            |  2 +-
 .../community-resources/contents.lr                 |  2 +-
 .../tor-exit-guidelines/contents.lr                 |  4 ++--
 content/relay-operations/contents.lr                |  2 +-
 6 files changed, 37 insertions(+), 12 deletions(-)