[tor-commits] [manual/master] Merge master

[gus@xxxxxxxxxxxxxx]

commit d5ba56ba13eaabbcff65e8a3c24cbacaa51c9312
Merge: 2c3a721 61415a7
Author: Pili Guerra <pili@xxxxxxxxxxxxxx>
Date:   Thu Apr 2 18:26:58 2020 +0100

    Merge master

 assets/static/images/bridges-dark-tb90.png   | Bin 0 -> 839754 bytes
 assets/static/images/bridges-light-tb90.png  | Bin 0 -> 840100 bytes
 assets/static/images/pluggable-transport.png | Bin 0 -> 17010 bytes
 content/mobile-tor/contents.lr               |  11 +++++++----
 content/plugins/contents.lr                  |   2 +-
 content/running-tor-browser/contents.lr      |  17 ++++++++++++-----
 content/security-settings/contents.lr        |   2 +-
 databags/topics.ini                          |  12 ++++++++----
 8 files changed, 29 insertions(+), 15 deletions(-)

diff --cc databags/topics.ini
index e960880,9fc3c67..ce0a4d5
--- a/databags/topics.ini
+++ b/databags/topics.ini
@@@ -60,8 -60,12 +60,12 @@@ label = Troubleshootin
  
  [known-issues]
  path = known-issues
- label = Known issues
+ label = Known Issues
+ 
+ [mobile-tor]
+ path = mobile-tor
+ label = Mobile Tor
  
 -[becoming-tor-translator]
 -path = becoming-tor-translator
 -label = Becoming a Tor Translator
 +[mobile-tor]
 +path = mobile-tor
 +label = Mobile Tor



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