commit 78289a2724445b2afeea0cd11e94adf9d1c7adf2 Merge: e13c394 93bbb67 Author: gus gus@torproject.org Date: Fri Jul 9 14:07:15 2021 -0300
Merge branch 'master' into develop
.gitlab-ci.yml | 62 +++++++++++++++++ .htaccess | 8 +-- README.md | 17 +++-- assets/static/images/android-censored.png | Bin 74940 -> 177136 bytes assets/static/images/android-configure.png | Bin 69892 -> 237088 bytes assets/static/images/android-connect.png | Bin 69965 -> 239210 bytes assets/static/images/android-new-identity.png | Bin 105151 -> 263142 bytes assets/static/images/android-provide-a-bridge.png | Bin 109572 -> 159176 bytes assets/static/images/android-provided-a-bridge.png | Bin 98794 -> 142112 bytes assets/static/images/android-security-settings.gif | Bin 1345090 -> 714378 bytes assets/static/images/android-select-a-bridge.png | Bin 109560 -> 150983 bytes assets/static/images/android-selected-a-bridge.png | Bin 124065 -> 162159 bytes assets/static/images/circuit_full.png | Bin 39012 -> 51207 bytes assets/static/images/client-auth.png | Bin 0 -> 27810 bytes assets/static/images/favicon.ico | Bin 0 -> 4286 bytes assets/static/images/favicon.png | Bin 0 -> 1184 bytes assets/static/images/new_identity.png | Bin 59280 -> 100975 bytes assets/static/images/onion-location.png | Bin 0 -> 11867 bytes assets/static/images/security-settings-anim.gif | Bin 1119741 -> 592873 bytes assets/static/images/security-settings-safest.png | Bin 136500 -> 78518 bytes content/bridges/contents.lr | 18 ++--- content/circumvention/contents.lr | 4 +- content/downloading/contents.lr | 8 +-- content/installation/contents.lr | 16 +++-- content/known-issues/contents.lr | 27 +++++--- content/managing-identities/contents.lr | 4 +- content/menu/contents.lr | 2 +- content/mobile-tor/contents.lr | 75 ++++++++++----------- content/onion-services/contents.lr | 56 +++++++++++++-- content/plugins/contents.lr | 2 +- content/running-tor-browser/contents.lr | 10 +-- content/security-settings/contents.lr | 6 +- content/troubleshooting/contents.lr | 41 +++++++++-- content/updating/contents.lr | 6 +- databags/alternatives.ini | 12 ---- databags/topics.ini | 4 -- lego | 2 +- manual.lektorproject | 29 ++++---- templates/layout.html | 4 ++ templates/macros/topic.html | 2 +- templates/sidenav.html | 2 +- 41 files changed, 274 insertions(+), 143 deletions(-)