[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [manual/master] Merge branch 'master' into develop



commit 88c18cabb9fdebb822a50d06fa85c115b51fa6e0
Merge: 596f1e7 469ffec
Author: emma peel <emma.peel@xxxxxxxxxx>
Date:   Wed Jan 15 14:15:23 2020 +0100

    Merge branch 'master' into develop

 .htaccess                                          |    4 +-
 README.md                                          |    6 +-
 assets/static/images/circuit_full.png              |  Bin 95537 -> 39012 bytes
 assets/static/images/configure.png                 |  Bin 38448 -> 19559 bytes
 assets/static/images/connect.png                   |  Bin 38418 -> 19565 bytes
 assets/static/images/home/png/block-trackers.png   |  Bin 0 -> 18192 bytes
 .../static/images/home/png/block-trackers@xxxxxx   |  Bin 0 -> 42047 bytes
 .../static/images/home/png/block-trackers@xxxxxx   |  Bin 0 -> 66496 bytes
 assets/static/images/home/png/browse-freely.png    |  Bin 0 -> 27282 bytes
 assets/static/images/home/png/browse-freely@xxxxxx |  Bin 0 -> 62800 bytes
 assets/static/images/home/png/browse-freely@xxxxxx |  Bin 0 -> 99137 bytes
 assets/static/images/home/png/encryption.png       |  Bin 0 -> 19727 bytes
 assets/static/images/home/png/encryption@xxxxxx    |  Bin 0 -> 44050 bytes
 assets/static/images/home/png/encryption@xxxxxx    |  Bin 0 -> 70895 bytes
 assets/static/images/home/png/fingerprinting.png   |  Bin 0 -> 28619 bytes
 .../static/images/home/png/fingerprinting@xxxxxx   |  Bin 0 -> 64240 bytes
 .../static/images/home/png/fingerprinting@xxxxxx   |  Bin 0 -> 100068 bytes
 assets/static/images/home/png/surveillance.png     |  Bin 0 -> 18021 bytes
 assets/static/images/home/png/surveillance@xxxxxx  |  Bin 0 -> 40297 bytes
 assets/static/images/home/png/surveillance@xxxxxx  |  Bin 0 -> 63810 bytes
 assets/static/images/home/png/take-back@xxxxxx     |  Bin 0 -> 124543 bytes
 assets/static/images/home/svg/block-trackers.svg   |    1 +
 assets/static/images/home/svg/browse-freely.svg    |    1 +
 assets/static/images/home/svg/encryption.svg       |    1 +
 assets/static/images/home/svg/fingerprinting.svg   |    1 +
 assets/static/images/home/svg/surveillance.svg     |    1 +
 assets/static/images/home/svg/take-back.svg        | 7902 ++++++++++++++++++++
 assets/static/images/new_identity.png              |  Bin 200208 -> 59280 bytes
 assets/static/images/proxy.png                     |  Bin 44796 -> 17987 bytes
 assets/static/images/proxy_question.png            |  Bin 29964 -> 9105 bytes
 assets/static/images/security-settings-anim.gif    |  Bin 1008790 -> 1119741 bytes
 assets/static/images/security-settings-safest.png  |  Bin 657327 -> 136500 bytes
 .../static/images/tor-launcher-custom-bridges.png  |  Bin 47279 -> 19072 bytes
 assets/static/images/update1.png                   |  Bin 32685 -> 9822 bytes
 assets/static/images/update3.png                   |  Bin 50445 -> 0 bytes
 assets/static/images/update4.png                   |  Bin 34917 -> 4429 bytes
 configs/i18n.ini                                   |    2 +-
 content/about/contents.lr                          |    2 +-
 content/bridges/contents.lr                        |    6 +-
 content/circumvention/contents.lr                  |    4 +-
 content/downloading/contents.lr                    |   10 +-
 content/managing-identities/contents.lr            |   10 +-
 content/menu/contents.lr                           |   11 +-
 content/onion-services/contents.lr                 |    6 +-
 content/plugins/contents.lr                        |    6 +-
 content/running-tor-browser/contents.lr            |    4 +-
 content/security-settings/contents.lr              |    6 +-
 content/transports/contents.lr                     |   56 +-
 content/troubleshooting/contents.lr                |    6 +-
 content/updating/contents.lr                       |   14 +-
 databags/alternatives.ini                          |   17 +-
 databags/links.ini                                 |    1 +
 databags/menu+ar.ini                               |    1 -
 databags/menu+bn-BD.ini                            |    1 -
 databags/menu+bn.ini                               |    1 -
 databags/menu+ca.ini                               |    1 -
 databags/menu+de.ini                               |    1 -
 databags/menu+el.ini                               |    1 -
 databags/menu+en-US.ini                            |    1 -
 databags/menu+en.ini                               |    1 -
 databags/menu+es-AR.ini                            |    1 -
 databags/menu+es-ES.ini                            |    1 -
 databags/menu+es.ini                               |    1 -
 databags/menu+fr.ini                               |    1 -
 databags/menu+ga.ini                               |    1 -
 databags/menu+he.ini                               |    1 -
 databags/menu+hr.ini                               |    1 -
 databags/menu+id.ini                               |    1 -
 databags/menu+is.ini                               |    1 -
 databags/menu+it.ini                               |    1 -
 databags/menu+ka.ini                               |    1 -
 databags/menu+ko.ini                               |    1 -
 databags/menu+mk.ini                               |    1 -
 databags/menu+pt-BR.ini                            |    1 -
 databags/menu+pt-PT.ini                            |    1 -
 databags/menu+ro.ini                               |    1 -
 databags/menu+ru.ini                               |    1 -
 databags/menu+th.ini                               |    1 -
 databags/menu+tr.ini                               |    1 -
 databags/menu+zh-CN.ini                            |    1 -
 databags/menu.ini                                  |    1 +
 databags/menu_footer+ar.ini                        |   15 -
 databags/menu_footer+bn-BD.ini                     |    1 -
 databags/menu_footer+bn.ini                        |   15 -
 databags/menu_footer+ca.ini                        |   15 -
 databags/menu_footer+de.ini                        |    1 -
 databags/menu_footer+el.ini                        |   15 -
 databags/menu_footer+en-US.ini                     |   15 -
 databags/menu_footer+en.ini                        |    1 -
 databags/menu_footer+es-AR.ini                     |   15 -
 databags/menu_footer+es-ES.ini                     |   15 -
 databags/menu_footer+es.ini                        |    1 -
 databags/menu_footer+fr.ini                        |    1 -
 databags/menu_footer+ga.ini                        |   15 -
 databags/menu_footer+he.ini                        |   15 -
 databags/menu_footer+hr.ini                        |   15 -
 databags/menu_footer+id.ini                        |    1 -
 databags/menu_footer+is.ini                        |    1 -
 databags/menu_footer+it.ini                        |    1 -
 databags/menu_footer+ka.ini                        |    1 -
 databags/menu_footer+ko.ini                        |    1 -
 databags/menu_footer+mk.ini                        |   15 -
 databags/menu_footer+pt-BR.ini                     |    1 -
 databags/menu_footer+pt-PT.ini                     |   15 -
 databags/menu_footer+ro.ini                        |   15 -
 databags/menu_footer+ru.ini                        |    1 -
 databags/menu_footer+th.ini                        |   15 -
 databags/menu_footer+tr.ini                        |    1 -
 databags/menu_footer+zh-CN.ini                     |    1 -
 databags/menu_footer+zh-HK.ini                     |   15 -
 databags/menu_footer+zh-TW.ini                     |   15 -
 databags/menu_footer.ini                           |    1 +
 databags/topics+ar.ini                             |    1 -
 databags/topics+bn.ini                             |    1 -
 databags/topics+ca.ini                             |    1 -
 databags/topics+de.ini                             |    1 -
 databags/topics+el.ini                             |    1 -
 databags/topics+en-US.ini                          |    1 -
 databags/topics+es-AR.ini                          |    1 -
 databags/topics+es-ES.ini                          |    1 -
 databags/topics+es.ini                             |    1 -
 databags/topics+fr.ini                             |    1 -
 databags/topics+ga.ini                             |    1 -
 databags/topics+he.ini                             |    1 -
 databags/topics+hr.ini                             |    1 -
 databags/topics+id.ini                             |    1 -
 databags/topics+is.ini                             |    1 -
 databags/topics+it.ini                             |    1 -
 databags/topics+ka.ini                             |    1 -
 databags/topics+mk.ini                             |    1 -
 databags/topics+pt-BR.ini                          |    1 -
 databags/topics+pt-PT.ini                          |    1 -
 databags/topics+ro.ini                             |    1 -
 databags/topics+ru.ini                             |    1 -
 databags/topics+th.ini                             |    1 -
 databags/topics+tr.ini                             |    1 -
 databags/topics+zh-CN.ini                          |    1 -
 databags/{topics+en.ini => topics.ini}             |    0
 lego                                               |    2 +-
 manual.lektorproject                               |   15 +-
 templates/banner.html                              |    1 +
 templates/layout.html                              |    8 +-
 templates/macros/topic.html                        |    2 +-
 templates/sidenav.html                             |    4 +-
 144 files changed, 7990 insertions(+), 429 deletions(-)

diff --cc content/menu/contents.lr
index fd82e3a,f10ccc0..ace6abd
--- a/content/menu/contents.lr
+++ b/content/menu/contents.lr
@@@ -35,6 -32,7 +32,8 @@@ Plugin
  Troubleshooting
  Uninstalling
  Known issues
 +Mobile Tor
  Becoming a Tor Translator
+ Making Tor Browser portable
+ Installation
  



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits