[tor-commits] [translation/tor_outreach_md_completed] Update translations for tor_outreach_md_completed

[translation]

commit 92e7bff8954e5ba6fcf18d60d7fec013517b9768
Author: Translation commit bot 
Date:   Fri Apr 26 05:50:31 2019 +

Update translations for tor_outreach_md_completed
---
 tor-outreach2019-2020-zh_CN.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tor-outreach2019-2020-zh_CN.md b/tor-outreach2019-2020-zh_CN.md
index 3fb175607..7bc3f647b 100644
--- a/tor-outreach2019-2020-zh_CN.md
+++ b/tor-outreach2019-2020-zh_CN.md
@@ -131,9 +131,9 @@ Tor帮助保护记者，人权斗士，家庭暴力受害者
，学术研究人
 
 
Tor为隐私而设计。我们不知道我们的用户是谁，也不会保存用户活动的记录。
 
-Tor relay operators cannot reveal the true identity of Tor users.
+Tor中继运行者无法揭示Tor用户的真实身份。
 
-Continual peer review of Tor's source code by academic and open source 
communities ensures that there are no backdoors in Tor, and our social contract 
promises that we will never backdoor Tor. 
+学术界和开源社区对Tor的源代ç 
è¿›è¡ŒæŒç»­çš„同行评审，确保Tor没有后门，我们的社会契约也承诺我们永远不会对Tor留有后门。
 
 ## 7. 加入Tor社区
 

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

[tor-commits] [translation/tor_outreach_md] Update translations for tor_outreach_md

[translation]

commit c7c29b7852c9dc037aeba1f64cbad67408cf85c3
Author: Translation commit bot 
Date:   Fri Apr 26 05:50:25 2019 +

Update translations for tor_outreach_md
---
 tor-outreach2019-2020-zh_CN.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tor-outreach2019-2020-zh_CN.md b/tor-outreach2019-2020-zh_CN.md
index c4a2f17f9..7bc3f647b 100644
--- a/tor-outreach2019-2020-zh_CN.md
+++ b/tor-outreach2019-2020-zh_CN.md
@@ -129,11 +129,11 @@ Tor帮助保护记者
，人权斗士，家庭暴力受害者，学术研究人
 
 ## 6. 为什么信任Tor？
 
-Tor is designed for privacy. We don’t know who our users are, and we don't 
keep logs of user activity.
+Tor为隐私而设计。我们不知道我们的用户是谁，也不会保存用户活动的记录。
 
-Tor relay operators cannot reveal the true identity of Tor users.
+Tor中继运行者无法揭示Tor用户的真实身份。
 
-Continual peer review of Tor's source code by academic and open source 
communities ensures that there are no backdoors in Tor, and our social contract 
promises that we will never backdoor Tor. 
+学术界和开源社区对Tor的源代ç 
è¿›è¡ŒæŒç»­çš„同行评审，确保Tor没有后门，我们的社会契约也承诺我们永远不会对Tor留有后门。
 
 ## 7. 加入Tor社区
 

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

[tor-commits] [translation/tor_outreach_md_completed] Update translations for tor_outreach_md_completed

[translation]

commit 26c62f06e38d1e4f33204af023666343b758acd0
Author: Translation commit bot 
Date:   Fri Apr 26 05:20:19 2019 +

Update translations for tor_outreach_md_completed
---
 tor-outreach2019-2020-zh_CN.md | 162 +
 1 file changed, 162 insertions(+)

diff --git a/tor-outreach2019-2020-zh_CN.md b/tor-outreach2019-2020-zh_CN.md
new file mode 100644
index 0..3fb175607
--- /dev/null
+++ b/tor-outreach2019-2020-zh_CN.md
@@ -0,0 +1,162 @@
+# Tor推广材料 2019-2020
+
+# 1. 为了隐私的Tor
+
+### 隐私是一项人权
+
+像我们中的许多人一æ 
·ï¼ŒAleisha将大部分时间花在网上——与朋友联系，在社交媒体上发布以及浏览网页。
+
+但是最近，她注意到与之前她搜索相å…
³çš„广告在网上追踪她。
+
+这种感觉非常具有侵略性，所以她对在线广告进行了一些ç 
”究，并了解到不仅
是广告客户追踪她，还有她的服务商，分析å…
¬å¸ï¼Œç¤¾äº¤åª’体平台等等也在追踪她。
+
+Aleisha决定她要找到并使用不收集她数据，不跟踪她，也不会告诉å
…¶ä»–服务任何关于她的私人信息的软件。
+
+她参加了当地黑客空间的隐私培训，并了解到了**Tor 
Browser**，这是唯一能让她匿名浏览的网络浏览器。
+
+---
+
+# 2. 为了女权的Tor
+
+### The future is cyberfeminist
+
+Fernanda在å 
•èƒŽéžæ³•çš„巴西设立了一个专注于生殖权利的妇女集体。
+
+Fernanda和她的同事建立了一个网站，为寻求生殖信息的人提供有å
…³å •èƒŽï¼Œç”Ÿè‚²æŽ§åˆ¶å’Œå…¶ä»–资源。
+
+如果这个网站被联系到她们，她们可能会被逮捕——或者
更糟。
+
+为了保护自己，Fernanda和她的同事使用Tor **洋葱服务** 
创建了网站。 洋葱服务不仅
可以保护它们不被发现作为服务器的运营者
，还可以通过要求使用Tor Browser来帮助保护其网站的访问者。
+
+实际上，Fernanda使用**Tor 
Browser**进行所有网页浏览只是为了处于安全一侧。
+
+她还使用有Tor支持的名为** OnionShare **的应用程序安å…
¨ç§å¯†åœ°å‘其他社运人士发送文件。
+
+### 像Fernanda这æ 
·çš„生殖权社运人士正在为基本的自由而战，而Tor则帮助增强他们的抗争。
+
+---
+
+# 3. 为了人权的Tor
+
+### 水是生命之源
+
+Jelani住在一个有大河流过的小村庄。
+
+从他的祖辈时起，这条河就为他的社区提供水源。
+
+但是今天，Jelani的河受到在当地钻探石油的强大跨国å…
¬å¸çš„威胁。
+
+由这些公司支付的私人保安å…
¬å¸ä½¿ç”¨å¼ºå¤§çš„监控机制来监控Jelani及å…
¶æ‘民的在线活动，他们正在组织保护他们的神圣河流。
+
+Jelani使用**Tor Browser**来让他在访问国际
人权保护和法律援助网站并撰写关于å…
¶æ‘庄抵抗运动的博客文章时免受这些公司的窥探。
+
+他还使用**OnionShare**和**SecureDrop**安å…
¨åœ°å‘正在帮助揭露这些侵犯人权行为的记者发送文件。
+
+所有这些软件都使用了Tor来保护Jelani的隐私。
+
+### 像Jelani这æ 
·çš„人权社运人士正在为他们的社区争取正义，而Tor则帮助增强他们的抗争。
+
+---
+
+# 4. 为了反审查的Tor
+
+### 造桥而非建墙
+
+Jean第一次去了一个原理他的家人的国家。
+
+在抵达酒店后，他打开了他的笔记本电脑。
+
+当他的网络浏览器首次出现“连接超
时”的信息时，他感到身心俱疲，他认为这是由于他自己的失误。
+
+但在不断的尝试后，他意识到他的电子邮件提供商，新闻网站和许多应用程序都æ—
 æ³•ä½¿ç”¨ã€‚
+
+他听说这个国家审查互联网并想知道这是否正在发生。
+他怎么能从这个难以穿透的墙后面联系他的家人？
+在进行了一些网络搜索之后，他找到了一个论坛并读到了有å
…³VPN的信息，这些私有服务允许你
连接到另一个没有被审查的网络。
+
+Jean花了半个小时尝试来找出哪个便宜的VPN是最好的。
+
+他选择了一个似乎工作了一阵的，但五分钟后连接脱机，VPN再也连接不上了。
+
+Jean继续阅读以寻找其他选项并了解到了Tor 
Browser及它如何规避审查。
+
+他找到了一个官网镜像来下载这个程序。
+
+当他打开**Tor Browser**时，他按ç…
§ç»™å—到审查用户的提示连接到了一个网桥，这使他能够再次访问互联网。
+
+使用Tor Browser让Jean能自由私密地浏览并联系他的家人。
+
+### 世界各地的受审查用户依靠Tor Browser来以å…
è´¹ï¼Œç¨³å®šå’Œæœªç»å®¡æŸ¥çš„方式访问互联网。
+
+---
+
+# 5. 分享部分
+
+## 什么是 Tor？
+
+Tor是免费软件和开放式网络，有助于保护您å…
å—在线跟踪，监控和审查。
+Tor由一家名为Tor Project的501(c)3美国非营利组织免费创建。
+
+使用Tor的最简单方法是Tor Browser。
+当您使用Tor 

[tor-commits] [translation/tor_outreach_md] Update translations for tor_outreach_md

[translation]

commit 5e11343a7f1206a6b8b4a6fd7ab2d136c6b0b1f3
Author: Translation commit bot 
Date:   Fri Apr 26 05:20:14 2019 +

Update translations for tor_outreach_md
---
 tor-outreach2019-2020-zh_CN.md | 64 +-
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/tor-outreach2019-2020-zh_CN.md b/tor-outreach2019-2020-zh_CN.md
index 31d9fbf66..c4a2f17f9 100644
--- a/tor-outreach2019-2020-zh_CN.md
+++ b/tor-outreach2019-2020-zh_CN.md
@@ -32,7 +32,7 @@ 
Fernanda和她的同事建立了一个网站，为寻求生殖信息的人提供
 
 她还使用有Tor支持的名为** OnionShare **的应用程序安å…
¨ç§å¯†åœ°å‘其他社运人士发送文件。
 
-### 像Fernanda这æ 
·çš„生殖权社运人士正在为基本的自由而战，而Tor则增强他们的抵抗。
+### 像Fernanda这æ 
·çš„生殖权社运人士正在为基本的自由而战，而Tor则帮助增强他们的抗争。
 
 ---
 
@@ -48,13 +48,13 @@ Jelani住在一个有大河流过的小村庄。
 
 由这些公司支付的私人保安å…
¬å¸ä½¿ç”¨å¼ºå¤§çš„监控机制来监控Jelani及å…
¶æ‘民的在线活动，他们正在组织保护他们的神圣河流。
 
-Jelani uses **Tor Browser** to prevent these companies from watching as he 
visits websites for international human rights protection and legal aid and 
writes blog posts about the resistance movement in his village.
+Jelani使用**Tor Browser**来让他在访问国际
人权保护和法律援助网站并撰写关于å…
¶æ‘庄抵抗运动的博客文章时免受这些公司的窥探。
 
-He also uses **OnionShare** and **SecureDrop** to securely send documents to 
journalists who are helping expose these human rights violations.
+他还使用**OnionShare**和**SecureDrop**安å…
¨åœ°å‘正在帮助揭露这些侵犯人权行为的记者发送文件。
 
-All of this software uses Tor to help protect Jelani’s privacy. 
+所有这些软件都使用了Tor来保护Jelani的隐私。
 
-### Human rights activists like Jelani are fighting for justice in their 
communities, and Tor helps power their resistance.
+### 像Jelani这æ 
·çš„人权社运人士正在为他们的社区争取正义，而Tor则帮助增强他们的抗争。
 
 ---
 
@@ -62,31 +62,31 @@ All of this software uses Tor to help protect Jelani’s 
privacy.
 
 ### 造桥而非建墙
 
-Jean was traveling for the first time to a country far from his family.
+Jean第一次去了一个原理他的家人的国家。
 
-After arriving at a hotel, he opened his laptop.
+在抵达酒店后，他打开了他的笔记本电脑。
 
-He was so exhausted that when the message "Connection has timed out" first 
appeared on his web browser, he thought it was due to his own error.
+当他的网络浏览器首次出现“连接超
时”的信息时，他感到身心俱疲，他认为这是由于他自己的失误。
 
-But after trying again and again, he realized that his email provider, a news 
website, and many apps were unavailable. 
+但在不断的尝试后，他意识到他的电子邮件提供商，新闻网站和许多应用程序都æ—
 æ³•ä½¿ç”¨ã€‚
 
-He had heard that this country censors the internet and wondered if that was 
happening.
-How could he contact his family from behind this impenetrable wall?
-After doing some web searches, he found a forum and read about VPNs, private 
services that allow you to connect to another uncensored network.
+他听说这个国家审查互联网并想知道这是否正在发生。
+他怎么能从这个难以穿透的墙后面联系他的家人？
+在进行了一些网络搜索之后，他找到了一个论坛并读到了有å
…³VPN的信息，这些私有服务允许你
连接到另一个没有被审查的网络。
 
-Jean spent half an hour trying to figure out which cheap VPN was best.
+Jean花了半个小时尝试来找出哪个便宜的VPN是最好的。
 
-He chose one and for a moment it seemed to work, but after five minutes the 
connection went offline and the VPN would no longer connect. 
+他选择了一个似乎工作了一阵的，但五分钟后连接脱机，VPN再也连接不上了。
 
-Jean kept reading to find other options and learned about Tor Browser and how 
it can circumvent censorship.
+Jean继续阅读以寻找其他选项并了解到了Tor 
Browser及它如何规避审查。
 
-He found an official website mirror to download the program.
+他找到了一个官网镜像来下载这个程序。
 
-When he opened **Tor Browser**, he followed the prompts for censored users and 
connected to a bridge which allowed him to access the internet again.
+当他打开**Tor Browser**时，他按ç…
§ç»™å—到审查用户的提示连接到了一个网桥，这使他能够再次访问互联网。
 
-With Tor Browser, Jean can browse freely and privately and contact his family. 
+使用Tor Browser让Jean能自由私密地浏览并联系他的家人。
 
-### Censored users all over the world rely on Tor Browser for a free, stable, 

[tor-commits] [translation/tor_outreach_md] Update translations for tor_outreach_md

[translation]

commit 6c71d86cd92025fa565d880a3f38a221485ebd76
Author: Translation commit bot 
Date:   Fri Apr 26 04:49:59 2019 +

Update translations for tor_outreach_md
---
 tor-outreach2019-2020-zh_CN.md | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tor-outreach2019-2020-zh_CN.md b/tor-outreach2019-2020-zh_CN.md
index 495471975..31d9fbf66 100644
--- a/tor-outreach2019-2020-zh_CN.md
+++ b/tor-outreach2019-2020-zh_CN.md
@@ -20,19 +20,19 @@ 
Aleisha决定她要找到并使用不收集她数据，不跟踪她，也不会
 
 ### The future is cyberfeminist
 
-Fernanda runs a women's collective focused on reproductive rights in Brazil, 
where abortion is illegal.
+Fernanda在å 
•èƒŽéžæ³•çš„巴西设立了一个专注于生殖权利的妇女集体。
 
-Fernanda and her colleagues built a website with information about abortion 
access, birth control, and other resources for people seeking reproductive 
information.
+Fernanda和她的同事建立了一个网站，为寻求生殖信息的人提供有å
…³å •èƒŽï¼Œç”Ÿè‚²æŽ§åˆ¶å’Œå…¶ä»–资源。
 
-If this website was linked back to them, they could be arrested--or worse. 
+如果这个网站被联系到她们，她们可能会被逮捕——或者
更糟。
 
-To protect themselves, Fernanda and her colleagues created the website using 
Tor **onion services**. Onion services not only protect them from being 
discovered as the operators of the server but also help protect visitors to 
their website by requiring they use Tor Browser. 
+为了保护自己，Fernanda和她的同事使用Tor **洋葱服务** 
创建了网站。 洋葱服务不仅
可以保护它们不被发现作为服务器的运营者
，还可以通过要求使用Tor Browser来帮助保护其网站的访问者。
 
-In fact, Fernanda uses **Tor Browser** for all of her web browsing just to be 
on the safe side.
+实际上，Fernanda使用**Tor 
Browser**进行所有网页浏览只是为了处于安全一侧。
 
-She also uses a Tor-powered app called **OnionShare** to send files to other 
activists securely and privately. 
+她还使用有Tor支持的名为** OnionShare **的应用程序安å…
¨ç§å¯†åœ°å‘其他社运人士发送文件。
 
-### Reproductive rights activists like Fernanda are fighting for fundamental 
freedoms, and Tor helps power their resistance.
+### 像Fernanda这æ 
·çš„生殖权社运人士正在为基本的自由而战，而Tor则增强他们的抵抗。
 
 ---
 
@@ -40,13 +40,13 @@ She also uses a Tor-powered app called **OnionShare** to 
send files to other act
 
 ### 水是生命之源
 
-Jelani lives in a small village  which a wide river runs through.
+Jelani住在一个有大河流过的小村庄。
 
-This river has provided water to his community since the days of his 
ancestors. 
+从他的祖辈时起，这条河就为他的社区提供水源。
 
-But today, Jelani’s river is threatened by powerful multinational companies 
drilling for oil in the region.
+但是今天，Jelani的河受到在当地钻探石油的强大跨国å…
¬å¸çš„威胁。
 
-Private security firms, paid for by these companies, use powerful surveillance 
mechanisms to monitor the online activities of Jelani and his neighbors in the 
village who are organizing to protect their sacred river. 
+由这些公司支付的私人保安å…
¬å¸ä½¿ç”¨å¼ºå¤§çš„监控机制来监控Jelani及å…
¶æ‘民的在线活动，他们正在组织保护他们的神圣河流。
 
 Jelani uses **Tor Browser** to prevent these companies from watching as he 
visits websites for international human rights protection and legal aid and 
writes blog posts about the resistance movement in his village.
 

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

[tor-commits] [tor/master] Remove callback for setting bridges as running

[nickm]

commit c07d854772bda558ef8cf4fd71f2673c7ed00083
Author: Neel Chauhan 
Date:   Thu Apr 11 21:28:35 2019 -0400

Remove callback for setting bridges as running
---
 changes/bug24490 |  2 +-
 scripts/maint/practracker/exceptions.txt |  8 
 src/core/mainloop/mainloop.c | 20 
 src/feature/nodelist/networkstatus.c |  5 -
 4 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/changes/bug24490 b/changes/bug24490
index 1167e9f8d..cf9281c87 100644
--- a/changes/bug24490
+++ b/changes/bug24490
@@ -1,5 +1,5 @@
   o Minor bugfixes (bridge authority):
-- We set bridges as running in a callback which runs every 5 minutes.
+- We set bridges as running when we dump the bridge status to a file.
   Previously, we set bridges as running in a GETINFO controller, but
   these shouldn't modify vital data structures. Fixes bug 24490;
   bugfix on 0.2.0.13-alpha. Patch by Neel Chauhan
diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index 7b06683eb..ad5d3e972 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -67,11 +67,11 @@ problem function-size 
/src/core/mainloop/connection.c:connection_handle_read_imp
 problem function-size 
/src/core/mainloop/connection.c:connection_buf_read_from_socket() 177
 problem function-size 
/src/core/mainloop/connection.c:connection_handle_write_impl() 241
 problem function-size /src/core/mainloop/connection.c:assert_connection_ok() 
143
-problem file-size /src/core/mainloop/mainloop.c 3071
-problem include-count /src/core/mainloop/mainloop.c 68
+problem file-size /src/core/mainloop/mainloop.c 3051
+problem include-count /src/core/mainloop/mainloop.c 66
 problem function-size /src/core/mainloop/mainloop.c:conn_close_if_marked() 108
 problem function-size 
/src/core/mainloop/mainloop.c:run_connection_housekeeping() 123
-problem function-size /src/core/mainloop/mainloop.c:CALLBACK() 118
+problem function-size /src/core/mainloop/mainloop.c:CALLBACK() 116
 problem file-size /src/core/or/channel.c 3476
 problem function-size /src/core/or/channeltls.c:channel_tls_handle_var_cell() 
160
 problem function-size 
/src/core/or/channeltls.c:channel_tls_process_versions_cell() 170
@@ -276,7 +276,7 @@ problem function-size 
/src/lib/net/resolve.c:tor_addr_lookup() 110
 problem function-size /src/lib/net/socketpair.c:tor_ersatz_socketpair() 102
 problem function-size /src/lib/osinfo/uname.c:get_uname() 116
 problem function-size /src/lib/process/process_unix.c:process_unix_exec() 220
-problem function-size /src/lib/process/process_win32.c:process_win32_exec() 133
+problem function-size /src/lib/process/process_win32.c:process_win32_exec() 138
 problem function-size 
/src/lib/process/process_win32.c:process_win32_create_pipe() 112
 problem function-size /src/lib/process/restrict.c:set_max_file_descriptors() 
102
 problem function-size /src/lib/process/setuid.c:switch_id() 156
diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c
index e845ff416..c9f2b0d89 100644
--- a/src/core/mainloop/mainloop.c
+++ b/src/core/mainloop/mainloop.c
@@ -76,7 +76,6 @@
 #include "feature/control/control_events.h"
 #include "feature/dirauth/authmode.h"
 #include "feature/dirauth/reachability.h"
-#include "feature/dirauth/voteflags.h"
 #include "feature/dircache/consdiffmgr.h"
 #include "feature/dircache/dirserv.h"
 #include "feature/dircommon/directory.h"
@@ -88,7 +87,6 @@
 #include "feature/nodelist/networkstatus.h"
 #include "feature/nodelist/nodelist.h"
 #include "feature/nodelist/routerlist.h"
-#include "feature/nodelist/routerlist_st.h"
 #include "feature/relay/dns.h"
 #include "feature/relay/routerkeys.h"
 #include "feature/relay/routermode.h"
@@ -1377,7 +1375,6 @@ CALLBACK(rotate_onion_key);
 CALLBACK(rotate_x509_certificate);
 CALLBACK(save_stability);
 CALLBACK(save_state);
-CALLBACK(set_bridge_running);
 CALLBACK(write_bridge_ns);
 CALLBACK(write_stats_file);
 CALLBACK(control_per_second_events);
@@ -1456,7 +1453,6 @@ STATIC periodic_event_item_t periodic_events[] = {
 
   /* Bridge Authority only. */
   CALLBACK(write_bridge_ns, BRIDGEAUTH, 0),
-  CALLBACK(set_bridge_running, BRIDGEAUTH, 0),
 
   /* Directory server only. */
   CALLBACK(clean_consdiffmgr, DIRSERVER, 0),
@@ -2587,22 +2583,6 @@ write_bridge_ns_callback(time_t now, const or_options_t 
*options)
   return PERIODIC_EVENT_NO_UPDATE;
 }
 
-/**
- * Periodic callback: if we're the bridge authority, set the running flag on
- * bridges if they're reachable
- */
-static int
-set_bridge_running_callback(time_t now, const or_options_t *options)
-{
-  if (authdir_mode_bridge(options)) {
-dirserv_set_bridges_running(now);
-
-#define SET_BRIDGES_RUNNING_INTERVAL (5*60)
-return SET_BRIDGES_RUNNING_INTERVAL;
-  }
-  return PERIODIC_EVENT_NO_UPDATE;
-}
-
 static int heartbeat_callback_first_time = 1;
 
 /**
diff --git 

[tor-commits] [tor/master] Remove unused get_options()

[nickm]

commit cc87acf29b40a135745f74412caaececf8ea0329
Author: Neel Chauhan 
Date:   Sun Apr 14 14:51:42 2019 -0400

Remove unused get_options()
---
 src/feature/control/fmt_serverstatus.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/feature/control/fmt_serverstatus.c 
b/src/feature/control/fmt_serverstatus.c
index 1fc5d4a15..d224a1d23 100644
--- a/src/feature/control/fmt_serverstatus.c
+++ b/src/feature/control/fmt_serverstatus.c
@@ -66,7 +66,6 @@ list_server_status_v1(smartlist_t *routers, char 
**router_status_out,
   smartlist_t *rs_entries;
   time_t now = time(NULL);
   time_t cutoff = now - ROUTER_MAX_AGE_TO_PUBLISH;
-  const or_options_t *options = get_options();
   /* We include v2 dir auths here too, because they need to answer
* controllers. Eventually we'll deprecate this whole function;
* see also networkstatus_getinfo_by_purpose(). */



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

[tor-commits] [tor/master] Move code for setting bridges as running to voteflags.c

[nickm]

commit 4172dcaa62b02593910736110d9d2c94052dbdcb
Author: Neel Chauhan 
Date:   Thu Apr 11 20:44:30 2019 -0400

Move code for setting bridges as running to voteflags.c
---
 scripts/maint/practracker/exceptions.txt |  4 ++--
 src/core/mainloop/mainloop.c |  7 +--
 src/feature/dirauth/voteflags.c  | 18 ++
 src/feature/dirauth/voteflags.h  |  2 ++
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index a9fcf9095..7b06683eb 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -67,7 +67,7 @@ problem function-size 
/src/core/mainloop/connection.c:connection_handle_read_imp
 problem function-size 
/src/core/mainloop/connection.c:connection_buf_read_from_socket() 177
 problem function-size 
/src/core/mainloop/connection.c:connection_handle_write_impl() 241
 problem function-size /src/core/mainloop/connection.c:assert_connection_ok() 
143
-problem file-size /src/core/mainloop/mainloop.c 3076
+problem file-size /src/core/mainloop/mainloop.c 3071
 problem include-count /src/core/mainloop/mainloop.c 68
 problem function-size /src/core/mainloop/mainloop.c:conn_close_if_marked() 108
 problem function-size 
/src/core/mainloop/mainloop.c:run_connection_housekeeping() 123
@@ -276,7 +276,7 @@ problem function-size 
/src/lib/net/resolve.c:tor_addr_lookup() 110
 problem function-size /src/lib/net/socketpair.c:tor_ersatz_socketpair() 102
 problem function-size /src/lib/osinfo/uname.c:get_uname() 116
 problem function-size /src/lib/process/process_unix.c:process_unix_exec() 220
-problem function-size /src/lib/process/process_win32.c:process_win32_exec() 138
+problem function-size /src/lib/process/process_win32.c:process_win32_exec() 133
 problem function-size 
/src/lib/process/process_win32.c:process_win32_create_pipe() 112
 problem function-size /src/lib/process/restrict.c:set_max_file_descriptors() 
102
 problem function-size /src/lib/process/setuid.c:switch_id() 156
diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c
index fd711fd3b..e845ff416 100644
--- a/src/core/mainloop/mainloop.c
+++ b/src/core/mainloop/mainloop.c
@@ -2595,12 +2595,7 @@ static int
 set_bridge_running_callback(time_t now, const or_options_t *options)
 {
   if (authdir_mode_bridge(options)) {
-routerlist_t *rl = router_get_routerlist();
-
-SMARTLIST_FOREACH_BEGIN(rl->routers, routerinfo_t *, ri) {
-  if (ri->purpose == ROUTER_PURPOSE_BRIDGE)
-dirserv_set_router_is_running(ri, now);
-} SMARTLIST_FOREACH_END(ri);
+dirserv_set_bridges_running(now);
 
 #define SET_BRIDGES_RUNNING_INTERVAL (5*60)
 return SET_BRIDGES_RUNNING_INTERVAL;
diff --git a/src/feature/dirauth/voteflags.c b/src/feature/dirauth/voteflags.c
index 0a53c588d..4040f162f 100644
--- a/src/feature/dirauth/voteflags.c
+++ b/src/feature/dirauth/voteflags.c
@@ -29,6 +29,7 @@
 
 #include "feature/nodelist/node_st.h"
 #include "feature/nodelist/routerinfo_st.h"
+#include "feature/nodelist/routerlist_st.h"
 #include "feature/nodelist/vote_routerstatus_st.h"
 
 #include "lib/container/order.h"
@@ -658,3 +659,20 @@ dirserv_set_routerstatus_testing(routerstatus_t *rs)
 rs->is_hs_dir = 0;
   }
 }
+
+/** Use dirserv_set_router_is_running() to set bridges as running if they're
+ * reachable.
+ *
+ * This function is called from set_bridge_running_callback() when running as
+ * a bridge authority.
+ */
+void
+dirserv_set_bridges_running(time_t now)
+{
+  routerlist_t *rl = router_get_routerlist();
+
+  SMARTLIST_FOREACH_BEGIN(rl->routers, routerinfo_t *, ri) {
+if (ri->purpose == ROUTER_PURPOSE_BRIDGE)
+  dirserv_set_router_is_running(ri, now);
+  } SMARTLIST_FOREACH_END(ri);
+}
diff --git a/src/feature/dirauth/voteflags.h b/src/feature/dirauth/voteflags.h
index cca6f5374..18b29a518 100644
--- a/src/feature/dirauth/voteflags.h
+++ b/src/feature/dirauth/voteflags.h
@@ -25,6 +25,8 @@ void set_routerstatus_from_routerinfo(routerstatus_t *rs,
 
 void dirserv_compute_performance_thresholds(digestmap_t *omit_as_sybil);
 
+void dirserv_set_bridges_running(time_t now);
+
 #ifdef VOTEFLAGS_PRIVATE
 /** Any descriptor older than this age causes the authorities to set the
  * StaleDesc flag. */



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

[tor-commits] [tor/master] Remove unused variable in fmt_serverstatus.c

[nickm]

commit 398c736230719e6b8eb539c7b08a5acfc0463db1
Author: Neel Chauhan 
Date:   Thu Apr 11 22:11:27 2019 -0400

Remove unused variable in fmt_serverstatus.c
---
 src/feature/control/fmt_serverstatus.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/feature/control/fmt_serverstatus.c 
b/src/feature/control/fmt_serverstatus.c
index fc1029ae8..1fc5d4a15 100644
--- a/src/feature/control/fmt_serverstatus.c
+++ b/src/feature/control/fmt_serverstatus.c
@@ -70,7 +70,6 @@ list_server_status_v1(smartlist_t *routers, char 
**router_status_out,
   /* We include v2 dir auths here too, because they need to answer
* controllers. Eventually we'll deprecate this whole function;
* see also networkstatus_getinfo_by_purpose(). */
-  int authdir = authdir_mode_publishes_statuses(options);
   tor_assert(router_status_out);
 
   rs_entries = smartlist_new();



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

[tor-commits] [tor/master] Update networkstatus_getinfo_by_purpose() comment

[nickm]

commit 994b8ba424e0e225b3a3b3923044ff900cedfc12
Author: Neel Chauhan 
Date:   Thu Apr 11 21:36:38 2019 -0400

Update networkstatus_getinfo_by_purpose() comment
---
 src/feature/nodelist/networkstatus.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/feature/nodelist/networkstatus.c 
b/src/feature/nodelist/networkstatus.c
index 20881112a..db510c975 100644
--- a/src/feature/nodelist/networkstatus.c
+++ b/src/feature/nodelist/networkstatus.c
@@ -2405,7 +2405,8 @@ networkstatus_getinfo_by_purpose(const char 
*purpose_string, time_t now)
   return answer;
 }
 
-/** Write out router status entries for all our bridge descriptors. */
+/** Write out router status entries for all our bridge descriptors. Here, we
+ * also mark routers as running. */
 void
 networkstatus_dump_bridge_status_to_file(time_t now)
 {



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

[tor-commits] [tor/master] Use authdir_mode_bridge() in set_bridge_running_callback()

[nickm]

commit 30279a7c575d2b27055e511a2f8cf84336387bb8
Author: Neel Chauhan 
Date:   Thu Apr 11 20:28:11 2019 -0400

Use authdir_mode_bridge() in set_bridge_running_callback()
---
 src/core/mainloop/mainloop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c
index 7609c630c..fd711fd3b 100644
--- a/src/core/mainloop/mainloop.c
+++ b/src/core/mainloop/mainloop.c
@@ -2594,7 +2594,7 @@ write_bridge_ns_callback(time_t now, const or_options_t 
*options)
 static int
 set_bridge_running_callback(time_t now, const or_options_t *options)
 {
-  if (options->BridgeAuthoritativeDir) {
+  if (authdir_mode_bridge(options)) {
 routerlist_t *rl = router_get_routerlist();
 
 SMARTLIST_FOREACH_BEGIN(rl->routers, routerinfo_t *, ri) {



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

[tor-commits] [tor/master] Stop setting routers as running in list_server_status_v1()

[nickm]

commit 14d700804568ef5624856976b723eafab9e41972
Author: Neel Chauhan 
Date:   Thu Apr 11 21:30:48 2019 -0400

Stop setting routers as running in list_server_status_v1()
---
 src/feature/control/fmt_serverstatus.c | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/feature/control/fmt_serverstatus.c 
b/src/feature/control/fmt_serverstatus.c
index a1ddd2119..fc1029ae8 100644
--- a/src/feature/control/fmt_serverstatus.c
+++ b/src/feature/control/fmt_serverstatus.c
@@ -78,10 +78,7 @@ list_server_status_v1(smartlist_t *routers, char 
**router_status_out,
   SMARTLIST_FOREACH_BEGIN(routers, routerinfo_t *, ri) {
 const node_t *node = node_get_by_id(ri->cache_info.identity_digest);
 tor_assert(node);
-if (authdir) {
-  /* Update router status in routerinfo_t. */
-  dirserv_set_router_is_running(ri, now);
-}
+
 if (for_controller) {
   char name_buf[MAX_VERBOSE_NICKNAME_LEN+2];
   char *cp = name_buf;



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

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/889'

[nickm]

commit efeb101b968fe6604ff97604afe527a36b94cfc9
Merge: 36b4fc743 cc87acf29
Author: Nick Mathewson 
Date:   Thu Apr 25 20:25:34 2019 -0400

Merge remote-tracking branch 'tor-github/pr/889'

 changes/bug24490   |  5 +
 src/feature/control/fmt_serverstatus.c |  7 +--
 src/feature/dirauth/voteflags.c| 18 ++
 src/feature/dirauth/voteflags.h|  2 ++
 src/feature/nodelist/networkstatus.c   | 12 ++--
 5 files changed, 32 insertions(+), 12 deletions(-)

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

[tor-commits] [tor/master] Fix grammar in bug24490 changes file

[nickm]

commit e16f5184dad6d0052df37496327e2652d9c79d00
Author: Neel Chauhan 
Date:   Thu Apr 11 20:32:38 2019 -0400

Fix grammar in bug24490 changes file
---
 changes/bug24490 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/bug24490 b/changes/bug24490
index 9ae09dbd1..1167e9f8d 100644
--- a/changes/bug24490
+++ b/changes/bug24490
@@ -1,5 +1,5 @@
   o Minor bugfixes (bridge authority):
 - We set bridges as running in a callback which runs every 5 minutes.
-  Previously, we set bridges as running in a GETINFO controller as
+  Previously, we set bridges as running in a GETINFO controller, but
   these shouldn't modify vital data structures. Fixes bug 24490;
   bugfix on 0.2.0.13-alpha. Patch by Neel Chauhan



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

[tor-commits] [tor/master] Make SET_BRIDGES_RUNNING_INTERVAL 5 minutes

[nickm]

commit aa9940ed21e890ddbb0a3541bf15e7cca4c3b489
Author: Neel Chauhan 
Date:   Thu Apr 11 20:24:08 2019 -0400

Make SET_BRIDGES_RUNNING_INTERVAL 5 minutes
---
 src/core/mainloop/mainloop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c
index 800304a73..7609c630c 100644
--- a/src/core/mainloop/mainloop.c
+++ b/src/core/mainloop/mainloop.c
@@ -2602,7 +2602,7 @@ set_bridge_running_callback(time_t now, const 
or_options_t *options)
 dirserv_set_router_is_running(ri, now);
 } SMARTLIST_FOREACH_END(ri);
 
-#define SET_BRIDGES_RUNNING_INTERVAL (3*60)
+#define SET_BRIDGES_RUNNING_INTERVAL (5*60)
 return SET_BRIDGES_RUNNING_INTERVAL;
   }
   return PERIODIC_EVENT_NO_UPDATE;



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

[tor-commits] [tor/master] Stop setting bridges running in networkstatus_getinfo_by_purpose()

[nickm]

commit d4d77b277e72c74a47bd724531426d7f561607e4
Author: Neel Chauhan 
Date:   Wed Apr 3 11:36:52 2019 -0400

Stop setting bridges running in networkstatus_getinfo_by_purpose()
---
 changes/bug24490 |  5 +
 scripts/maint/practracker/exceptions.txt |  6 +++---
 src/core/mainloop/mainloop.c | 25 +
 src/feature/nodelist/networkstatus.c |  4 
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/changes/bug24490 b/changes/bug24490
new file mode 100644
index 0..9ae09dbd1
--- /dev/null
+++ b/changes/bug24490
@@ -0,0 +1,5 @@
+  o Minor bugfixes (bridge authority):
+- We set bridges as running in a callback which runs every 5 minutes.
+  Previously, we set bridges as running in a GETINFO controller as
+  these shouldn't modify vital data structures. Fixes bug 24490;
+  bugfix on 0.2.0.13-alpha. Patch by Neel Chauhan
diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index ad5d3e972..a9fcf9095 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -67,11 +67,11 @@ problem function-size 
/src/core/mainloop/connection.c:connection_handle_read_imp
 problem function-size 
/src/core/mainloop/connection.c:connection_buf_read_from_socket() 177
 problem function-size 
/src/core/mainloop/connection.c:connection_handle_write_impl() 241
 problem function-size /src/core/mainloop/connection.c:assert_connection_ok() 
143
-problem file-size /src/core/mainloop/mainloop.c 3051
-problem include-count /src/core/mainloop/mainloop.c 66
+problem file-size /src/core/mainloop/mainloop.c 3076
+problem include-count /src/core/mainloop/mainloop.c 68
 problem function-size /src/core/mainloop/mainloop.c:conn_close_if_marked() 108
 problem function-size 
/src/core/mainloop/mainloop.c:run_connection_housekeeping() 123
-problem function-size /src/core/mainloop/mainloop.c:CALLBACK() 116
+problem function-size /src/core/mainloop/mainloop.c:CALLBACK() 118
 problem file-size /src/core/or/channel.c 3476
 problem function-size /src/core/or/channeltls.c:channel_tls_handle_var_cell() 
160
 problem function-size 
/src/core/or/channeltls.c:channel_tls_process_versions_cell() 170
diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c
index c9f2b0d89..800304a73 100644
--- a/src/core/mainloop/mainloop.c
+++ b/src/core/mainloop/mainloop.c
@@ -76,6 +76,7 @@
 #include "feature/control/control_events.h"
 #include "feature/dirauth/authmode.h"
 #include "feature/dirauth/reachability.h"
+#include "feature/dirauth/voteflags.h"
 #include "feature/dircache/consdiffmgr.h"
 #include "feature/dircache/dirserv.h"
 #include "feature/dircommon/directory.h"
@@ -87,6 +88,7 @@
 #include "feature/nodelist/networkstatus.h"
 #include "feature/nodelist/nodelist.h"
 #include "feature/nodelist/routerlist.h"
+#include "feature/nodelist/routerlist_st.h"
 #include "feature/relay/dns.h"
 #include "feature/relay/routerkeys.h"
 #include "feature/relay/routermode.h"
@@ -1375,6 +1377,7 @@ CALLBACK(rotate_onion_key);
 CALLBACK(rotate_x509_certificate);
 CALLBACK(save_stability);
 CALLBACK(save_state);
+CALLBACK(set_bridge_running);
 CALLBACK(write_bridge_ns);
 CALLBACK(write_stats_file);
 CALLBACK(control_per_second_events);
@@ -1453,6 +1456,7 @@ STATIC periodic_event_item_t periodic_events[] = {
 
   /* Bridge Authority only. */
   CALLBACK(write_bridge_ns, BRIDGEAUTH, 0),
+  CALLBACK(set_bridge_running, BRIDGEAUTH, 0),
 
   /* Directory server only. */
   CALLBACK(clean_consdiffmgr, DIRSERVER, 0),
@@ -2583,6 +2587,27 @@ write_bridge_ns_callback(time_t now, const or_options_t 
*options)
   return PERIODIC_EVENT_NO_UPDATE;
 }
 
+/**
+ * Periodic callback: if we're the bridge authority, set the running flag on
+ * bridges if they're reachable
+ */
+static int
+set_bridge_running_callback(time_t now, const or_options_t *options)
+{
+  if (options->BridgeAuthoritativeDir) {
+routerlist_t *rl = router_get_routerlist();
+
+SMARTLIST_FOREACH_BEGIN(rl->routers, routerinfo_t *, ri) {
+  if (ri->purpose == ROUTER_PURPOSE_BRIDGE)
+dirserv_set_router_is_running(ri, now);
+} SMARTLIST_FOREACH_END(ri);
+
+#define SET_BRIDGES_RUNNING_INTERVAL (3*60)
+return SET_BRIDGES_RUNNING_INTERVAL;
+  }
+  return PERIODIC_EVENT_NO_UPDATE;
+}
+
 static int heartbeat_callback_first_time = 1;
 
 /**
diff --git a/src/feature/nodelist/networkstatus.c 
b/src/feature/nodelist/networkstatus.c
index ea9f12367..bc12fa407 100644
--- a/src/feature/nodelist/networkstatus.c
+++ b/src/feature/nodelist/networkstatus.c
@@ -2378,7 +2378,6 @@ networkstatus_getinfo_by_purpose(const char 
*purpose_string, time_t now)
   smartlist_t *statuses;
   const uint8_t purpose = router_purpose_from_string(purpose_string);
   routerstatus_t rs;
-  const int bridge_auth = authdir_mode_bridge(get_options());
 
   if (purpose == ROUTER_PURPOSE_UNKNOWN) {
 log_info(LD_DIR, "Unrecognized purpose '%s' 

[tor-commits] [torspec/master] Keep spacing in mind

[nickm]

commit cf2e770faf7364ff9c3d203146b17cbbce097ba7
Author: Neel Chauhan 
Date:   Wed Apr 17 19:59:55 2019 -0400

Keep spacing in mind
---
 control-spec.txt | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/control-spec.txt b/control-spec.txt
index 615ca51..d3d0a66 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -634,8 +634,10 @@
   queries.
   [First implemented in 0.2.0.13-alpha.]
   [In 0.2.0.9-alpha this switched from v2 directory style to v3]
-  [In versions before 0.4.1.1-alpha we set the Running flag on bridges 
when /ns/purpose/bridge is accessed]
-  [In 0.4.1.1-alpha we set the Running flag on bridges when the bridge 
networkstatus file is written to disk]
+  [In versions before 0.4.1.1-alpha we set the Running flag on
+   bridges when /ns/purpose/bridge is accessed]
+  [In 0.4.1.1-alpha we set the Running flag on bridges when the
+   bridge networkstatus file is written to disk]
 
 "desc/all-recent" -- the latest server descriptor for every router that
   Tor knows about.  (See md note about "desc/id" and "desc/name" above.)



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

[tor-commits] [torspec/master] Make GETINFO ns/purpose/bridge change more descriptive for #24490

[nickm]

commit 757104405df17e35367ffd5935cd63b432e9a5d7
Author: teor 
Date:   Wed Apr 17 19:58:37 2019 -0400

Make GETINFO ns/purpose/bridge change more descriptive for #24490

Co-Authored-By: neelchauhan 
---
 control-spec.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/control-spec.txt b/control-spec.txt
index ddd30fb..615ca51 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -634,7 +634,8 @@
   queries.
   [First implemented in 0.2.0.13-alpha.]
   [In 0.2.0.9-alpha this switched from v2 directory style to v3]
-  [in 0.4.1.1-alpha we stop setting bridges as running here]
+  [In versions before 0.4.1.1-alpha we set the Running flag on bridges 
when /ns/purpose/bridge is accessed]
+  [In 0.4.1.1-alpha we set the Running flag on bridges when the bridge 
networkstatus file is written to disk]
 
 "desc/all-recent" -- the latest server descriptor for every router that
   Tor knows about.  (See md note about "desc/id" and "desc/name" above.)



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

[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/76'

[nickm]

commit 8685ffa5edccca5e459a9a9d10e1ce3aee41b462
Merge: 702fdbf cf2e770
Author: Nick Mathewson 
Date:   Thu Apr 25 20:23:31 2019 -0400

Merge remote-tracking branch 'tor-github/pr/76'

 control-spec.txt | 4 
 1 file changed, 4 insertions(+)

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

[tor-commits] [torspec/master] Update documentation for ns/purpose/bridge

[nickm]

commit 77dde55cb72bdb0e41bd7e0ead1d179a7000546a
Author: Neel Chauhan 
Date:   Thu Apr 11 21:53:28 2019 -0400

Update documentation for ns/purpose/bridge
---
 control-spec.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/control-spec.txt b/control-spec.txt
index 78a842f..ddd30fb 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -634,6 +634,7 @@
   queries.
   [First implemented in 0.2.0.13-alpha.]
   [In 0.2.0.9-alpha this switched from v2 directory style to v3]
+  [in 0.4.1.1-alpha we stop setting bridges as running here]
 
 "desc/all-recent" -- the latest server descriptor for every router that
   Tor knows about.  (See md note about "desc/id" and "desc/name" above.)



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

[tor-commits] [torspec/master] dir-spec: add tor versions to bridge-distribution-request

[nickm]

commit cbd3ebe177284571170e36739ebf2f6edd900643
Author: teor 
Date:   Thu Apr 18 10:03:44 2019 +1000

dir-spec: add tor versions to bridge-distribution-request
---
 dir-spec.txt | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index 3f14470..ce87c22 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -652,13 +652,16 @@
 Method = (KeywordChar | "_") +
 
 All bridges SHOULD include this line. Non-bridges MUST NOT include
-it.  (It is not currently implemented, or obeyed by Bridge DB.)
+it.  (It is currently ignored by Bridge DB.)
 
 BridgeDB SHOULD treat unrecognized Method values as if they were
 "none".
 
 (Default: "any")
 
+   [This line was introduced in 0.3.2.3-alpha, with a minimal backport
+   to 0.2.5.16, 0.2.8.17, 0.2.9.14, 0.3.0.13, 0.3.1.10, and later.]
+
 "family" names NL
 
 [At most once]



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

[tor-commits] [torspec/master] dir-spec: Fix a bridge-distribution-request backport version

[nickm]

commit aea58374148e1700ddd88e22a02869288adcbc89
Author: teor 
Date:   Tue Apr 23 09:35:17 2019 +1000

dir-spec: Fix a bridge-distribution-request backport version

Part of 30224.
---
 dir-spec.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index ce87c22..460d02a 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -660,7 +660,7 @@
 (Default: "any")
 
[This line was introduced in 0.3.2.3-alpha, with a minimal backport
-   to 0.2.5.16, 0.2.8.17, 0.2.9.14, 0.3.0.13, 0.3.1.10, and later.]
+   to 0.2.5.16, 0.2.8.17, 0.2.9.14, 0.3.0.13, 0.3.1.9, and later.]
 
 "family" names NL
 



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

[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/77'

[nickm]

commit 702fdbfa9819a659796e6d07fd282cd619f73db3
Merge: d443c0c aea5837
Author: Nick Mathewson 
Date:   Thu Apr 25 20:12:45 2019 -0400

Merge remote-tracking branch 'tor-github/pr/77'

 dir-spec.txt | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/master] bwauth: update measured bandwidth file comments

[nickm]

commit ce9b1015741b663e4f1dbd2923886aedd00c7094
Author: teor 
Date:   Wed Apr 10 15:57:54 2019 +1000

bwauth: update measured bandwidth file comments

We forgot to update function header comments and code comments when we
made changes in 0.3.5.1-alpha and later.

Closes 30112.
---
 src/feature/dirauth/bwauth.c | 33 -
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/feature/dirauth/bwauth.c b/src/feature/dirauth/bwauth.c
index 1cfd8119d..e60c8b86b 100644
--- a/src/feature/dirauth/bwauth.c
+++ b/src/feature/dirauth/bwauth.c
@@ -199,9 +199,32 @@ dirserv_get_credible_bandwidth_kb(const routerinfo_t *ri)
 }
 
 /**
- * Read the measured bandwidth list file, apply it to the list of
- * vote_routerstatus_t and store all the headers in bw_file_headers.
+ * Read the measured bandwidth list from_file:
+ * - store all the headers in bw_file_headers,
+ * - apply bandwidth lines to the list of vote_routerstatus_t in
+ *   routerstatuses,
+ * - cache bandwidth lines for dirserv_get_bandwidth_for_router(),
+ * - expire old entries in the measured bandwidth cache, and
+ * - store the DIGEST_SHA256 of the contents of the file in digest_out.
+ *
  * Returns -1 on error, 0 otherwise.
+ *
+ * If the file can't be read, or is empty:
+ * - bw_file_headers is empty,
+ * - routerstatuses is not modified,
+ * - the measured bandwidth cache is not modified, and
+ * - digest_out is the zero-byte digest.
+ *
+ * Otherwise, if there is an error later in the file:
+ * - bw_file_headers contains all the headers up to the error,
+ * - routerstatuses is updated with all the relay lines up to the error,
+ * - the measured bandwidth cache is updated with all the relay lines up to
+ *   the error,
+ * - if the timestamp is valid and recent, old entries in the  measured
+ *   bandwidth cache are expired, and
+ * - digest_out is the digest up to the first read error (if any).
+ *   The digest is taken over all the readable file contents, even if the
+ *   file is outdated or unparseable.
  */
 int
 dirserv_read_measured_bandwidths(const char *from_file,
@@ -223,15 +246,12 @@ dirserv_read_measured_bandwidths(const char *from_file,
   size_t n = 0;
   crypto_digest_t *digest = crypto_digest256_new(DIGEST_SHA256);
 
-  /* Initialise line, so that we can't possibly run off the end. */
-
   if (fp == NULL) {
 log_warn(LD_CONFIG, "Can't open bandwidth file at configured location: %s",
  from_file);
 goto err;
   }
 
-  /* If fgets fails, line is either unmodified, or indeterminate. */
   if (tor_getline(,,fp) <= 0) {
 log_warn(LD_DIRSERV, "Empty bandwidth file");
 goto err;
@@ -345,6 +365,9 @@ dirserv_read_measured_bandwidths(const char *from_file,
  * the header block yet. If we encounter an incomplete bw line, return -1 but
  * don't warn since there could be additional header lines coming. If we
  * encounter a proper bw line, return 0 (and we got past the headers).
+ *
+ * If the line contains "vote=0", stop parsing it, and return -1, so that the
+ * line is ignored during voting.
  */
 STATIC int
 measured_bw_line_parse(measured_bw_line_t *out, const char *orig_line,



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

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/922'

[nickm]

commit 36b4fc7437f22208838616495f699b793ca30771
Merge: 974c2674e ce9b10157
Author: Nick Mathewson 
Date:   Thu Apr 25 20:08:39 2019 -0400

Merge remote-tracking branch 'tor-github/pr/922'

 src/feature/dirauth/bwauth.c | 33 -
 1 file changed, 28 insertions(+), 5 deletions(-)

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

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

[translation]

commit 87a362f6451a9d07ff37e7623823bdb2e33bf828
Author: Translation commit bot 
Date:   Thu Apr 25 21:15:35 2019 +

Update translations for donatepages-messagespot
---
 locale/fr/LC_MESSAGES/messages.po | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index ffb832f4d..89953fcb4 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -71,6 +71,13 @@ msgid ""
 "steady, reliable source of funds to help us be nimble in an ever-changing "
 "privacy landscape."
 msgstr ""
+"Nous avons besoin de donateurs mensuels, défenseurs du droit à la vie "
+"privée, pour rester vigilants dans notre mission de fournir des outils qui "
+"protègent la vie privée, les données personnelles et l’identité des "
+"personnes en ligne. Les défenseurs du droit à la vie privée s’engagent à
 "
+"verser une modeste somme chaque mois, créant ainsi une source de fonds "
+"stable et fiable pour nous aider à agir prestement dans le domaine en "
+"constante évolution du droit à la vie privée."
 
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:105
 msgid ""
@@ -2268,11 +2275,11 @@ msgstr "TTG"
 
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:145
 msgid "Want to donate cryptocurrency?"
-msgstr ""
+msgstr "Voulez-vous faire un don en cryptomonnaie ?"
 
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:150
 msgid "Want to donate stock or via postal mail?"
-msgstr ""
+msgstr "Voulez-vous faire un don en actions ou par courrier postal ?"
 
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:453
 msgid "Gift Selected"

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

[tor-commits] [translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed

[translation]

commit f10a3f265fadbe7faf934fcc6063a45d6e2836bc
Author: Translation commit bot 
Date:   Thu Apr 25 21:15:42 2019 +

Update translations for donatepages-messagespot_completed
---
 locale/fr/LC_MESSAGES/messages.po | 390 ++
 1 file changed, 183 insertions(+), 207 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 4249f04ee..89953fcb4 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -1,13 +1,12 @@
 # Translators:
 # N W, 2018
-# AO , 2019
-# erinm, 2019
-# Thomas Prévost , 2019
+# erinm, 2018
 # Curtis Baltimore , 2019
+# AO , 2019
 # 
 msgid ""
 msgstr ""
-"Last-Translator: Curtis Baltimore , 2019\n"
+"Last-Translator: AO , 2019\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -21,14 +20,13 @@ msgstr "Soutenez le Projet Tor dès aujourd’hui !"
 
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:48
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:71
-#: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:162
 #: 
tmp/cache_locale/eb/eba664d7c34b5e9dc599e5803f583f25e99c16ec96f31536baeeabb9c42131a3.php:25
 #: 
tmp/cache_locale/eb/eba664d7c34b5e9dc599e5803f583f25e99c16ec96f31536baeeabb9c42131a3.php:48
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:48
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:71
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:647
-#: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:476
-#: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:602
+#: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:481
+#: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:607
 #: 
tmp/cache_locale/03/03963079e40d8bba608baf2120533e119d90cb2cfc82fee9e293708eb548373f.php:75
 msgid "Tor: Strength in Numbers"
 msgstr "Tor : l’union fait la force"
@@ -68,50 +66,36 @@ msgstr "@torproject"
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:101
 msgid ""
 "We need monthly donors - Defenders of Privacy - to remain vigilant in our "
-"mission to provide tools that protect peoples privacy and identity online. "
-"Defenders of Privacy pledge a modest amount each month - creating a steady, "
-"reliable source of funds to help us be nimble in an ever-changing privacy "
-"landscape."
-msgstr ""
-"Nous avons besoin de donateurs mensuels - les défenseurs de la vie privée - 
"
-"pour rester vigilants dans notre mission de fournir des outils qui protègent"
-" la vie privée et l'identité des personnes en ligne. Les défenseurs de la "
-"vie privée s'engagent à verser une modeste somme chaque mois - créant 
ainsi "
-"une source de fonds stable et fiable pour nous aider à être agiles dans un "
-"paysage de la vie privée en constante évolution."
+"mission to provide tools that protect peoples privacy and identity "
+"online. Defenders of Privacy pledge a modest amount each month - creating a "
+"steady, reliable source of funds to help us be nimble in an ever-changing "
+"privacy landscape."
+msgstr ""
+"Nous avons besoin de donateurs mensuels, défenseurs du droit à la vie "
+"privée, pour rester vigilants dans notre mission de fournir des outils qui "
+"protègent la vie privée, les données personnelles et l’identité des "
+"personnes en ligne. Les défenseurs du droit à la vie privée s’engagent à
 "
+"verser une modeste somme chaque mois, créant ainsi une source de fonds "
+"stable et fiable pour nous aider à agir prestement dans le domaine en "
+"constante évolution du droit à la vie privée."
 
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:105
 msgid ""
-"You can cancel or change your monthly gift at any time simply by notifying "
-"us at giv...@torproject.org. Because the regular support of our Defenders of"
-" Privacy is so closely linked to our success, we send our Defenders special "
-"tokens of our appreciation, and we no longer send them additional requests "
-"for donations throughout the year."
-msgstr ""
-"Vous pouvez annuler ou modifier votre don mensuel en tout temps en nous "
-"avisant simplement à giv...@torproject.org. Parce que le soutien régulier 
de"
-" nos Défenseurs de la vie privée est étroitement lié à notre succès, 
nous "
-"envoyons à nos Défenseurs des témoignages spéciaux de notre 
appréciation, et"
-" nous ne leur envoyons plus de demandes de dons supplémentaires tout au long"
-" de l'année."
-
-#: 

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

[translation]

commit a6867faea86409df197b531efba25c17eefd4e8a
Author: Translation commit bot 
Date:   Thu Apr 25 20:45:34 2019 +

Update translations for donatepages-messagespot
---
 locale/fr/LC_MESSAGES/messages.po | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 4736d44a3..ffb832f4d 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -1,7 +1,6 @@
 # Translators:
 # N W, 2018
 # erinm, 2018
-# Thomas Prévost , 2019
 # Curtis Baltimore , 2019
 # AO , 2019
 # 
@@ -263,7 +262,7 @@ msgstr "Choisir une monnaie"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:73
 msgid "Currency Amount"
-msgstr "Somme"
+msgstr "Montant"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:80
 msgid "Report Donation"
@@ -527,11 +526,11 @@ msgstr "tee-shirt"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:259
 msgid "$15"
-msgstr "15 $"
+msgstr "15 $"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:261
 msgid "OFF"
-msgstr "OFF"
+msgstr "Désactivé"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:267
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:226
@@ -769,7 +768,9 @@ msgstr "par mois"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:564
 msgid "One moment while we shovel coal into our servers."
-msgstr "Un moment pendant qu’on alimente nos serveurs en charbon."
+msgstr ""
+"Veuillez patienter un moment pendant que nous pelletons du charbon dans nos "
+"serveurs."
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:654
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:662
@@ -847,9 +848,9 @@ msgid ""
 "If you have any questions, or would like to donate a cryptocurrency not "
 "listed below, please email us at giv...@torproject.org."
 msgstr ""
-"Si vous avez des questions ou si vous désirez faire un don avec une "
-"cryptomonnaie non listé ci-dessous, veuillez nous envoyer un courriel à "
-"giv...@torproject.org."
+"Si vous avez des questions ou si vous souhaitez faire don d’une "
+"cryptomonnaie qui ne figure pas dans la liste ci-dessus, veuillez nous "
+"envoyer un courriel à giv...@torproject.org."
 
 #: 
tmp/cache_locale/6f/6f67db0a5268c67c9254c73517aaaea60c8c65a268f9242703a3299173f14b74.php:22
 msgid "See if your employer offers employee gift matching"
@@ -2214,8 +2215,8 @@ msgid ""
 "The European shirt fits run a little small so you might want to consider "
 "sizing up."
 msgstr ""
-"Le tee-shirt européen taille un peu petit. Vous pourriez donc envisager une "
-"taille plus grande qu’habituellement."
+"Les coupes européennes des tee-shirts taillent un peu petit. Vous pourriez "
+"donc envisager une taille plus grande qu’habituellement."
 
 #: 
tmp/cache_locale/36/36a88fcfb8a236c24db42d5e39602cd43f2ed8bec6f6b807fb97f8e091541f37.php:36
 msgid "Fit"

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

[tor-commits] [tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 30086 - Prevent Sync-related crashes on Android

[gk]

commit 128f8ebdc9d460f4df550b5977ef30bd6ff4e302
Author: Matthew Finkel 
Date:   Wed Apr 24 16:37:03 2019 +

Bug 30086 - Prevent Sync-related crashes on Android
---
 .../java/org/mozilla/gecko/home/CombinedHistoryPanel.java  | 14 ++
 .../gecko/overlays/service/sharemethods/SendTab.java   |  6 --
 mobile/android/base/locales/en-US/torbrowser_strings.dtd   |  2 ++
 mobile/android/base/strings.xml.in |  2 ++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git 
a/mobile/android/base/java/org/mozilla/gecko/home/CombinedHistoryPanel.java 
b/mobile/android/base/java/org/mozilla/gecko/home/CombinedHistoryPanel.java
index 6d00268432a5..a35b3ab53e87 100644
--- a/mobile/android/base/java/org/mozilla/gecko/home/CombinedHistoryPanel.java
+++ b/mobile/android/base/java/org/mozilla/gecko/home/CombinedHistoryPanel.java
@@ -234,10 +234,16 @@ public class CombinedHistoryPanel extends HomeFragment 
implements RemoteClientsD
 syncSetupButton.setOnClickListener(new View.OnClickListener() {
 @Override
 public void onClick(View view) {
-Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, 
TelemetryContract.Method.BUTTON, "history_syncsetup");
-// This Activity will redirect to the correct Activity as 
needed.
-final Intent intent = new 
Intent(FxAccountConstants.ACTION_FXA_GET_STARTED);
-startActivity(intent);
+// Tell the user this action is not supported
+final AlertDialog.Builder dialogBuilder = new 
AlertDialog.Builder(getActivity());
+dialogBuilder.setMessage(R.string.sync_not_supported);
+dialogBuilder.setNegativeButton(R.string.button_cancel, new 
AlertDialog.OnClickListener() {
+@Override
+public void onClick(final DialogInterface dialog, final 
int which) {
+dialog.dismiss();
+}
+});
+dialogBuilder.show();
 }
 });
 
diff --git 
a/mobile/android/base/java/org/mozilla/gecko/overlays/service/sharemethods/SendTab.java
 
b/mobile/android/base/java/org/mozilla/gecko/overlays/service/sharemethods/SendTab.java
index 9382c2ec15f9..5babb74c4f88 100644
--- 
a/mobile/android/base/java/org/mozilla/gecko/overlays/service/sharemethods/SendTab.java
+++ 
b/mobile/android/base/java/org/mozilla/gecko/overlays/service/sharemethods/SendTab.java
@@ -165,7 +165,8 @@ public class SendTab extends ShareMethod {
 }
 
 // Have registered UIs offer to set up a Firefox Account.
-setOverrideIntentAction(FxAccountConstants.ACTION_FXA_GET_STARTED);
+// Comment for Tor Browser
+//setOverrideIntentAction(FxAccountConstants.ACTION_FXA_GET_STARTED);
 }
 
 /**
@@ -187,7 +188,8 @@ public class SendTab extends ShareMethod {
 if (validGUIDs.isEmpty()) {
 // Guess we'd better override. We have no clients.
 // This does the broadcast for us.
-setOverrideIntentAction(FxAccountConstants.ACTION_FXA_GET_STARTED);
+// Comment for Tor Browser
+
//setOverrideIntentAction(FxAccountConstants.ACTION_FXA_GET_STARTED);
 return;
 }
 
diff --git a/mobile/android/base/locales/en-US/torbrowser_strings.dtd 
b/mobile/android/base/locales/en-US/torbrowser_strings.dtd
index 44b4a44ff93c..36cff09ee3c3 100644
--- a/mobile/android/base/locales/en-US/torbrowser_strings.dtd
+++ b/mobile/android/base/locales/en-US/torbrowser_strings.dtd
@@ -55,3 +55,5 @@
 
 
 
+
+
diff --git a/mobile/android/base/strings.xml.in 
b/mobile/android/base/strings.xml.in
index eaa902b95060..327755ef68f3 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -111,6 +111,8 @@
   _tor_network_using_multiple_provided_bridges;
   _tor_network_using_a_provided_bridge;
 
+  _not_supported;
+
   _title;
   _title;
 

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

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

[translation]

commit 639bb1bf90f6051525ca2a1c6f501e39b3ced02d
Author: Translation commit bot 
Date:   Thu Apr 25 20:15:38 2019 +

Update translations for donatepages-messagespot
---
 locale/fr/LC_MESSAGES/messages.po | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index b1b15d251..4736d44a3 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -1,13 +1,13 @@
 # Translators:
 # N W, 2018
-# AO , 2019
-# erinm, 2019
+# erinm, 2018
 # Thomas Prévost , 2019
 # Curtis Baltimore , 2019
+# AO , 2019
 # 
 msgid ""
 msgstr ""
-"Last-Translator: Curtis Baltimore , 2019\n"
+"Last-Translator: AO , 2019\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -81,13 +81,13 @@ msgid ""
 "time."
 msgstr ""
 "Avec votre aide, nous rendrons le réseau Tor accessible à tous. Ensemble, "
-"nous défendrons le droit universel à la vie privée. S'il vous plaît, 
faites "
-"votre don mensuel maintenant et restez avec le projet Tor en ce moment "
+"nous défendrons le droit universel à la vie privée. S’il vous plaît, 
faites "
+"votre don mensuel dès maintenant et soutenez le Projet Tor en cette période 
"
 "critique."
 
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:111
 msgid "Want to make a one time donation instead?"
-msgstr "Vous voulez plutôt faire un don unique ?"
+msgstr "Préférez-vous plutôt faire un don unique ?"
 
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:118
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:102
@@ -251,23 +251,23 @@ msgstr "Nom de famille"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:41
 msgid "Estimated Donation Date:"
-msgstr "Date de don estimée :"
+msgstr "Date de don prévue :"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:46
 msgid "Email"
-msgstr "Courriel"
+msgstr "Adresse courriel"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:51
 msgid "Choose a Currency"
-msgstr "Choisissez une devise"
+msgstr "Choisir une monnaie"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:73
 msgid "Currency Amount"
-msgstr "Devise Montant"
+msgstr "Somme"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:80
 msgid "Report Donation"
-msgstr "Rapporter le don"
+msgstr "Signaler le don"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:87
 msgid "Wallet Addresses"
@@ -473,7 +473,7 @@ msgstr "mensuel"
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:304
 msgid "Want to donate Bitcoin, Stock, or via snail mail?"
 msgstr ""
-"Voulez-vous faire un don en bitcoins, en actions, ou par courrier 
escargot ?"
+"Voulez-vous faire un don en bitcoins, en actions ou par courrier escargot ?"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:201
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:166
@@ -488,7 +488,7 @@ msgstr "Don minimal de 2 $"
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:209
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:174
 msgid "$ other"
-msgstr "Autre montant"
+msgstr "Autre $"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:216
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:181

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

[tor-commits] [translation/support-portal_completed] Update translations for support-portal_completed

[translation]

commit 3d3fa0fe29afa36be926875068c0dd2ebb0f11e0
Author: Translation commit bot 
Date:   Thu Apr 25 19:21:46 2019 +

Update translations for support-portal_completed
---
 contents+pt-BR.po | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index d8819dedc..fcf910a4c 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -5147,6 +5147,8 @@ msgid ""
 "An iOS app which is open source, uses Tor routing, and is developed by "
 "someone who works closely with the Tor Project."
 msgstr ""
+"Um aplicativo para iOS que é de código aberto, usa o roteamento Tor e é "
+"desenvolvido por alguém que trabalha de perto com o Projeto Tor."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -5154,6 +5156,8 @@ msgid ""
 "[Learn more about Onion Browser](https://blog.torproject.org/tor-heart-;
 "onion-browser-and-more-ios-tor)"
 msgstr ""
+"[Saiba mais sobre o Onion Browser](https://blog.torproject.org/tor-heart-;
+"onion-browser-and-more-ios-tor)"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -5690,7 +5694,7 @@ msgstr "Busca preservar sua privacidade e anonimato."
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "[Learn more about Tails](https://tails.boum.org/)."
-msgstr ""
+msgstr "[Saiba mais sobre o Tails](https://tails.boum.org/)."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)

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

[tor-commits] [translation/support-portal] Update translations for support-portal

[translation]

commit 4a4face5050cf564baecd760369bfbe5a969d5fc
Author: Translation commit bot 
Date:   Thu Apr 25 19:21:39 2019 +

Update translations for support-portal
---
 contents+pt-BR.po | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index d8819dedc..fcf910a4c 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -5147,6 +5147,8 @@ msgid ""
 "An iOS app which is open source, uses Tor routing, and is developed by "
 "someone who works closely with the Tor Project."
 msgstr ""
+"Um aplicativo para iOS que é de código aberto, usa o roteamento Tor e é "
+"desenvolvido por alguém que trabalha de perto com o Projeto Tor."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -5154,6 +5156,8 @@ msgid ""
 "[Learn more about Onion Browser](https://blog.torproject.org/tor-heart-;
 "onion-browser-and-more-ios-tor)"
 msgstr ""
+"[Saiba mais sobre o Onion Browser](https://blog.torproject.org/tor-heart-;
+"onion-browser-and-more-ios-tor)"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -5690,7 +5694,7 @@ msgstr "Busca preservar sua privacidade e anonimato."
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "[Learn more about Tails](https://tails.boum.org/)."
-msgstr ""
+msgstr "[Saiba mais sobre o Tails](https://tails.boum.org/)."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)

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

[tor-commits] [translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed

[translation]

commit 6f69d12fa827a93afd2f612bbb35eebac8126362
Author: Translation commit bot 
Date:   Thu Apr 25 19:18:11 2019 +

Update translations for tails-greeter-2_completed
---
 ar/ar.po  | 19 ++-
 bg/bg.po  | 19 ++-
 ca/ca.po  | 21 +++--
 da/da.po  | 21 +++--
 de/de.po  | 38 --
 el/el.po  | 20 ++--
 es/es.po  | 21 +++--
 fa/fa.po  | 25 +
 fr/fr.po  | 21 +++--
 he/he.po  | 21 +++--
 hr/hr.po  | 16 
 hr_HR/hr_HR.po| 36 ++--
 hu/hu.po  | 26 --
 is/is.po  | 19 ++-
 it/it.po  | 19 ++-
 lt/lt.po  | 19 ++-
 lv/lv.po  | 32 ++--
 nb/nb.po  | 19 ++-
 nl/nl.po  | 22 --
 pl/pl.po  | 19 ++-
 pt/pt.po  | 30 --
 pt_BR/pt_BR.po| 21 +++--
 pt_PT/pt_PT.po| 16 
 ro/ro.po  | 21 +++--
 ru/ru.po  | 41 +++--
 sv/sv.po  | 23 ---
 templates/tails-greeter-2.pot | 24 
 tr/tr.po  | 21 +++--
 uk/uk.po  | 22 +++---
 vi/vi.po  | 19 ++-
 zh_CN/zh_CN.po| 21 +++--
 zh_TW/zh_TW.po| 19 ++-
 32 files changed, 530 insertions(+), 201 deletions(-)

diff --git a/ar/ar.po b/ar/ar.po
index 91e444e7c..ceb26eb44 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -15,15 +15,16 @@
 # MirahbiRajan, 2018
 # ButterflyOfFire ButterflyOfFire, 2018
 # Isho Antar , 2018
+# Martus Translations , 2019
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-04 09:46+0200\n"
+"POT-Creation-Date: 2019-04-25 19:21+0200\n"
 "PO-Revision-Date: 2016-11-18 21:29+\n"
-"Last-Translator: Isho Antar , 2018\n"
+"Last-Translator: Martus Translations , 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -231,7 +232,7 @@ msgstr ""
 msgid "_Administration Password"
 msgstr "كلمة السر للأدمن"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:46 ../tailsgreeter/utils.py:45
 msgid "Off (default)"
 msgstr "معطل (إفتراضي)"
 
@@ -239,7 +240,7 @@ msgstr "معطل (إفتراضي)"
 msgid "_MAC Address Spoofing"
 msgstr "خدعة عنوان MAC"
 
-#: ../data/greeter.ui.h:48
+#: ../data/greeter.ui.h:48 ../tailsgreeter/utils.py:43
 msgid "On (default)"
 msgstr "مشغل (إفتراضي)"
 
@@ -297,7 +298,7 @@ msgstr "ابدأ تيلز"
 
 #. Translators: please do not translate this string (it is read from
 #. Gtk translation)
-#: ../tailsgreeter/language.py:136
+#: ../tailsgreeter/language.py:137
 msgid "default:LTR"
 msgstr "الافتراضي:LTR"
 
@@ -342,3 +343,11 @@ msgstr ""
 "فشل الغاء التحميل برمز العودة {returncode}:\n"
 "{stdout}\n"
 "{stderr}"
+
+#: ../tailsgreeter/utils.py:48
+msgid "On"
+msgstr "تشغيل"
+
+#: ../tailsgreeter/utils.py:50
+msgid "Off"
+msgstr "إيقاف التشغيل"
diff --git a/bg/bg.po b/bg/bg.po
index 8de2e779b..ba529093b 100644
--- a/bg/bg.po
+++ b/bg/bg.po
@@ -11,15 +11,16 @@
 # Ивайло Малинов , 2016
 # alexdimitrov , 2016
 # Ivo, 2017
+# erinm, 2019
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-04 09:46+0200\n"
+"POT-Creation-Date: 2019-04-25 19:21+0200\n"
 "PO-Revision-Date: 2016-11-18 21:29+\n"
-"Last-Translator: Ivo, 2017\n"
+"Last-Translator: erinm, 2019\n"
 "Language-Team: Bulgarian (https://www.transifex.com/otf/teams/1519/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -235,7 +236,7 @@ msgstr ""
 msgid "_Administration Password"
 msgstr "_Администраторска парола"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:46 ../tailsgreeter/utils.py:45
 msgid "Off (default)"
 msgstr "Изкл (подразбиране)"
 
@@ -243,7 +244,7 @@ msgstr "Изкл (подразбиране)"
 msgid "_MAC Address Spoofing"
 msgstr "Фалшифициране на _MAC 

[tor-commits] [translation/support-portal_completed] Update translations for support-portal_completed

[translation]

commit 754f13ec73c2cca71aaae3fe421cfdc7ef0fae6e
Author: Translation commit bot 
Date:   Thu Apr 25 18:50:46 2019 +

Update translations for support-portal_completed
---
 contents+ka.po| 21 ++---
 contents+pt-BR.po | 24 
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/contents+ka.po b/contents+ka.po
index 51967d765..7bb1fb57a 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -1,7 +1,7 @@
 # Translators:
 # erinm, 2019
-# Emma Peel, 2019
 # Georgianization, 2019
+# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-25 10:51+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Georgianization, 2019\n"
+"Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1771,7 +1771,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.title)
 msgid "Why does Tor Browser ship with JavaScript enabled?"
-msgstr ""
+msgstr "რატომაა Tor-ბრაუზერი აღჭურ
ვილი ჩართული JavaScript-ით?"
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.description)
@@ -1788,6 +1788,9 @@ msgid ""
 "Most users would give up on Tor entirely if we disabled JavaScript by "
 "default because it would cause so many problems for them."
 msgstr ""
+"მომხმარებლების დიდი ნაწილი, 
საერთოდ შეეშვებოდა Tor-ის 
გამოყენებას, თუ "
+"JavaScript-ს სრულად გავთიშავდით, 
ვინაიდან ეს ძალიან ბევრ დაბრ
კოლებას "
+"შეუქმნიდა მათ."
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.description)
@@ -1796,6 +1799,9 @@ msgid ""
 "making it usable for the majority of people, so for now, that means leaving "
 "JavaScript enabled by default."
 msgstr ""
+"საერთო ჯამში, ჩვენ გვსურს, რ
ომ Tor-ბრაუზერი იყოს, რაც 
შეიძლება მეტად დაცული,"
+" ამავდროულად კი გამოსადეგი 
მომხმარებელთა უმრ
ავლესობისთვის, ეს კი სწორედ "
+"მიიღწევა JavaScript-ის ჩართულად 
დატოვებით, ნაგულისხმევად."
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.description)
@@ -1804,6 +1810,9 @@ msgid ""
 " we recommend changing your Tor Browser's security slider (in the Tor "
 "Browser Onion menu under \"Security Settings\")."
 msgstr ""
+"იმ მომხმარებლებს, რომელთაც 
სურთ JavaScript გამორთონ ყველა 
HTTP-საიტზე "
+"ნაგულისხმევად, ვურჩევთ 
გადააადგილონ Tor-ბრაუზერის 
უსაფრთხოების რბია (Tor-"
+"ბრაუზერის Onion-მენიუდან „უსაფრ
თხოების პარამეტრებში“)."
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.description)
@@ -1811,6 +1820,8 @@ msgid ""
 "The low/default setting allows JavaScript, but the medium and high levels "
 "both block JavaScript on HTTP sites."
 msgstr ""
+"დაბალი/ნაგულისხმევი პარ
ამეტრები უშვებს JavaScript-ს, თუმცა 
საშუალო და მაღალი"
+" დონე ორივე ზღუდავს მას 
HTTP-საიტებზე."
 
 #: https//support.torproject.org/tbb/tbb-35/
 #: (content/tbb/tbb-35/contents+en.lrquestion.title)
@@ -1915,6 +1926,8 @@ msgid ""
 "Sometimes JavaScript-heavy websites can have functional issues over Tor "
 "Browser."
 msgstr ""
+"ზოგჯერ, JavaScript-ით დატვირთულ 
საიტებზე შეიმჩნევა ხარ
ვეზები და შეყოვნებები "
+"Tor-ბრაუზერში."
 
 #: https//support.torproject.org/tbb/tbb-39/
 #: (content/tbb/tbb-39/contents+en.lrquestion.description)
@@ -5147,6 +5160,8 @@ msgid ""
 "[Learn more about Onion Browser](https://blog.torproject.org/tor-heart-;
 "onion-browser-and-more-ios-tor)"
 msgstr ""
+"[იხილეთ ვრცლად, Onion Browser-ის 
შესახებ](https://blog.torproject.org/tor-;

[tor-commits] [translation/support-portal] Update translations for support-portal

[translation]

commit d17fa74865b90a0af99e4481638a82fc496d9ecb
Author: Translation commit bot 
Date:   Thu Apr 25 18:50:36 2019 +

Update translations for support-portal
---
 contents+ka.po| 21 ++---
 contents+pt-BR.po | 24 
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/contents+ka.po b/contents+ka.po
index 51967d765..7bb1fb57a 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -1,7 +1,7 @@
 # Translators:
 # erinm, 2019
-# Emma Peel, 2019
 # Georgianization, 2019
+# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-25 10:51+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Georgianization, 2019\n"
+"Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1771,7 +1771,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.title)
 msgid "Why does Tor Browser ship with JavaScript enabled?"
-msgstr ""
+msgstr "რატომაა Tor-ბრაუზერი აღჭურ
ვილი ჩართული JavaScript-ით?"
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.description)
@@ -1788,6 +1788,9 @@ msgid ""
 "Most users would give up on Tor entirely if we disabled JavaScript by "
 "default because it would cause so many problems for them."
 msgstr ""
+"მომხმარებლების დიდი ნაწილი, 
საერთოდ შეეშვებოდა Tor-ის 
გამოყენებას, თუ "
+"JavaScript-ს სრულად გავთიშავდით, 
ვინაიდან ეს ძალიან ბევრ დაბრ
კოლებას "
+"შეუქმნიდა მათ."
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.description)
@@ -1796,6 +1799,9 @@ msgid ""
 "making it usable for the majority of people, so for now, that means leaving "
 "JavaScript enabled by default."
 msgstr ""
+"საერთო ჯამში, ჩვენ გვსურს, რ
ომ Tor-ბრაუზერი იყოს, რაც 
შეიძლება მეტად დაცული,"
+" ამავდროულად კი გამოსადეგი 
მომხმარებელთა უმრ
ავლესობისთვის, ეს კი სწორედ "
+"მიიღწევა JavaScript-ის ჩართულად 
დატოვებით, ნაგულისხმევად."
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.description)
@@ -1804,6 +1810,9 @@ msgid ""
 " we recommend changing your Tor Browser's security slider (in the Tor "
 "Browser Onion menu under \"Security Settings\")."
 msgstr ""
+"იმ მომხმარებლებს, რომელთაც 
სურთ JavaScript გამორთონ ყველა 
HTTP-საიტზე "
+"ნაგულისხმევად, ვურჩევთ 
გადააადგილონ Tor-ბრაუზერის 
უსაფრთხოების რბია (Tor-"
+"ბრაუზერის Onion-მენიუდან „უსაფრ
თხოების პარამეტრებში“)."
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.description)
@@ -1811,6 +1820,8 @@ msgid ""
 "The low/default setting allows JavaScript, but the medium and high levels "
 "both block JavaScript on HTTP sites."
 msgstr ""
+"დაბალი/ნაგულისხმევი პარ
ამეტრები უშვებს JavaScript-ს, თუმცა 
საშუალო და მაღალი"
+" დონე ორივე ზღუდავს მას 
HTTP-საიტებზე."
 
 #: https//support.torproject.org/tbb/tbb-35/
 #: (content/tbb/tbb-35/contents+en.lrquestion.title)
@@ -1915,6 +1926,8 @@ msgid ""
 "Sometimes JavaScript-heavy websites can have functional issues over Tor "
 "Browser."
 msgstr ""
+"ზოგჯერ, JavaScript-ით დატვირთულ 
საიტებზე შეიმჩნევა ხარ
ვეზები და შეყოვნებები "
+"Tor-ბრაუზერში."
 
 #: https//support.torproject.org/tbb/tbb-39/
 #: (content/tbb/tbb-39/contents+en.lrquestion.description)
@@ -5147,6 +5160,8 @@ msgid ""
 "[Learn more about Onion Browser](https://blog.torproject.org/tor-heart-;
 "onion-browser-and-more-ios-tor)"
 msgstr ""
+"[იხილეთ ვრცლად, Onion Browser-ის 
შესახებ](https://blog.torproject.org/tor-;
+"heart-onion-browser-and-more-ios-tor)"
 
 #: 

[tor-commits] [tpo/master] pronouns found on previous peoples page

[emmapeel]

commit d38fedb41c241abb3121448b4b66c89d4161d4cf
Author: emma peel 
Date:   Wed Mar 27 09:18:51 2019 +0100

pronouns found on previous peoples page
---
 content/about/people/boklm/contents.lr| 2 +-
 content/about/people/ewyatt/contents.lr   | 2 +-
 content/about/people/sajolida/contents.lr | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/about/people/boklm/contents.lr 
b/content/about/people/boklm/contents.lr
index cc2902d..df01f83 100644
--- a/content/about/people/boklm/contents.lr
+++ b/content/about/people/boklm/contents.lr
@@ -8,7 +8,7 @@ name: Nicolas Vigier
 ---
 nickname: boklm
 ---
-pronoun: https://pronoun.is/he
+pronoun: he
 ---
 gpg: https://www.torproject.org/images/pgp-key.png
 ---
diff --git a/content/about/people/ewyatt/contents.lr 
b/content/about/people/ewyatt/contents.lr
index b7a8322..c4c388d 100644
--- a/content/about/people/ewyatt/contents.lr
+++ b/content/about/people/ewyatt/contents.lr
@@ -8,7 +8,7 @@ name: Erin Wyatt
 ---
 nickname: ewyatt
 ---
-pronoun: https://pronoun.is/she
+pronoun: she
 ---
 gpg: /static/keys/ewyatt.txt
 ---
diff --git a/content/about/people/sajolida/contents.lr 
b/content/about/people/sajolida/contents.lr
index 56e6644..cddc3bc 100644
--- a/content/about/people/sajolida/contents.lr
+++ b/content/about/people/sajolida/contents.lr
@@ -8,7 +8,7 @@ name: sajolida
 ---
 nickname: sajolida
 ---
-pronoun: https://pronoun.is/he
+pronoun: he
 ---
 gpg: /static/keys/sajolida.txt
 ---

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

[tor-commits] [tpo/staging] this file is needed to allow translation of databags labels (navbar)

[emmapeel]

commit 47e7c3491bbbd868e3b61844df76fac724186b35
Author: emma peel 
Date:   Wed Apr 24 14:59:32 2019 +0200

this file is needed to allow translation of databags labels (navbar)



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

[tor-commits] [tpo/staging] Fix download link in spanish

[emmapeel]

commit 9c82cc2840839248b790b949f76a4aed1f35761d
Author: hiro 
Date:   Tue Apr 23 10:10:11 2019 +0200

Fix download link in spanish
---
 templates/hero-download.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/hero-download.html b/templates/hero-download.html
index cae7d12..3bbba3f 100644
--- a/templates/hero-download.html
+++ b/templates/hero-download.html
@@ -12,6 +12,8 @@
 {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' 
+ t.version + '/' %}
 {% if alt == 'en' %}
   {% set alt = 'en-US' %}
+{% elif alt == 'es' %}
+  {% set alt = 'es-ES' %}
 {% endif %}
 {% if id == 'windows' %}
   {% set download_link = download_prefix + 'torbrowser-install-win64-' 
+ t.version + '_' + alt + '.exe' %}

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

[tor-commits] [tpo/staging] Make other platforms discoverable

[emmapeel]

commit 520239bb0292a827d87d05183dbc970eee6f29d2
Author: Antonela 
Date:   Tue Apr 16 14:16:28 2019 -0300

Make other platforms discoverable

#29907
---
 templates/hero-download.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/hero-download.html b/templates/hero-download.html
index 071ef4b..cae7d12 100644
--- a/templates/hero-download.html
+++ b/templates/hero-download.html
@@ -35,7 +35,7 @@
   
 
 
-  {{ _('Download in another language') }}
+  {{ _('Download in another language or platform') }}
   {{ _('Advanced Install Options') }}
   {% set v = bag('versions', 'tor-stable') %}
   {% set download_source = 'https://dist.torproject.org/tor-' + v.version + 
'.tar.gz' %}



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

[tor-commits] [tpo/staging] Fix various typos

[emmapeel]

commit fbe8b77de66c1dc03e85d0a5854d4aaad45d6de1
Author: hiro 
Date:   Tue Apr 16 19:21:46 2019 +0200

Fix various typos
---
 content/about/reports/2011-form-pc/contents.lr|  2 +-
 .../torbrowser/RecommendedTBBVersions/contents.lr | 15 +--
 models/text.ini   |  2 +-
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/content/about/reports/2011-form-pc/contents.lr 
b/content/about/reports/2011-form-pc/contents.lr
index c9181ef..7d5b541 100644
--- a/content/about/reports/2011-form-pc/contents.lr
+++ b/content/about/reports/2011-form-pc/contents.lr
@@ -6,7 +6,7 @@ date: 2011
 ---
 tags: FISCAL YEAR
 ---
-title: 2011 Steate of MA Form PC
+title: 2011 State of MA Form PC
 ---
 _hidden: yes
 ---
diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr 
b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
index 4a5c3ba..56a3483 100644
--- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
+++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
@@ -4,17 +4,4 @@ _template: empty.html
 ---
 body:
 
-[
-"8.0.8",
-"8.0.8-MacOS",
-"8.0.8-Linux",
-"8.0.8-Windows",
-"8.5a10",
-"8.5a10-MacOS",
-"8.5a10-Linux",
-"8.5a10-Windows",
-"8.5a11",
-"8.5a11-MacOS",
-"8.5a11-Linux",
-"8.5a11-Windows"
-]
+["8.0.8", "8.0.8-MacOS", "8.0.8-Linux", "8.0.8-Windows", "8.5a10", 
"8.5a10-MacOS", "8.5a10-Linux", "8.5a10-Windows"]
diff --git a/models/text.ini b/models/text.ini
index 75e24ba..3d57509 100644
--- a/models/text.ini
+++ b/models/text.ini
@@ -4,4 +4,4 @@ label = Text
 
 [fields.body]
 label = Body
-type = text
+type = html



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

[tor-commits] [tpo/staging] Add png for svg fallback /download

[emmapeel]

commit 947d79515b9adad142c07e2978b489e87477d9c2
Author: Antonela 
Date:   Tue Apr 16 13:24:04 2019 -0300

Add png for svg fallback /download
---
 assets/static/images/download/png/get-connected.png | Bin 0 -> 15182 bytes
 assets/static/images/download/png/get-connec...@2x.png  | Bin 0 -> 35598 bytes
 assets/static/images/download/png/get-connec...@3x.png  | Bin 0 -> 56569 bytes
 assets/static/images/download/png/stay-safe.png | Bin 0 -> 23398 bytes
 assets/static/images/download/png/stay-s...@2x.png  | Bin 0 -> 53831 bytes
 assets/static/images/download/png/stay-s...@3x.png  | Bin 0 -> 84316 bytes
 .../static/images/download/{ => svg}/get-connected.svg  |   0
 assets/static/images/download/{ => svg}/stay-safe.svg   |   0
 8 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/assets/static/images/download/png/get-connected.png 
b/assets/static/images/download/png/get-connected.png
new file mode 100644
index 000..6375bb8
Binary files /dev/null and 
b/assets/static/images/download/png/get-connected.png differ
diff --git a/assets/static/images/download/png/get-connec...@2x.png 
b/assets/static/images/download/png/get-connec...@2x.png
new file mode 100644
index 000..21f8283
Binary files /dev/null and 
b/assets/static/images/download/png/get-connec...@2x.png differ
diff --git a/assets/static/images/download/png/get-connec...@3x.png 
b/assets/static/images/download/png/get-connec...@3x.png
new file mode 100644
index 000..e6f5370
Binary files /dev/null and 
b/assets/static/images/download/png/get-connec...@3x.png differ
diff --git a/assets/static/images/download/png/stay-safe.png 
b/assets/static/images/download/png/stay-safe.png
new file mode 100644
index 000..0c0a224
Binary files /dev/null and b/assets/static/images/download/png/stay-safe.png 
differ
diff --git a/assets/static/images/download/png/stay-s...@2x.png 
b/assets/static/images/download/png/stay-s...@2x.png
new file mode 100644
index 000..f49df98
Binary files /dev/null and b/assets/static/images/download/png/stay-s...@2x.png 
differ
diff --git a/assets/static/images/download/png/stay-s...@3x.png 
b/assets/static/images/download/png/stay-s...@3x.png
new file mode 100644
index 000..00e057f
Binary files /dev/null and b/assets/static/images/download/png/stay-s...@3x.png 
differ
diff --git a/assets/static/images/download/get-connected.svg 
b/assets/static/images/download/svg/get-connected.svg
similarity index 100%
rename from assets/static/images/download/get-connected.svg
rename to assets/static/images/download/svg/get-connected.svg
diff --git a/assets/static/images/download/stay-safe.svg 
b/assets/static/images/download/svg/stay-safe.svg
similarity index 100%
rename from assets/static/images/download/stay-safe.svg
rename to assets/static/images/download/svg/stay-safe.svg



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

[tor-commits] [tpo/staging] Fix svg fallback

[emmapeel]

commit 76423c43754cb114c00880128f9bfbdd44180763
Author: hiro 
Date:   Tue Apr 16 18:31:25 2019 +0200

Fix svg fallback
---
 templates/download.html | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/download.html b/templates/download.html
index f86fc73..9ce330c 100644
--- a/templates/download.html
+++ b/templates/download.html
@@ -1,8 +1,8 @@
 
   
 
-  
-  
+  
+
   
   {{ _('Get connected') }}
   
@@ -15,8 +15,8 @@
   
 
 
-  
-  
+  
+
   
   {{ _('Stay safe') }}
 

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

[tor-commits] [tpo/staging] Update download.html

[emmapeel]

commit cb6f12c4475f5c29ca6fd748ebaccebdc38731f4
Author: Antonela 
Date:   Tue Apr 16 12:51:24 2019 -0300

Update download.html
---
 templates/download.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/download.html b/templates/download.html
index d5a2a29..f86fc73 100644
--- a/templates/download.html
+++ b/templates/download.html
@@ -12,7 +12,7 @@
   
   {{ _('If Tor is not censored, one of the 
most common reasons Tor won\'t connect is an incorrect system clock. Please 
make sure it\'s set correctly.') }}
   https://support.torproject.org/{{ this.alt }}" 
title="{{ _('Support Portal') }}">{{ _('Read other FAQ\'s at our Support 
Portal') }}
-
+  
 
 
   



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

[tor-commits] [translation/support-portal] Update translations for support-portal

[translation]

commit 6a9872369c5822130e8bcecf58f66aa649795879
Author: Translation commit bot 
Date:   Thu Apr 25 14:50:57 2019 +

Update translations for support-portal
---
 contents+zh-TW.po | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contents+zh-TW.po b/contents+zh-TW.po
index fc36d115e..0c431be93 100644
--- a/contents+zh-TW.po
+++ b/contents+zh-TW.po
@@ -2,6 +2,7 @@
 # 孟邦 王, 2019
 # erinm, 2019
 # Emma Peel, 2019
+# Hsiu-Ming Chang , 2019
 # 
 msgid ""
 msgstr ""
@@ -9,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-25 10:51+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Hsiu-Ming Chang , 2019\n"
 "Language-Team: Chinese (Taiwan) 
(https://www.transifex.com/otf/teams/1519/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1543,6 +1544,9 @@ msgid ""
 "add more. Want to help us translate? [See here](https://tb-;
 "manual.torproject.org/becoming-tor-translator/)"
 msgstr ""
+"我們想讓任何人都可以用他們的語言享受洋蔥路由瀏覽器。洋蔥路由瀏覽器現在有
 25 "
+"種不同的語言的版本，並且我們努力加å…
¥æ›´å¤šã€‚想要幫助我們翻譯嗎？[看這裡](https://tb-manual.torproject.org;
+"/becoming-tor-translator/)"
 
 #: https//support.torproject.org/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.description)

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

[tor-commits] [translation/tpo-web] Update translations for tpo-web

[translation]

commit 889e98fea2eba5d7a48ad2be79f11205975520b1
Author: Translation commit bot 
Date:   Thu Apr 25 14:50:36 2019 +

Update translations for tpo-web
---
 contents+zh-TW.po | 21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/contents+zh-TW.po b/contents+zh-TW.po
index e964c26f5..a55ca2477 100644
--- a/contents+zh-TW.po
+++ b/contents+zh-TW.po
@@ -62,7 +62,7 @@ msgstr "洋蔥路由專案"
 #: https//www.torproject.org/contact/
 #: (content/contact/contents+en.lrpage.body)
 msgid "### Get Support"
-msgstr ""
+msgstr "### 取得支援"
 
 #: https//www.torproject.org/contact/
 #: (content/contact/contents+en.lrpage.body)
@@ -71,6 +71,8 @@ msgid ""
 "answers to frequently asked questions about connecting to Tor, circumventing"
 " censorship, using onion services, and more."
 msgstr ""
+"需要幫助嗎？訪問我們的[支援é 
é¢](https://support.torproject.org) 來獲得關於連線到 "
+"Tor、規避審查、使用洋蔥服務等常見問題的回答。"
 
 #: https//www.torproject.org/download/
 #: (content/download/contents+en.lrpage.title)
@@ -132,7 +134,7 @@ msgstr "成功"
 #: https//www.torproject.org/thank-you/
 #: (content/thank-you/contents+en.lrpage.body)
 msgid "You're equipped to browse freely."
-msgstr ""
+msgstr "您可以自由瀏覽。"
 
 #: https//www.torproject.org/thank-you/
 #: (content/thank-you/contents+en.lrpage.body)
@@ -144,14 +146,14 @@ msgstr "Tor 
是保障隱私權與網路自由最強而有力的工具。"
 msgid ""
 "It is free and open source software maintained by the Tor Project and a "
 "community of volunteers worldwide."
-msgstr ""
+msgstr "這是一個由 Tor 計劃和全世界的志願者
社群維護的自由與開放原始碼軟體。"
 
 #: https//www.torproject.org/thank-you/
 #: (content/thank-you/contents+en.lrpage.body)
 msgid ""
 "We need your help to keep Tor secure and safe for millions across the globe."
 " [Donate Now](https://donate.torproject.org/)"
-msgstr ""
+msgstr "我們需要您的幫助以確保 Tor 對å…
¨çƒæ•¸ç™¾è¬ç”¨æˆ¶çš„保密和安å…
¨ã€‚[現在捐款](https://donate.torproject.org/)"
 
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.title)
 #: https//www.torproject.org/about/history/
@@ -169,7 +171,7 @@ msgstr "下載洋蔥路由瀏覽器 Alpha"
 msgid ""
 "Before we release a stable version of our software, we release an alpha "
 "version to test features and find bugs."
-msgstr ""
+msgstr "在我們發佈我們軟體的穩定版本前，我們會發佈一個 
alpha 版本來測試功能並尋找錯誤。"
 
 #: https//www.torproject.org/download/alpha/
 #: (content/download/alpha/contents+en.lrpage.body)
@@ -179,6 +181,8 @@ msgid ""
 
"bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback),"
 " and are not putting yourself at risk."
 msgstr ""
+"如果你能接受有些地方沒有正常運作，請只下載 alpha "
+"版本，想幫助我們找到並[回å 
±éŒ¯èª¤](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback)，而且不會讓自己處於危險之中。"
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -193,18 +197,21 @@ msgid ""
 "add more. Want to help us translate? [See here](https://tb-;
 "manual.torproject.org/becoming-tor-translator/)"
 msgstr ""
+"我們想讓任何人都可以用他們的語言享受洋蔥路由瀏覽器。洋蔥路由瀏覽器現在有
 25 "
+"種不同的語言的版本，並且我們努力加å…
¥æ›´å¤šã€‚想要幫助我們翻譯嗎？[看這裡](https://tb-manual.torproject.org;
+"/becoming-tor-translator/)"
 
 #: https//www.torproject.org/download/tor/
 #: (content/download/tor/contents+en.lrpage.title)
 msgid "Download Tor Source Code"
-msgstr ""
+msgstr "下載 Tor 原始碼"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
 msgid ""
 "The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of "
 "\"onion routing\" began in the mid 1990s."
-msgstr ""
+msgstr "Tor Project, Inc 在 2006 年成為 501(c)3 
非營利組織，但「洋蔥路由」的概念始於 1990 年代中期。"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)

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

[tor-commits] [tpo/staging] Add 8.5a11 to RecommendedTBBVersions

[emmapeel]

commit bf0c550220133715e72cbe638cfb7beaa306c28d
Author: Nicolas Vigier 
Date:   Tue Apr 16 21:35:53 2019 +0200

Add 8.5a11 to RecommendedTBBVersions
---
 content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr 
b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
index 0ab95b1..4a5c3ba 100644
--- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
+++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
@@ -12,5 +12,9 @@ body:
 "8.5a10",
 "8.5a10-MacOS",
 "8.5a10-Linux",
-"8.5a10-Windows"
+"8.5a10-Windows",
+"8.5a11",
+"8.5a11-MacOS",
+"8.5a11-Linux",
+"8.5a11-Windows"
 ]



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

[tor-commits] [tpo/staging] Update footer

[emmapeel]

commit a5eb778fef738712f65236ccc792466cd9433ece
Author: hiro 
Date:   Tue Apr 16 21:31:44 2019 +0200

Update footer
---
 templates/download-android.html | 29 +++--
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/templates/download-android.html b/templates/download-android.html
index 957c4ad..6392e95 100644
--- a/templates/download-android.html
+++ b/templates/download-android.html
@@ -14,18 +14,35 @@
   
 {{ _('Protect yourself against 
tracking, surveillance, and censorship.') }}
   
+
+
+  
+
+  
+  
+
   
-  https://dist.torproject.org/torbrowser/8.5a10/tor-browser-8.5a10-android-armv7-multi.apk;>{{
 _('Download .apk') }}
-  https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alpha;>{{
 _('Go to Google Play') }}
+  
+
+  {% set t = bag('versions', 'torbrowser-alpha') %}
+  https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ 
t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }}  arm
+  https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ 
t.version }}-android-armv7-multi.apk.asc">{{ _('sig') }}
+  https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ 
t.version }}-android-x86-multi.apk">{{ _('Download .apk') }}  x86
+  https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ 
t.version }}-android-x86-multi.apk.asc">{{ _('sig') }}
+
+  
+  
+https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alpha;>{{
 _('Go to Google Play') }}
+  
   {% from "macros/downloads.html" import render_fdroid %}
-  {{ _('Go to F-droid %s')|format(render_fdroid())|safe }}
+  
+{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}
+
+  
   
   
 https://itunes.apple.com/us/app/onion-browser/id519296448?mt=8;>{{ _('Are 
you a iOS user? We encourage you to try Onion Browser.') }} 
   
 
-
-  
-
   
 

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

[tor-commits] [tpo/staging] Fix download link in spanish

[emmapeel]

commit bc1cf651159af0fea52dcc333a7549341b701c12
Author: hiro 
Date:   Tue Apr 23 10:12:03 2019 +0200

Fix download link in spanish
---
 templates/macros/downloads.html | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/templates/macros/downloads.html b/templates/macros/downloads.html
index 6bddbb0..742e115 100644
--- a/templates/macros/downloads.html
+++ b/templates/macros/downloads.html
@@ -2,6 +2,8 @@
   {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + 
version + '/' %}
   {% if alt == 'en' %}
 {% set alt = 'en-US' %}
+  {% elif alt == 'es' %}
+{% set alt = 'es-ES' %}
   {% endif %}
   {% set download_link_64 = download_prefix + 'torbrowser-install-win64-' + 
version + '_' + alt + '.exe' %}
   {% set download_link_32 = download_prefix + 'torbrowser-install-' + version 
+ '_' + alt + '.exe' %}
@@ -15,6 +17,8 @@
   {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + 
version + '/' %}
   {% if alt == 'en' %}
 {% set alt = 'en-US' %}
+  {% elif alt == 'es' %}
+{% set alt = 'es-ES' %}
   {% endif %}
   {% set download_link = download_prefix + 'TorBrowser-' + version + '-osx64' 
+ '_' + alt + '.dmg' %}
   {% set sig_link = download_link + '.asc' %}
@@ -26,6 +30,8 @@
   {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + 
version + '/' %}
   {% if alt == 'en' %}
 {% set alt = 'en-US' %}
+  {% elif alt == 'es' %}
+{% set alt = 'es-ES' %}
   {% endif %}
   {% set download_link_64 = download_prefix + 'tor-browser-linux64-' + version 
+ '_' + alt + '.tar.xz' %}
   {% set download_link_32 = download_prefix + 'tor-browser-linux32-' + version 
+ '_' + alt + '.tar.xz' %}



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

[tor-commits] [tpo/staging] Add Tor Browser 8.5a11

[emmapeel]

commit fa47c502ea52cfe1b8815f7d02f2af71b1afa481
Author: Nicolas Vigier 
Date:   Wed Apr 17 01:00:07 2019 +0200

Add Tor Browser 8.5a11
---
 databags/versions.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/databags/versions.ini b/databags/versions.ini
index cbba14e..a2edc28 100644
--- a/databags/versions.ini
+++ b/databags/versions.ini
@@ -4,8 +4,8 @@ release_date = 2019-03-23
 win32 = 0.3.5.8
 
 [torbrowser-alpha]
-version = 8.5a10
-release_date = 2019-03-25
+version = 8.5a11
+release_date = 2019-04-17
 
 [torbrowser-develop-branch]
 version = maint-8.0



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

[tor-commits] [translation/tor_outreach_md] Update translations for tor_outreach_md

[translation]

commit 4671c38f394f3a50ddb92a13a7418b5e64faf11d
Author: Translation commit bot 
Date:   Thu Apr 25 14:21:01 2019 +

Update translations for tor_outreach_md
---
 tor-outreach2019-2020-zh_CN.md | 32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/tor-outreach2019-2020-zh_CN.md b/tor-outreach2019-2020-zh_CN.md
index aa9d0c4ec..495471975 100644
--- a/tor-outreach2019-2020-zh_CN.md
+++ b/tor-outreach2019-2020-zh_CN.md
@@ -1,22 +1,22 @@
-# Tor Outreach Material 2019-2020
+# Tor推广材料 2019-2020
 
 # 1. 为了隐私的Tor
 
 ### 隐私是一项人权
 
-Like many of us, Aleisha spends most of her time online--connecting with 
friends, posting on social media, and browsing the web.
+像我们中的许多人一æ 
·ï¼ŒAleisha将大部分时间花在网上——与朋友联系，在社交媒体上发布以及浏览网页。
 
-But lately, she's noticed that advertisements related to her previous searches 
are following her around online.
+但是最近，她注意到与之前她搜索相å…
³çš„广告在网上追踪她。
 
-This feels so invasive that she does some research on online ads and learns 
that it's not just advertisers tracking her but also her ISP, analytics 
companies, social media platforms, and more.
+这种感觉非常具有侵略性，所以她对在线广告进行了一些ç 
”究，并了解到不仅
是广告客户追踪她，还有她的服务商，分析å…
¬å¸ï¼Œç¤¾äº¤åª’体平台等等也在追踪她。
 
-Aleisha decides she wants to find and use software that doesn't collect her 
data, doesn't track her, and doesn't tell other services anything private about 
her.
+Aleisha决定她要找到并使用不收集她数据，不跟踪她，也不会告诉å
…¶ä»–服务任何关于她的私人信息的软件。
 
-She goes to a privacy training at a local hackerspace and learns about **Tor 
Browser**, the only web browser that allows her to browse anonymously.
+她参加了当地黑客空间的隐私培训，并了解到了**Tor 
Browser**，这是唯一能让她匿名浏览的网络浏览器。
 
 ---
 
-# 2.TOR FOR FEMINISTS 
+# 2. 为了女权的Tor
 
 ### The future is cyberfeminist
 
@@ -36,7 +36,7 @@ She also uses a Tor-powered app called **OnionShare** to send 
files to other act
 
 ---
 
-# 3. TOR FOR HUMAN RIGHTS
+# 3. 为了人权的Tor
 
 ### 水是生命之源
 
@@ -58,9 +58,9 @@ All of this software uses Tor to help protect Jelani’s 
privacy.
 
 ---
 
-# 4. TOR FOR ANTI-CENSORSHIP
+# 4. 为了反审查的Tor
 
-### Build bridges not walls
+### 造桥而非建墙
 
 Jean was traveling for the first time to a country far from his family.
 
@@ -90,17 +90,17 @@ With Tor Browser, Jean can browse freely and privately and 
contact his family.
 
 ---
 
-# 5. Shared Sections
+# 5. 分享部分
 
 ## 什么是 Tor？
 
-Tor is free software and an open network that helps protect you from tracking, 
surveillance, and censorship online.
-Tor is created for free by a 501(c)3 U.S.-based nonprofit called the Tor 
Project. 
+Tor是免费软件和开放式网络，有助于保护您å…
å—在线跟踪，监控和审查。
+Tor由一家名为Tor Project的501(c)3美国非营利组织免费创建。
 
-The easiest way to use Tor is Tor Browser.
-When you use Tor Browser, no one can see what websites you visit or where in 
the world you’re coming from. 
+使用Tor的最简单方法是Tor Browser。
+当您使用Tor 
Browser时，没有人能够看到您访问的是哪个网站或您来自世界的哪个位置。
 
-Other applications, like SecureDrop and OnionShare, use Tor to protect their 
users against surveillance and censorship.
+其他应用程序，如SecureDrop和OnionShare，使用Tor来保护其用户å…
å—监视和审查。
 
 
 ## 6. How does Tor work?

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

[tor-commits] [tpo/staging] this file is needed to allow translation of databags labels (navbar)

[emmapeel]

commit 735cbdc9f83a91c80f53dc469dca8f8ecae7a6bc
Author: emma peel 
Date:   Wed Apr 24 14:59:32 2019 +0200

this file is needed to allow translation of databags labels (navbar)
---
 content/menu/contents.lr | 16 
 1 file changed, 16 insertions(+)

diff --git a/content/menu/contents.lr b/content/menu/contents.lr
new file mode 100644
index 000..34edc58
--- /dev/null
+++ b/content/menu/contents.lr
@@ -0,0 +1,16 @@
+_template: about.html
+---
+section: About
+---
+color: primary
+---
+title: About
+---
+body:
+
+Documentation
+Press
+Support
+Jobs
+Blog
+Donate

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

[tor-commits] [translation/tpo-web] Update translations for tpo-web

[translation]

commit 201f468626121a093bc8d4364933b708a6745335
Author: Translation commit bot 
Date:   Thu Apr 25 13:50:29 2019 +

Update translations for tpo-web
---
 contents+zh-CN.po | 51 ++-
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index e275efa67..eacc012c8 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -361,6 +361,8 @@ msgid ""
 "mainstream concern thanks to the [Snowden revelations in "
 "2013](https://www.theguardian.com/us-news/the-nsa-files)."
 msgstr ""
+"由于[2013年的斯诺登启示](https://www.theguardian.com/us-news/the-nsa-;
+"files)，防止大规模监视的工具的需求成为主流关注点。"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -369,6 +371,8 @@ msgid ""
 "the documents also upheld assurances that, at that time, [Tor could not be "
 "cracked](https://www.wired.com/story/the-grand-tor/)."
 msgstr ""
+"Tor不仅对斯诺登的举报很有帮助，而且文件的内
容也得到了保证，当时，[Tor无法被ç 
´è§£](https://www.wired.com/story;
+"/the-grand-tor/)。"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -376,7 +380,7 @@ msgid ""
 "People's awareness of tracking, surveillance, and censorship may have "
 "increased, but so has the prevalence of these hindrances to internet "
 "freedom."
-msgstr ""
+msgstr 
"人们对跟踪，监视和审查的意识可能已经增长，但这些对互联网自由的阻碍也很普遍。"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -385,6 +389,8 @@ msgid ""
 " run by volunteers and millions of users worldwide. And it is this diversity"
 " that keeps Tor users safe."
 msgstr ""
+"今天，该网络拥有[数以千计的中继](https://metrics.torproject.org)，由志愿è€
…和全球数百万用户运营。 "
+"正是这种多样性保证了Tor用户的安全。"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -392,7 +398,7 @@ msgid ""
 "We, at the Tor Project, fight every day for everyone to have private access "
 "to an uncensored internet, and Tor has become the world's strongest tool for"
 " privacy and freedom online."
-msgstr ""
+msgstr "我们，在Tor 
Project中，每天都在争取让每个人都能有私有权利访问未经审查的互联网，Tor已经成为世界上最强大的隐私和在线自由工å
…·ã€‚"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -665,7 +671,7 @@ msgstr ""
 #: templates/download.html:40
 #, python-format
 msgid "Check out the %s for more troubleshooting tips."
-msgstr ""
+msgstr "查看%s来获得更多解决问题的提示"
 
 #: templates/download.html:49
 msgid "Verify Tor Browser signature"
@@ -863,7 +869,7 @@ msgstr "Tor核心"
 
 #: templates/people.html:28
 msgid "Join Our Team"
-msgstr ""
+msgstr "加入我们的团队"
 
 #: templates/people.html:29
 msgid ""
@@ -871,10 +877,12 @@ msgid ""
 "and studies to improve Tor software. If you're a developer, we welcome you "
 "to sign up for our dev mailing list to see what we're up to."
 msgstr ""
+"即使我们没有招聘，你也可以为Tor做出贡献。 
我们对改进Tor软件的想法和研究持开放态度。 "
+"如果您是开发人员，我们欢迎您注册我们的开发邮件列表，了解我们的最新动态。"
 
 #: templates/people.html:31
 msgid "Sign up for tor-dev"
-msgstr ""
+msgstr "注册tor-dev"
 
 #: templates/press.html:7
 msgid "Get support"
@@ -882,19 +890,19 @@ msgstr "获取客户支持"
 
 #: templates/press.html:9
 msgid "Visit our Support Portal"
-msgstr ""
+msgstr "访问我们的支持门户"
 
 #: templates/press.html:12
 msgid "Ask us on #tor"
-msgstr ""
+msgstr "在#tor询问我们"
 
 #: templates/press.html:15
 msgid "Write to a mailing list"
-msgstr ""
+msgstr "写给一个邮件列表"
 
 #: templates/press.html:22
 msgid "Brand Assets"
-msgstr ""
+msgstr "品牌资产"
 
 #: templates/press.html:27
 msgid "The Tor Browser"
@@ -906,11 +914,11 @@ msgstr "洋葱服务"
 
 #: templates/press.html:40
 msgid "Press Releases"
-msgstr ""
+msgstr "新闻报道"
 
 #: templates/press.html:54
 msgid "Coverage"
-msgstr ""
+msgstr "封面"
 
 #: templates/press.html:61
 msgid "Date"
@@ -918,15 +926,15 @@ msgstr "日期"
 
 #: templates/press.html:62
 msgid "Publication"
-msgstr ""
+msgstr "出版物"
 
 #: templates/press.html:63
 msgid "Topic"
-msgstr ""
+msgstr "文章"
 
 #: templates/reports.html:2
 msgid "Founding Documents"
-msgstr ""
+msgstr "资金文档"
 
 #: templates/reports.html:16
 msgid "Reports"
@@ -934,7 +942,7 @@ msgstr "报告"
 
 #: templates/reports.html:22
 msgid "Year"
-msgstr ""
+msgstr "年报"
 
 #: templates/reports.html:23
 msgid "Type"
@@ -959,36 +967,37 @@ msgid ""
 "financial 

[tor-commits] [translation/tpo-web_completed] Update translations for tpo-web_completed

[translation]

commit 7bf7d1a73384db5411c1735f354fb30a8bd1caea
Author: Translation commit bot 
Date:   Thu Apr 25 13:50:34 2019 +

Update translations for tpo-web_completed
---
 contents+zh-CN.po | 1020 +
 1 file changed, 1020 insertions(+)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
new file mode 100644
index 0..eacc012c8
--- /dev/null
+++ b/contents+zh-CN.po
@@ -0,0 +1,1020 @@
+# Translators:
+# Chi-Hsun Tsai, 2019
+# Xiaoyu Huang <007...@gmail.com>, 2019
+# ducki2p , 2019
+# erinm, 2019
+# Emma Peel, 2019
+# Zhui Shen <12231...@bjtu.edu.cn>, 2019
+# Yikai Yang , 2019
+# ciaran , 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-04-23 13:54+CET\n"
+"PO-Revision-Date: 2019-03-09 10:41+\n"
+"Last-Translator: ciaran , 2019\n"
+"Language-Team: Chinese (China) 
(https://www.transifex.com/otf/teams/1519/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: https//www.torproject.org/ (content/contents+en.lrpage.title)
+msgid "Anonymity Online"
+msgstr "匿名上网"
+
+#: https//www.torproject.org/ (content/contents+en.lrpage.section)
+msgid "home"
+msgstr "主页"
+
+#: https//www.torproject.org/ (content/contents+en.lrpage.body)
+msgid "##ABOUT US##"
+msgstr "##关于我们##"
+
+#: https//www.torproject.org/ (content/contents+en.lrpage.body)
+msgid ""
+"We believe everyone should be able to explore the internet with privacy."
+msgstr "我们坚信每个人都应能私密地探索互联网。"
+
+#: https//www.torproject.org/ (content/contents+en.lrpage.body)
+msgid "We are the Tor Project, a 501(c)3 US nonprofit."
+msgstr "我们是 Tor Project，按照美国国内
税收法501(c)3登记的非营利慈善机构。"
+
+#: https//www.torproject.org/ (content/contents+en.lrpage.body)
+msgid ""
+"We advance human rights and defend your privacy online through free software"
+" and open networks. [Meet our team](about/people)."
+msgstr "我们推进人权保护，用å…
è´¹è½¯ä»¶å’Œå¼€æ”¾çš„网络来捍卫你
的在线隐私。[我们的团队](about/people)"
+
+#: https//www.torproject.org/contact/
+#: (content/contact/contents+en.lrpage.title)
+msgid "Contact"
+msgstr "联系方式"
+
+#: https//www.torproject.org/contact/
+#: (content/contact/contents+en.lrpage.section)
+#: https//www.torproject.org/thank-you/
+#: (content/thank-you/contents+en.lrpage.section)
+msgid "The Tor Project"
+msgstr "The Tor Project"
+
+#: https//www.torproject.org/contact/
+#: (content/contact/contents+en.lrpage.body)
+msgid "### Get Support"
+msgstr "### 获得支持"
+
+#: https//www.torproject.org/contact/
+#: (content/contact/contents+en.lrpage.body)
+msgid ""
+"Need help? Visit our [Support Portal](https://support.torproject.org) for "
+"answers to frequently asked questions about connecting to Tor, circumventing"
+" censorship, using onion services, and more."
+msgstr ""
+"需要帮助？访问我们的[支持页面](https://support.torproject.org)来获得å
…³äºŽè¿žæŽ¥åˆ°Tor，规避审查，使用洋葱路由等常见问题的回答"
+
+#: https//www.torproject.org/download/
+#: (content/download/contents+en.lrpage.title)
+#: (content/download/contents+en.lrpage.section)
+#: https//www.torproject.org/download/alpha/
+#: (content/download/alpha/contents+en.lrpage.section)
+#: https//www.torproject.org/download/languages/
+#: (content/download/languages/contents+en.lrpage.section)
+#: https//www.torproject.org/download/tor/
+#: (content/download/tor/contents+en.lrpage.section)
+msgid "Download"
+msgstr "下载"
+
+#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.title)
+#: (content/menu/contents+en.lrpage.section) https//www.torproject.org/about/
+#: (content/about/contents+en.lrpage.section)
+#: https//www.torproject.org/about/history/
+#: (content/about/history/contents+en.lrpage.section)
+#: https//www.torproject.org/about/people/
+#: (content/about/people/contents+en.lrpeople.section)
+#: https//www.torproject.org/about/sponsors/
+#: (content/about/sponsors/contents+en.lrsponsors.section)
+#: https//www.torproject.org/about/reports/
+#: (content/about/reports/contents+en.lrreports.section)
+#: https//www.torproject.org/about/jobs/
+#: (content/about/jobs/contents+en.lrjobs.section)
+msgid "About"
+msgstr "关于"
+
+#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body)
+msgid "Documentation"
+msgstr "文档"
+
+#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body)
+msgid "Press"
+msgstr "新闻"
+
+#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body)
+msgid "Support"
+msgstr "支持"
+
+#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body)
+msgid "Jobs"
+msgstr "工作"
+
+#: https//www.torproject.org/menu/ 

[tor-commits] [translation/tor_outreach_md] Update translations for tor_outreach_md

[translation]

commit 3d6b423b92cf7e0b1a7a70b6b0fb9ea01f6bfa62
Author: Translation commit bot 
Date:   Thu Apr 25 13:50:19 2019 +

Update translations for tor_outreach_md
---
 tor-outreach2019-2020-zh_CN.md | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/tor-outreach2019-2020-zh_CN.md b/tor-outreach2019-2020-zh_CN.md
index 507a23dee..aa9d0c4ec 100644
--- a/tor-outreach2019-2020-zh_CN.md
+++ b/tor-outreach2019-2020-zh_CN.md
@@ -1,8 +1,8 @@
 # Tor Outreach Material 2019-2020
 
-# 1. TOR FOR PRIVACY 
+# 1. 为了隐私的Tor
 
-### Privacy is a human right
+### 隐私是一项人权
 
 Like many of us, Aleisha spends most of her time online--connecting with 
friends, posting on social media, and browsing the web.
 
@@ -135,28 +135,28 @@ Tor relay operators cannot reveal the true identity of 
Tor users.
 
 Continual peer review of Tor's source code by academic and open source 
communities ensures that there are no backdoors in Tor, and our social contract 
promises that we will never backdoor Tor. 
 
-## 7. Join the Tor community
+## 7. 加入Tor社区
 
-Tor is made possible by a diverse set of users, developers, relay operators, 
and advocates from around the world.
+Tor由来自世界各地的各种用户，开发人员，中继操作者
和倡导者组成。
 
-We need your help to make Tor more usable and secure for people everywhere.
+我们需要你的帮助，使Tor对所有人来说都更加实用和安全。
 
-You can volunteer with Tor by writing code, running a relay, creating 
documentation, offering user support, or telling people in your community about 
Tor.
+您可以通过编写代ç 
ï¼Œè¿è¡Œä¸­ç»§ï¼Œåˆ›å»ºæ–‡æ¡£ï¼Œæä¾›ç”¨æˆ·æ”¯æŒæˆ–告诉你的社区å…
³äºŽTor来志愿帮助Tor。
 
-The Tor community is governed by a code of conduct, and we outline our set of 
promises to the community in our social contract. 
+Tor社区受行为准则的约束，我们在社会性契约中概述了我们对社区的承诺。
 
-Learn more about Tor by visiting our website, our wiki, finding us on IRC, 
joining one of our mailing lists, or signing up for Tor News at 
newsletter.torproject.org.
+通过访问我们的网站，我们的维基，在IRC上找到我们，加å…
¥ä¸€ä¸ªæˆ‘们的邮件列表或在newsletter.torproject.org注册Tor新闻了解更多å
…³äºŽTor。
 
 
-## 8. Download Tor
+## 8. 下载Tor
 
-Tor for Desktop
+Tor 桌面版
 torproject.org/download
 
-TOR ON MOBILE
-### Android 
-Tor Browser for Android is available from GooglePlay.
+移动设备的Tor
+### 安卓
+安卓的Tor Browser可以在GooglePlay中下载。
 
 ### iOS
-Onion Browser, developed by M. Tigas, is the only browser we recommend for iOS.
+Onion Browser，由M. Tigas开发，是我们在iOS推荐的唯一浏览器。
 

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

[tor-commits] [translation/tpo-web] Update translations for tpo-web

[translation]

commit 5bb3410db918ac14357de7d62aeb18f0ad0ac9af
Author: Translation commit bot 
Date:   Thu Apr 25 13:20:45 2019 +

Update translations for tpo-web
---
 contents+fr.po| 49 +++---
 contents+zh-CN.po | 71 +--
 2 files changed, 67 insertions(+), 53 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 359854458..6dc04e295 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -6,9 +6,8 @@
 # erinm, 2019
 # Curtis Baltimore , 2019
 # Florentin Rochet , 2019
-# AO , 2019
 # Simon-Olivier Morneau , 2019
-# Thomas Prévost , 2019
+# AO , 2019
 # 
 msgid ""
 msgstr ""
@@ -16,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-23 13:54+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Thomas Prévost , 2019\n"
+"Last-Translator: AO , 2019\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +25,7 @@ msgstr ""
 
 #: https//www.torproject.org/ (content/contents+en.lrpage.title)
 msgid "Anonymity Online"
-msgstr "L'anonymat en ligne"
+msgstr "L’anonymat en ligne"
 
 #: https//www.torproject.org/ (content/contents+en.lrpage.section)
 msgid "home"
@@ -81,9 +80,9 @@ msgid ""
 "answers to frequently asked questions about connecting to Tor, circumventing"
 " censorship, using onion services, and more."
 msgstr ""
-"Besoin d'aide ? Visitez notre [Portail "
-"d'assistance](https://support.torproject.org) pour des foire aux questions "
-"posées sur la connexion à Tor, le contournement de la censure, 
l'utilisation"
+"Besoin d’aide ? Visitez notre [Portail "
+"d’assistance](https://support.torproject.org) pour des foire aux questions "
+"posées sur la connexion à Tor, le contournement de la censure, 
l’utilisation"
 " des services onion, et plus."
 
 #: https//www.torproject.org/download/
@@ -152,7 +151,7 @@ msgstr "Vous êtes équipé pour naviguer librement."
 #: (content/thank-you/contents+en.lrpage.body)
 msgid "Tor is the strongest tool for privacy and freedom online."
 msgstr ""
-"Tor est l'outil le plus puissant pour la vie privée et la liberté online."
+"Tor est l’outil le plus puissant pour la vie privée et la liberté online."
 
 #: https//www.torproject.org/thank-you/
 #: (content/thank-you/contents+en.lrpage.body)
@@ -160,7 +159,7 @@ msgid ""
 "It is free and open source software maintained by the Tor Project and a "
 "community of volunteers worldwide."
 msgstr ""
-"Il s'agit d'un logiciel gratuit et code source ouvert maintenu par le Projet"
+"Il s’agit d’un logiciel gratuit et code source ouvert maintenu par le 
Projet"
 " Tor et une communauté de volontaires dans le monde entier."
 
 #: https//www.torproject.org/thank-you/
@@ -223,8 +222,8 @@ msgid ""
 msgstr ""
 "Nous voulons que chacun puisse profiter du navigateur Tor Browser dans sa "
 "propre langue. Le navigateur Tor Browser est actuellement disponible dans 25"
-" langues différentes, et nous travaillons activement pour qu'il y en ait "
-"d'avantage. Vous désirez nous aider à traduire ?  Visitez [cette 
page](https"
+" langues différentes, et nous travaillons activement pour qu’il y en ait "
+"d’avantage. Vous désirez nous aider à traduire ?  Visitez [cette 
page](https"
 "://tb-manual.torproject.org/becoming-tor-translator/)."
 
 #: https//www.torproject.org/download/tor/
@@ -239,7 +238,7 @@ msgid ""
 "\"onion routing\" began in the mid 1990s."
 msgstr ""
 "Le Projet Tor, Inc, est devenu un organisme sans but lucratif 501(c)3 en "
-"2006, mais l'idée de \"routage en oignon\" est apparue au milieu des années 
"
+"2006, mais l’idée de \"routage en oignon\" est apparue au milieu des 
années "
 "1990."
 
 #: https//www.torproject.org/about/history/
@@ -253,7 +252,7 @@ msgstr ""
 "**Tout comme les utilisateurs de Tor, les développeurs, chercheurs, et "
 "bailleurs de fonds qui ont rendu Tor possible forment un groupe de personnes"
 " riche de diversité. Cependant, toutes les personnes impliquées dans Tor "
-"sont unies par une conviction commune : les utilisateurs d'Internet "
+"sont unies par une conviction commune : les utilisateurs d’Internet "
 "devraient avoir un accès privé à un Web non censuré.**"
 
 #: https//www.torproject.org/about/history/
@@ -267,11 +266,11 @@ msgid ""
 "network."
 msgstr ""
 "Dans les années 1990, le manque de sécurité sur Internet et son potentiel "
-"d'utilisation pour le pistage et la surveillance étaient en train de devenir"
+"d’utilisation pour le pistage et la surveillance étaient en train de 
devenir"
 " évidents, et en 1995, David Goldschalg, Mike Reed et Paul Syverson au "
 "United States Naval Research Laboratory (NRL) se sont demandé si il existait"
 " une manière de créer des connections à Internet qui ne divulgueraient pas 
"
-"qui parle avec qui, même à quelqu'un qui surveille le réseau."
+"qui parle avec 

[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0

[asn]

commit 88d6c2568d4a1ccc6fd3865e95bfb5243bf90395
Merge: e8b26bb71 a39789a02
Author: George Kadianakis 
Date:   Thu Apr 25 15:47:07 2019 +0300

Merge branch 'maint-0.4.0' into release-0.4.0

 changes/bug30001| 7 +++
 src/feature/dircache/dircache.c | 2 +-
 src/test/test_dir_handle_get.c  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

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

[tor-commits] [tor/release-0.4.0] Merge branch 'tor-github/pr/960' into maint-0.4.0

[asn]

commit a39789a02c2d89eaa8289a68a6b0fab0cc4d71dc
Merge: 24b68b477 37d7daa3c
Author: George Kadianakis 
Date:   Thu Apr 25 15:46:45 2019 +0300

Merge branch 'tor-github/pr/960' into maint-0.4.0

 changes/bug30001| 7 +++
 src/feature/dircache/dircache.c | 2 +-
 src/test/test_dir_handle_get.c  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)




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

[tor-commits] [tor/maint-0.4.0] changes: update the changes file for 30001

[asn]

commit 37d7daa3cd22a7dce833e09392bcdbadf6e047f1
Author: teor 
Date:   Wed Apr 17 12:34:33 2019 +1000

changes: update the changes file for 30001
---
 changes/bug30001 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/bug30001 b/changes/bug30001
index e3304701e..52e58872e 100644
--- a/changes/bug30001
+++ b/changes/bug30001
@@ -2,3 +2,6 @@
 - Use the approx_time() function when setting the "Expires" header
   in directory replies, to make them more testable. Needed for
   ticket 30001.
+  o Minor bug fixes (testing):
+- Check the time in the "Expires" header with approx_time().
+  Fixes bug 30001; bugfix on 0.4.0.4-rc.



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

[tor-commits] [tor/maint-0.4.0] Merge branch 'tor-github/pr/960' into maint-0.4.0

[asn]

commit a39789a02c2d89eaa8289a68a6b0fab0cc4d71dc
Merge: 24b68b477 37d7daa3c
Author: George Kadianakis 
Date:   Thu Apr 25 15:46:45 2019 +0300

Merge branch 'tor-github/pr/960' into maint-0.4.0

 changes/bug30001| 7 +++
 src/feature/dircache/dircache.c | 2 +-
 src/test/test_dir_handle_get.c  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'tor-github/pr/960' into maint-0.4.0

[asn]

commit a39789a02c2d89eaa8289a68a6b0fab0cc4d71dc
Merge: 24b68b477 37d7daa3c
Author: George Kadianakis 
Date:   Thu Apr 25 15:46:45 2019 +0300

Merge branch 'tor-github/pr/960' into maint-0.4.0

 changes/bug30001| 7 +++
 src/feature/dircache/dircache.c | 2 +-
 src/test/test_dir_handle_get.c  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)




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

[tor-commits] [tor/release-0.4.0] changes: update the changes file for 30001

[asn]

commit 37d7daa3cd22a7dce833e09392bcdbadf6e047f1
Author: teor 
Date:   Wed Apr 17 12:34:33 2019 +1000

changes: update the changes file for 30001
---
 changes/bug30001 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/bug30001 b/changes/bug30001
index e3304701e..52e58872e 100644
--- a/changes/bug30001
+++ b/changes/bug30001
@@ -2,3 +2,6 @@
 - Use the approx_time() function when setting the "Expires" header
   in directory replies, to make them more testable. Needed for
   ticket 30001.
+  o Minor bug fixes (testing):
+- Check the time in the "Expires" header with approx_time().
+  Fixes bug 30001; bugfix on 0.4.0.4-rc.



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

[asn]

commit 974c2674ebb8fb6716cc147e04eff6058094565f
Merge: 811a93f80 a39789a02
Author: George Kadianakis 
Date:   Thu Apr 25 15:47:07 2019 +0300

Merge branch 'maint-0.4.0'

 changes/bug30001| 7 +++
 src/feature/dircache/dircache.c | 2 +-
 src/test/test_dir_handle_get.c  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

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

[tor-commits] [tor/release-0.4.0] 30001: Fix a race condition in test_dir_handle_get.c

[asn]

commit 367dd9cf0226c087d49225a20415e9a199d2d71f
Author: Nick Mathewson 
Date:   Wed Apr 3 10:16:18 2019 -0400

30001: Fix a race condition in test_dir_handle_get.c

Previously we used time(NULL) to set the Expires: header in our HTTP
responses.  This made the actual contents of that header untestable,
since the unit tests have no good way to override time(), or to see
what time() was at the exact moment of the call to time() in
dircache.c.

This gave us a race in dir_handle_get/status_vote_next_bandwidth,
where the time() call in dircache.c got one value, and the call in
the tests got another value.

I'm applying our regular solution here: using approx_time() so that
the value stays the same between the code and the test.  Since
approx_time() is updated on every event callback, we shouldn't be
losing any accuracy here.

Fixes bug 30001. Bug introduced in fb4a40c32c4a7e5; not in any
released Tor.
---
 changes/bug30001| 4 
 src/feature/dircache/dircache.c | 2 +-
 src/test/test_dir_handle_get.c  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changes/bug30001 b/changes/bug30001
new file mode 100644
index 0..e3304701e
--- /dev/null
+++ b/changes/bug30001
@@ -0,0 +1,4 @@
+  o Minor features (testing):
+- Use the approx_time() function when setting the "Expires" header
+  in directory replies, to make them more testable. Needed for
+  ticket 30001.
diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c
index caa085dd6..1123d034e 100644
--- a/src/feature/dircache/dircache.c
+++ b/src/feature/dircache/dircache.c
@@ -124,7 +124,7 @@ write_http_response_header_impl(dir_connection_t *conn, 
ssize_t length,
long cache_lifetime)
 {
   char date[RFC1123_TIME_LEN+1];
-  time_t now = time(NULL);
+  time_t now = approx_time();
   buf_t *buf = buf_new_with_capacity(1024);
 
   tor_assert(conn);
diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c
index c3a17e730..e57bd0258 100644
--- a/src/test/test_dir_handle_get.c
+++ b/src/test/test_dir_handle_get.c
@@ -2526,7 +2526,7 @@ test_dir_handle_get_status_vote_next_bandwidth(void* data)
 
   /* Check cache lifetime */
   char expbuf[RFC1123_TIME_LEN+1];
-  time_t now = time(NULL);
+  time_t now = approx_time();
   /* BANDWIDTH_CACHE_LIFETIME is defined in dircache.c. */
   format_rfc1123_time(expbuf, (time_t)(now + 30*60));
   char *expires = NULL;



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

[tor-commits] [tor/master] changes: update the changes file for 30001

[asn]

commit 37d7daa3cd22a7dce833e09392bcdbadf6e047f1
Author: teor 
Date:   Wed Apr 17 12:34:33 2019 +1000

changes: update the changes file for 30001
---
 changes/bug30001 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/bug30001 b/changes/bug30001
index e3304701e..52e58872e 100644
--- a/changes/bug30001
+++ b/changes/bug30001
@@ -2,3 +2,6 @@
 - Use the approx_time() function when setting the "Expires" header
   in directory replies, to make them more testable. Needed for
   ticket 30001.
+  o Minor bug fixes (testing):
+- Check the time in the "Expires" header with approx_time().
+  Fixes bug 30001; bugfix on 0.4.0.4-rc.



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

[tor-commits] [tor/maint-0.4.0] 30001: Fix a race condition in test_dir_handle_get.c

[asn]

commit 367dd9cf0226c087d49225a20415e9a199d2d71f
Author: Nick Mathewson 
Date:   Wed Apr 3 10:16:18 2019 -0400

30001: Fix a race condition in test_dir_handle_get.c

Previously we used time(NULL) to set the Expires: header in our HTTP
responses.  This made the actual contents of that header untestable,
since the unit tests have no good way to override time(), or to see
what time() was at the exact moment of the call to time() in
dircache.c.

This gave us a race in dir_handle_get/status_vote_next_bandwidth,
where the time() call in dircache.c got one value, and the call in
the tests got another value.

I'm applying our regular solution here: using approx_time() so that
the value stays the same between the code and the test.  Since
approx_time() is updated on every event callback, we shouldn't be
losing any accuracy here.

Fixes bug 30001. Bug introduced in fb4a40c32c4a7e5; not in any
released Tor.
---
 changes/bug30001| 4 
 src/feature/dircache/dircache.c | 2 +-
 src/test/test_dir_handle_get.c  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changes/bug30001 b/changes/bug30001
new file mode 100644
index 0..e3304701e
--- /dev/null
+++ b/changes/bug30001
@@ -0,0 +1,4 @@
+  o Minor features (testing):
+- Use the approx_time() function when setting the "Expires" header
+  in directory replies, to make them more testable. Needed for
+  ticket 30001.
diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c
index caa085dd6..1123d034e 100644
--- a/src/feature/dircache/dircache.c
+++ b/src/feature/dircache/dircache.c
@@ -124,7 +124,7 @@ write_http_response_header_impl(dir_connection_t *conn, 
ssize_t length,
long cache_lifetime)
 {
   char date[RFC1123_TIME_LEN+1];
-  time_t now = time(NULL);
+  time_t now = approx_time();
   buf_t *buf = buf_new_with_capacity(1024);
 
   tor_assert(conn);
diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c
index c3a17e730..e57bd0258 100644
--- a/src/test/test_dir_handle_get.c
+++ b/src/test/test_dir_handle_get.c
@@ -2526,7 +2526,7 @@ test_dir_handle_get_status_vote_next_bandwidth(void* data)
 
   /* Check cache lifetime */
   char expbuf[RFC1123_TIME_LEN+1];
-  time_t now = time(NULL);
+  time_t now = approx_time();
   /* BANDWIDTH_CACHE_LIFETIME is defined in dircache.c. */
   format_rfc1123_time(expbuf, (time_t)(now + 30*60));
   char *expires = NULL;



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

[tor-commits] [tor/master] 30001: Fix a race condition in test_dir_handle_get.c

[asn]

commit 367dd9cf0226c087d49225a20415e9a199d2d71f
Author: Nick Mathewson 
Date:   Wed Apr 3 10:16:18 2019 -0400

30001: Fix a race condition in test_dir_handle_get.c

Previously we used time(NULL) to set the Expires: header in our HTTP
responses.  This made the actual contents of that header untestable,
since the unit tests have no good way to override time(), or to see
what time() was at the exact moment of the call to time() in
dircache.c.

This gave us a race in dir_handle_get/status_vote_next_bandwidth,
where the time() call in dircache.c got one value, and the call in
the tests got another value.

I'm applying our regular solution here: using approx_time() so that
the value stays the same between the code and the test.  Since
approx_time() is updated on every event callback, we shouldn't be
losing any accuracy here.

Fixes bug 30001. Bug introduced in fb4a40c32c4a7e5; not in any
released Tor.
---
 changes/bug30001| 4 
 src/feature/dircache/dircache.c | 2 +-
 src/test/test_dir_handle_get.c  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changes/bug30001 b/changes/bug30001
new file mode 100644
index 0..e3304701e
--- /dev/null
+++ b/changes/bug30001
@@ -0,0 +1,4 @@
+  o Minor features (testing):
+- Use the approx_time() function when setting the "Expires" header
+  in directory replies, to make them more testable. Needed for
+  ticket 30001.
diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c
index caa085dd6..1123d034e 100644
--- a/src/feature/dircache/dircache.c
+++ b/src/feature/dircache/dircache.c
@@ -124,7 +124,7 @@ write_http_response_header_impl(dir_connection_t *conn, 
ssize_t length,
long cache_lifetime)
 {
   char date[RFC1123_TIME_LEN+1];
-  time_t now = time(NULL);
+  time_t now = approx_time();
   buf_t *buf = buf_new_with_capacity(1024);
 
   tor_assert(conn);
diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c
index c3a17e730..e57bd0258 100644
--- a/src/test/test_dir_handle_get.c
+++ b/src/test/test_dir_handle_get.c
@@ -2526,7 +2526,7 @@ test_dir_handle_get_status_vote_next_bandwidth(void* data)
 
   /* Check cache lifetime */
   char expbuf[RFC1123_TIME_LEN+1];
-  time_t now = time(NULL);
+  time_t now = approx_time();
   /* BANDWIDTH_CACHE_LIFETIME is defined in dircache.c. */
   format_rfc1123_time(expbuf, (time_t)(now + 30*60));
   char *expires = NULL;



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

[tor-commits] [translation/tpo-web] Update translations for tpo-web

[translation]

commit ccffaedfcc9031b360a1faa277db18b8646524bf
Author: Translation commit bot 
Date:   Thu Apr 25 12:50:37 2019 +

Update translations for tpo-web
---
 contents+zh-CN.po | 73 +--
 1 file changed, 39 insertions(+), 34 deletions(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index f43fc3287..178691778 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -479,15 +479,15 @@ msgstr "讨论运行一个Tor中继"
 
 #: templates/contact.html:14
 msgid "Talk with Tor's global south community."
-msgstr ""
+msgstr "与Tor的全球南方社区交谈。"
 
 #: templates/contact.html:20
 msgid "Find us on Social Media"
-msgstr ""
+msgstr "在社交媒体上找到我们"
 
 #: templates/contact.html:34
 msgid "Volunteer with Tor"
-msgstr ""
+msgstr "Tor志愿者"
 
 #: templates/contact.html:38
 msgid "Get Involved"
@@ -495,7 +495,7 @@ msgstr "入门指南"
 
 #: templates/contact.html:44
 msgid "Join an email list"
-msgstr ""
+msgstr "加入邮件列表"
 
 #: templates/contact.html:47
 msgid ""
@@ -504,31 +504,33 @@ msgid ""
 "our support portal, you can ask the appropriate list. You're welcome to "
 "subscribe and just watch, too :)"
 msgstr ""
+"我们的团队在开放渠道，包
括电子邮件列表中进行协作，欢迎你的加入。 如果你
对我们的特定团队有疑问，且在我们的支持门户网站上未回答，您可以询问相应的列表。
 "
+"欢迎您订阅并观看:)"
 
 #: templates/contact.html:60
 msgid "Report a bug or give feedback."
-msgstr ""
+msgstr "报告缺陷或提交反馈"
 
 #: templates/contact.html:61
 msgid ""
 "Tor relies on the support of users and volunteers around the world to help "
 "us improve our software and resources, so your feedback is extremely "
 "valuable to us (and to all Tor users)."
-msgstr ""
+msgstr "Tor依靠全球用户和志愿者
的支持来帮助我们改进我们的软件和资源，因
此您的反馈对我们（以及所有Tor用户）都非常有价值。"
 
 #: templates/contact.html:67
 msgid "Tell us about a bad relay."
-msgstr ""
+msgstr "告知我们关于损坏的中继"
 
 #: templates/contact.html:68
 msgid ""
 "If you find a relay that you think is malicious, misconfigured, or otherwise"
 " broken, please check out our wiki page and blog post on how to report it."
-msgstr ""
+msgstr "如果你发现了一个你认为是恶意的，配置错误的或者å…
¶ä»–损坏的中继，请查看我们的维基页面和博客文章
来了解如何报告它。"
 
 #: templates/contact.html:76
 msgid "Report a security issue."
-msgstr ""
+msgstr "报告安全问题"
 
 #: templates/contact.html:77
 msgid ""
@@ -538,10 +540,13 @@ msgid ""
 "contacting tor-security-send...@lists.torproject.org or from pool.sks-"
 "keyservers.net. Here is the fingerprint:"
 msgstr ""
+"如果您在我们的项目或基础架构中发现了安å…
¨é—®é¢˜ï¼Œè¯·å‘送电子邮件至tor-secur...@lists.torproject.org。 "
+"如果你需要加密你的邮件，你
可以通过联系tor-security-send...@lists.torproject.org或从pool.sks-"
+"keyservers.net获取列表的GPG公钥。 这里是指纹："
 
 #: templates/contact.html:97
 msgid "Email us"
-msgstr ""
+msgstr "给我们发邮件"
 
 #: templates/contact.html:98
 msgid ""
@@ -553,15 +558,15 @@ msgstr ""
 
 #: templates/contact.html:104
 msgid "Send us Mail"
-msgstr ""
+msgstr "给我们发邮件"
 
 #: templates/download-android.html:12
 msgid "Get Tor Browser for Android."
-msgstr ""
+msgstr "获得安卓上的Tor Browser。"
 
 #: templates/download-android.html:15 templates/hero-download.html:5
 msgid "Protect yourself against tracking, surveillance, and censorship."
-msgstr ""
+msgstr "在追踪，监视和审查中保护你自己。"
 
 #: templates/download-android.html:20 templates/download-android.html:22
 msgid "Download .apk"
@@ -578,7 +583,7 @@ msgstr ""
 
 #: templates/download-android.html:35
 msgid "Are you a iOS user? We encourage you to try Onion Browser."
-msgstr ""
+msgstr "你是iOS用户吗？我们鼓励你尝试Onion Browser。"
 
 #: templates/download-languages.html:11 templates/download-options.html:11
 msgid "Language"
@@ -596,45 +601,45 @@ msgstr ""
 msgid ""
 "If you are in a country where Tor is blocked, you can configure Tor to "
 "connect to a bridge during the setup process."
-msgstr ""
+msgstr "如果你在一个Tor被屏蔽的国家里，你可以在安装
过程中配置Tor来连接到网桥"
 
 #: templates/download.html:10
 msgid "Select \"Tor is censored in my country.\""
-msgstr ""
+msgstr "选择“我所在国家对 Tor 进行了封锁”"
 
 #: templates/download.html:13
 msgid ""
 "If Tor is not censored, one of the most common reasons Tor won't connect is "
 "an incorrect system clock. Please make sure it's set correctly."
-msgstr ""
+msgstr "如果Tor没有被封锁，一个Tor没有连接最常见的原因
是不正确的系统时钟。请保证它是正确的设置。"
 
 #: 

[tor-commits] [tor/master] Merge branch 'bug30189_035' into bug30189_041

[asn]

commit 358df18064d0389219e610cf9aa5b08bbd6a0ec8
Merge: 9ae267538 802ac8ad6
Author: Nick Mathewson 
Date:   Mon Apr 15 14:27:32 2019 -0400

Merge branch 'bug30189_035' into bug30189_041

 changes/bug30189   |  4 
 src/lib/log/util_bug.c | 14 ++
 src/lib/log/util_bug.h |  8 +---
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --cc src/lib/log/util_bug.h
index 63c5309c9,2a4d68127..2e220b728
--- a/src/lib/log/util_bug.h
+++ b/src/lib/log/util_bug.h
@@@ -99,22 -95,19 +99,22 @@@
  #else
  /** Like assert(3), but send assertion failures to the log as well as to
   * stderr. */
 -#define tor_assert(expr) STMT_BEGIN \
 +#define tor_assert(expr) tor_assertf(expr, NULL)
 +
 +#define tor_assertf(expr, fmt, ...) STMT_BEGIN  \
if (ASSERT_PREDICT_LIKELY_(expr)) {   \
} else {  \
 -tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, #expr); \
 -tor_abort_();   \
 +tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, #expr,  \
 +  fmt, ##__VA_ARGS__);  \
- abort();\
++tor_abort_();\
} STMT_END
  #endif /* defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) */
  
  #define tor_assert_unreached()  \
STMT_BEGIN {  \
  tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, \
 -  "line should be unreached");  \
 +  "line should be unreached", NULL);\
- abort();\
+ tor_abort_();   \
} STMT_END
  
  /* Non-fatal bug assertions. The "unreached" variants mean "this line should
@@@ -240,12 -221,13 +240,14 @@@
  #define tor_fragile_assert() tor_assert_nonfatal_unreached_once()
  
  void tor_assertion_failed_(const char *fname, unsigned int line,
 -   const char *func, const char *expr);
 +   const char *func, const char *expr,
 +   const char *fmt, ...);
  void tor_bug_occurred_(const char *fname, unsigned int line,
 const char *func, const char *expr,
 -   int once);
 +   int once, const char *fmt, ...);
  
+ void tor_abort_(void) ATTR_NORETURN;
+ 
  #ifdef _WIN32
  #define SHORT_FILE__ (tor_fix_source_file(__FILE__))
  const char *tor_fix_source_file(const char *fname);



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

[tor-commits] [tor/master] Merge branch 'tor-github/pr/953'

[asn]

commit 811a93f80333d0f31ea9a46d9a1606c8e4ef11da
Merge: 6320b2988 358df1806
Author: George Kadianakis 
Date:   Thu Apr 25 15:43:47 2019 +0300

Merge branch 'tor-github/pr/953'

 changes/bug30189   |  4 
 src/lib/log/util_bug.c | 14 ++
 src/lib/log/util_bug.h |  8 +---
 3 files changed, 23 insertions(+), 3 deletions(-)

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

[tor-commits] [tor/master] Use a tor_abort_() wrapper in our util_bug.h macros

[asn]

commit 802ac8ad618a0674c26bb973a2277e07b20f8c7b
Author: Nick Mathewson 
Date:   Mon Apr 15 14:16:23 2019 -0400

Use a tor_abort_() wrapper in our util_bug.h macros

Previously, our use of abort() would break anywhere that we didn't
include stdlib.h.  This was especially troublesome in case where
tor_assert_nonfatal() was used with ALL_BUGS_ARE_FATAL, since that
one seldom gets tested.

As an alternative, we could have just made this header include
stdlib.h.  But that seems bloaty.

Fixes bug 30189; bugfix on 0.3.4.1-alpha.
---
 changes/bug30189   |  4 
 src/lib/log/util_bug.c | 14 ++
 src/lib/log/util_bug.h |  8 +---
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/changes/bug30189 b/changes/bug30189
new file mode 100644
index 0..f8c932a5f
--- /dev/null
+++ b/changes/bug30189
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation, unusual configuration):
+- Avoid failures when building with ALL_BUGS_ARE_FAILED due to
+  missing declarations of abort(), and prevent other such failures
+  in the future. Fixes bug 30189; bugfix on 0.3.4.1-alpha.
diff --git a/src/lib/log/util_bug.c b/src/lib/log/util_bug.c
index f42d2d2ab..c65a91ae9 100644
--- a/src/lib/log/util_bug.c
+++ b/src/lib/log/util_bug.c
@@ -19,6 +19,7 @@
 #include "lib/string/printf.h"
 
 #include 
+#include 
 
 #ifdef TOR_UNIT_TESTS
 static void (*failed_assertion_cb)(void) = NULL;
@@ -120,6 +121,19 @@ tor_bug_occurred_(const char *fname, unsigned int line,
 #endif
 }
 
+/**
+ * Call the abort() function to kill the current process with a fatal
+ * error.
+ *
+ * (This is a separate function so that we declare it in util_bug.h without
+ * including stdlib in all the users of util_bug.h)
+ **/
+void
+tor_abort_(void)
+{
+  abort();
+}
+
 #ifdef _WIN32
 /** Take a filename and return a pointer to its final element.  This
  * function is called on __FILE__ to fix a MSVC nit where __FILE__
diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h
index 18d40bbf3..2a4d68127 100644
--- a/src/lib/log/util_bug.h
+++ b/src/lib/log/util_bug.h
@@ -99,7 +99,7 @@
   if (ASSERT_PREDICT_LIKELY_(expr)) {   \
   } else {  \
 tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, #expr); \
-abort();\
+tor_abort_();   \
   } STMT_END
 #endif /* defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) */
 
@@ -107,7 +107,7 @@
   STMT_BEGIN {  \
 tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, \
   "line should be unreached");  \
-abort();\
+tor_abort_();   \
   } STMT_END
 
 /* Non-fatal bug assertions. The "unreached" variants mean "this line should
@@ -141,7 +141,7 @@
 #define BUG(cond)   \
   (ASSERT_PREDICT_UNLIKELY_(cond) ? \
(tor_assertion_failed_(SHORT_FILE__,__LINE__,__func__,"!("#cond")"), \
-abort(), 1) \
+tor_abort_(), 1)\
: 0)
 #elif defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS)
 #define tor_assert_nonfatal_unreached() STMT_NIL
@@ -226,6 +226,8 @@ void tor_bug_occurred_(const char *fname, unsigned int line,
const char *func, const char *expr,
int once);
 
+void tor_abort_(void) ATTR_NORETURN;
+
 #ifdef _WIN32
 #define SHORT_FILE__ (tor_fix_source_file(__FILE__))
 const char *tor_fix_source_file(const char *fname);



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

[tor-commits] [translation/tpo-web] Update translations for tpo-web

[translation]

commit e7b1f3cfc0a34db7deddbff3dcca93d74a692f4c
Author: Translation commit bot 
Date:   Thu Apr 25 12:20:46 2019 +

Update translations for tpo-web
---
 contents+zh-CN.po | 28 +++-
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index 36affec96..f43fc3287 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -259,6 +259,8 @@ msgid ""
 "Technology (MIT)](https://web.mit.edu/) graduate, began working on an NRL "
 "onion routing project with Paul Syverson."
 msgstr ""
+"在00年代，Roger 
Dingledine，一个应届[麻省理工大学(MIT)](https://web.mit.edu/)毕业生，开始与Paul
 "
+"Syverson在NRL洋葱路由项目工作。"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -268,6 +270,8 @@ msgid ""
 "stood for The Onion Routing. Nick Mathewson, a classmate of Roger's at MIT, "
 "joined the project soon after."
 msgstr ""
+"为了区分NRL的这个原始的工作和在å…
¶ä»–地方出现的洋葱路由工作，Roger把这个项目叫做Tor，这表示The
 Onion Routing。Nick "
+"Mathewson，Roger的一个MIT同学，在不久后加入了这个项目。"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -277,20 +281,21 @@ msgid ""
 "diverse interests and trust assumptions, and the software needed to be free "
 "and open to maximize transparency and separation."
 msgstr ""
+"从20世纪90年代开始，洋葱路由被认为依赖于分布式网络。 
网络需要由å…
·æœ‰ä¸åŒåˆ©ç›Šå’Œä¿¡ä»»å‡è®¾çš„实体运营，并且软件需要自由开放来最大化透明度和分离。"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
 msgid ""
 "That's why in October 2002 when the Tor network was initially deployed, its "
 "code was released under a free and open software license."
-msgstr ""
+msgstr "这就是为什么2002å¹´10月最初部署Tor网络时，其代ç 
æ˜¯åœ¨å…è´¹å¼€æ”¾çš„软件许可下发布的。"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
 msgid ""
 "By the end of 2003, the network had about a dozen volunteer nodes, mostly in"
 " the U.S., plus one in Germany."
-msgstr ""
+msgstr "截至2003年底，该网络有大约十二个志愿者
节点，大多数在美国，还有一个在德国。"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -307,7 +312,7 @@ msgid ""
 "In 2007, the organization began developing bridges to the Tor network to "
 "address censorship, such as the need to get around government firewalls, in "
 "order for its users to access the open web."
-msgstr ""
+msgstr 
"2007年，该组织开始与Tor网络建立网桥，以解决审查问题，例如需要绕过政府防火墙，以便å
…¶ç”¨æˆ·è®¿é—®å¼€æ”¾ç½‘络。"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -317,6 +322,7 @@ msgid ""
 " use, so starting in 2005, development of tools beyond just the Tor proxy "
 "began."
 msgstr ""
+"Tor开始在对隐私感å…
´è¶£çš„活动人员和精通技术的用户中越来越受欢迎，但对技术含量较低的人来说仍然很难使用，所以从2005年开始，除了Tor代理之外的工å
…·å¼€å§‹å¼€å‘。"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -325,6 +331,8 @@ msgid ""
 "[2008](https://lists.torproject.org/pipermail/tor-;
 "talk/2008-January/007837.html)."
 msgstr ""
+"Tor 
Browser的开发开始于[2008年](https://lists.torproject.org/pipermail/tor-;
+"talk/2008-January/007837.html)。"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -335,6 +343,8 @@ msgid ""
 " 2010. It not only protected people's identity online but also allowed them "
 "to access critical resources, social media, and websites which were blocked."
 msgstr ""
+"随着Tor浏览器让日常互联网用户和社运认识更容易使用Tor，Tor在[阿拉伯之春](https://www.theguardian.com/us-;
+"news/the-nsa-files)开始时成为了一种有效工具。它不仅
保护了人们的在线身份，还允许他们访问被阻止的å…
³é”®èµ„源，社交媒体和网站。"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -443,29 +453,29 @@ msgstr ""
 
 #: templates/contact.html:8
 msgid "Chat with us on"
-msgstr ""
+msgstr "与我们交流在"
 
 #: templates/contact.html:9
 msgid "Ask questions about using Tor."
-msgstr ""
+msgstr "询问关于使用Tor的问题"
 
 #: templates/contact.html:10
 msgid "Discuss Tor-related coding and protocols. Ideas are welcome."
-msgstr ""
+msgstr "讨论Tor相关的编码和协议。 欢迎提出看法。"
 
 #: templates/contact.html:11
 msgid ""
 "Discuss organization and community related topics: 

[tor-commits] [translation/tba-torbrowserstringsdtd_completed] Update translations for tba-torbrowserstringsdtd_completed

[translation]

commit dcb34b83ff9534f7c302d76a978f9d2abf697f2c
Author: Translation commit bot 
Date:   Thu Apr 25 12:17:50 2019 +

Update translations for tba-torbrowserstringsdtd_completed
---
 id/torbrowser_strings.dtd | 57 +++
 1 file changed, 57 insertions(+)

diff --git a/id/torbrowser_strings.dtd b/id/torbrowser_strings.dtd
new file mode 100644
index 0..3a01f61eb
--- /dev/null
+++ b/id/torbrowser_strings.dtd
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

[tor-commits] [translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd

[translation]

commit b9a9c5c5ce150aa5d42a86e7275a5e8125d28833
Author: Translation commit bot 
Date:   Thu Apr 25 12:17:43 2019 +

Update translations for tba-torbrowserstringsdtd
---
 id/torbrowser_strings.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/id/torbrowser_strings.dtd b/id/torbrowser_strings.dtd
index 11b4e73c1..3a01f61eb 100644
--- a/id/torbrowser_strings.dtd
+++ b/id/torbrowser_strings.dtd
@@ -33,7 +33,7 @@
 
 
 
-
+
 
 
 
@@ -50,8 +50,8 @@
 
 
 
-
-
-
+
+
+
 
 

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

[tor-commits] [translation/support-portal] Update translations for support-portal

[translation]

commit 0feba61b56f8d50b4f0ad14901016e6e92c6b31b
Author: Translation commit bot 
Date:   Thu Apr 25 11:51:30 2019 +

Update translations for support-portal
---
 contents+bn.po | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/contents+bn.po b/contents+bn.po
index 92c23a119..9542d9d39 100644
--- a/contents+bn.po
+++ b/contents+bn.po
@@ -1697,7 +1697,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.title)
 msgid "Why does Tor Browser ship with JavaScript enabled?"
-msgstr ""
+msgstr "কেন জাভাস্ক্রিপ্ট-এর 
ব্রাউজার শিপ সক্রিয় আছে?"
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.description)
@@ -1714,6 +1714,8 @@ msgid ""
 "Most users would give up on Tor entirely if we disabled JavaScript by "
 "default because it would cause so many problems for them."
 msgstr ""
+"বেশীরভাগ ব্যবহারকারী যদি 
আমাদের সাথে জাভাস্ক্রিপ্ট 
নিষ্ক্রিয় করে দেয়, "
+"তাহলে তাদের জন্য অনেক সমস্যা 
সৃষ্টি হবে ।"
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.description)
@@ -1722,6 +1724,9 @@ msgid ""
 "making it usable for the majority of people, so for now, that means leaving "
 "JavaScript enabled by default."
 msgstr ""
+"পরিশেষে, আমরা টর ব্রাউজারকে 
নিরাপদ হিসেবে গড়ে তুলতে চাই, 
যখন বেশীরভাগ "
+"মানুষের জন্য এটি ব্যবহার করা 
সম্ভব, তাই এখন, এর মানে হল 
জাভাস্ক্রিপ্ট থেকে "
+"সক্রিয় হওয়া ।"
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.description)
@@ -1730,6 +1735,9 @@ msgid ""
 " we recommend changing your Tor Browser's security slider (in the Tor "
 "Browser Onion menu under \"Security Settings\")."
 msgstr ""
+"ডিফল্ট হিসাবে সব HTTP 
সাইটগুলিতে জাভাস্ক্রিপ্ট 
নিষ্ক্রিয় করতে চান এমন "
+"ব্যবহারকারীদের জন্য, আমরা 
আপনার টর ব্রাউজারের 
নিরাপত্তা স্লাইডার পরিবর্তন "
+"করার পরামর্শ দিই (টর 
ব্রাউজারের \"নিরাপত্তা 
সেটিংস\" মেনুর মেনুতে)।"
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.description)
@@ -1737,6 +1745,8 @@ msgid ""
 "The low/default setting allows JavaScript, but the medium and high levels "
 "both block JavaScript on HTTP sites."
 msgstr ""
+"নিম্ন/ডিফল্ট সেটিং 
জাভাস্ক্রিপ্ট সম্মতি দেয়, 
কিন্তু মধ্যম এবং উচ্চ মাত্রা "
+"উভয়ই HTTP সাইটে জাভাস্ক্রিপ্ট 
ব্লক করে ।"
 
 #: https//support.torproject.org/tbb/tbb-35/
 #: (content/tbb/tbb-35/contents+en.lrquestion.title)

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

[tor-commits] [translation/tpo-web] Update translations for tpo-web

[translation]

commit 7d1bec49c6629078ae4ae7d41019ac17d2c6dd51
Author: Translation commit bot 
Date:   Thu Apr 25 11:51:02 2019 +

Update translations for tpo-web
---
 contents+zh-CN.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index b8cfa8200..36affec96 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -135,7 +135,7 @@ msgstr "成功"
 #: https//www.torproject.org/thank-you/
 #: (content/thank-you/contents+en.lrpage.body)
 msgid "You're equipped to browse freely."
-msgstr ""
+msgstr "您可以自由浏览。"
 
 #: https//www.torproject.org/thank-you/
 #: (content/thank-you/contents+en.lrpage.body)
@@ -154,7 +154,7 @@ msgstr "这是一个由Tor Project和世界性的志愿者
社区维护的自由
 msgid ""
 "We need your help to keep Tor secure and safe for millions across the globe."
 " [Donate Now](https://donate.torproject.org/)"
-msgstr ""
+msgstr "我们需要你的帮助来以确保Tor对å…
¨çƒæ•°ç™¾ä¸‡ç”¨æˆ·çš„保密和安å…
¨ã€‚[现在捐助](https://donate.torproject.org/)"
 
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.title)
 #: https//www.torproject.org/about/history/
@@ -237,7 +237,7 @@ msgstr ""
 msgid ""
 "Their answer was to create and deploy the first research designs and "
 "prototypes of onion routing."
-msgstr ""
+msgstr "他们的回答是为了创造和部署洋葱路由的首个ç 
”究的设计和原型。"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -245,12 +245,12 @@ msgid ""
 "The goal of onion routing was to have a way to use the internet with as much"
 " privacy as possible, and the idea was to route traffic through multiple "
 "servers and encrypt it each step of the way."
-msgstr ""
+msgstr "洋葱路由的目æ 
‡æ˜¯ä¸ºäº†æœ‰ä¸€ç§å°½å¯èƒ½éšç§çš„方式来使用互联网，å…
¶æƒ³æ³•æ˜¯é€šè¿‡å¤šä¸ªæœåŠ¡å™¨å’Œåœ¨æ¯ä¸€æ­¥è¿›è¡ŒåŠ å¯†æ¥è·¯ç”±æµé‡ã€‚"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
 msgid "This is still a simple explanation for how Tor works today."
-msgstr ""
+msgstr "这仍是一种对今天的Tor如何工作的简单解释。"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)

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

[tor-commits] [translation/support-portal] Update translations for support-portal

[translation]

commit 85eaaf52c3a74ae4efb766992da07d4c27b6c41e
Author: Translation commit bot 
Date:   Thu Apr 25 11:21:10 2019 +

Update translations for support-portal
---
 contents+zh-CN.po | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index 59db7b0b4..e886312be 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -5,6 +5,7 @@
 # erinm, 2019
 # Yikai Yang , 2019
 # Emma Peel, 2019
+# ciaran , 2019
 # 
 msgid ""
 msgstr ""
@@ -12,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-25 10:51+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: ciaran , 2019\n"
 "Language-Team: Chinese (China) 
(https://www.transifex.com/otf/teams/1519/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1620,6 +1621,9 @@ msgid ""
 "add more. Want to help us translate? [See here](https://tb-;
 "manual.torproject.org/becoming-tor-translator/)"
 msgstr ""
+"我们想让任何人都可以用他们的语言享受Tor Browser。Tor "
+"Browser现在可以在25种不同的语言中使用，并且我们在努力添åŠ
 æ›´å¤šã€‚想要帮助我们翻译吗？[看这里](https://tb-;
+"manual.torproject.org/becoming-tor-translator/)"
 
 #: https//support.torproject.org/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.description)

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

[tor-commits] [translation/tpo-web] Update translations for tpo-web

[translation]

commit d1dd71b198fab7b2ad510f6b376570599fd25c58
Author: Translation commit bot 
Date:   Thu Apr 25 11:20:48 2019 +

Update translations for tpo-web
---
 contents+zh-CN.po | 21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index f61cbca7e..b8cfa8200 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -6,6 +6,7 @@
 # Emma Peel, 2019
 # Zhui Shen <12231...@bjtu.edu.cn>, 2019
 # Yikai Yang , 2019
+# ciaran , 2019
 # 
 msgid ""
 msgstr ""
@@ -13,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-23 13:54+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Yikai Yang , 2019\n"
+"Last-Translator: ciaran , 2019\n"
 "Language-Team: Chinese (China) 
(https://www.transifex.com/otf/teams/1519/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,7 +64,7 @@ msgstr "The Tor Project"
 #: https//www.torproject.org/contact/
 #: (content/contact/contents+en.lrpage.body)
 msgid "### Get Support"
-msgstr ""
+msgstr "### 获得支持"
 
 #: https//www.torproject.org/contact/
 #: (content/contact/contents+en.lrpage.body)
@@ -72,6 +73,7 @@ msgid ""
 "answers to frequently asked questions about connecting to Tor, circumventing"
 " censorship, using onion services, and more."
 msgstr ""
+"需要帮助？访问我们的[支持页面](https://support.torproject.org)来获得å
…³äºŽè¿žæŽ¥åˆ°Tor，规避审查，使用洋葱路由等常见问题的回答"
 
 #: https//www.torproject.org/download/
 #: (content/download/contents+en.lrpage.title)
@@ -138,14 +140,14 @@ msgstr ""
 #: https//www.torproject.org/thank-you/
 #: (content/thank-you/contents+en.lrpage.body)
 msgid "Tor is the strongest tool for privacy and freedom online."
-msgstr ""
+msgstr "Tor是最强的线上隐私和自由工具"
 
 #: https//www.torproject.org/thank-you/
 #: (content/thank-you/contents+en.lrpage.body)
 msgid ""
 "It is free and open source software maintained by the Tor Project and a "
 "community of volunteers worldwide."
-msgstr ""
+msgstr "这是一个由Tor Project和世界性的志愿者
社区维护的自由和开放软件"
 
 #: https//www.torproject.org/thank-you/
 #: (content/thank-you/contents+en.lrpage.body)
@@ -163,14 +165,14 @@ msgstr "历史记录"
 #: https//www.torproject.org/download/alpha/
 #: (content/download/alpha/contents+en.lrpage.title)
 msgid "Download Tor Browser Alpha"
-msgstr ""
+msgstr "下载Tor浏览器内测版"
 
 #: https//www.torproject.org/download/alpha/
 #: (content/download/alpha/contents+en.lrpage.body)
 msgid ""
 "Before we release a stable version of our software, we release an alpha "
 "version to test features and find bugs."
-msgstr ""
+msgstr 
"在我们发布我们软件的稳定版本前，我们会发布一个内
测版本来测试功能并寻找缺陷。"
 
 #: https//www.torproject.org/download/alpha/
 #: (content/download/alpha/contents+en.lrpage.body)
@@ -184,7 +186,7 @@ msgstr ""
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
 msgid "Download Tor Browser in your language"
-msgstr ""
+msgstr "下载你的语言的Tor Browser"
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.body)
@@ -194,11 +196,14 @@ msgid ""
 "add more. Want to help us translate? [See here](https://tb-;
 "manual.torproject.org/becoming-tor-translator/)"
 msgstr ""
+"我们想让任何人都可以用他们的语言享受Tor Browser。Tor "
+"Browser现在可以在25种不同的语言中使用，并且我们在努力添åŠ
 æ›´å¤šã€‚想要帮助我们翻译吗？[看这里](https://tb-;
+"manual.torproject.org/becoming-tor-translator/)"
 
 #: https//www.torproject.org/download/tor/
 #: (content/download/tor/contents+en.lrpage.title)
 msgid "Download Tor Source Code"
-msgstr ""
+msgstr "下载Tor源代码"
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)

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

[tor-commits] [translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed

[translation]

commit 8970a24985dd64091e82084c44e9b776d128a88f
Author: Translation commit bot 
Date:   Thu Apr 25 11:19:52 2019 +

Update translations for torbutton-browseronboardingproperties_completed
---
 id/browserOnboarding.properties | 71 +
 1 file changed, 71 insertions(+)

diff --git a/id/browserOnboarding.properties b/id/browserOnboarding.properties
new file mode 100644
index 0..585064f0b
--- /dev/null
+++ b/id/browserOnboarding.properties
@@ -0,0 +1,71 @@
+# Copyright (c) 2019, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Selamat datang
+onboarding.tour-tor-welcome.title=Anda siap.
+onboarding.tour-tor-welcome.description=Tor Browser menawarkan standar 
tertinggi atas privasi dan keamanan saat menjelajahi jaringan. Anda sekarang 
dilindungi dari pelacakan, pengintaian, dan penyensoran. Pelatihan singkat ini 
akan menunjukkan Anda bagaimana caranya.
+onboarding.tour-tor-welcome.next-button=Pergi ke Privasi
+
+onboarding.tour-tor-privacy=Privasi
+onboarding.tour-tor-privacy.title=Menolak pelacak dan pengintai.
+onboarding.tour-tor-privacy.description=Tor Browser mengisolasi cookie dan 
menghapus riwayat peramban anda setelah ditutup. Modifikasi ini menjamin 
privasi dan keamanan telah terproteksi di dalam peramban. Klik 'Jaringan Tor' 
untuk pempelajari bagaimana kami melindungi anda pada level jaringan.
+onboarding.tour-tor-privacy.button=Pergi ke Jaringan Tor
+
+onboarding.tour-tor-network=Jaringan Tor
+onboarding.tour-tor-network.title=Mengelilingi jaringan yang terdesentralisasi.
+onboarding.tour-tor-network.description=Tor Browser menghubungkan Anda ke 
jaringan Tor yang dijalankan oleh ribuan relawan di seluruh dunia. Tidak 
seperti VPN, tidak ada satu titik kesalahan atau entitas sentral yang perlu 
anda percaya untuk menikmati internet secara privat.
+onboarding.tour-tor-network.button=Pergi ke Tampilan Sirkuit
+
+onboarding.tour-tor-circuit-display=Tampilan Sirkuit
+onboarding.tour-tor-circuit-display.title=Lihat jalan Anda.
+onboarding.tour-tor-circuit-display.description=Untuk setiap domain yang Anda 
kunjungi, lalu lintas anda disampaikan dan terenkripsi dalam sebuah sirkuit 
melalui tiga relay Tor dari seluruh dunia. Tidak ada situs web mengetahui dari 
mana anda terhubung. Anda dapat meminta sebuah sirkuit baru dengan klik 
'Sirkuit Baru untuk Situs ini' pada Tampilan Sirkuit kami.
+onboarding.tour-tor-circuit-display.button=Lihat Jalan Saya
+onboarding.tour-tor-circuit-display.next-button=Pergi ke Keamanan
+
+onboarding.tour-tor-security=Keamanan
+onboarding.tour-tor-security.title=Putuskan pengalamanmu.
+onboarding.tour-tor-security.description=Kami juga menyediakan Anda dengan 
pengaturan tambahan untuk meningkatkan keamanan peramban Anda. Pengaturan 
Keamanan kami mengizinkan anda untuk memblokir elemen-elemen yang dapat 
digunakan untuk menyerang komputer Anda. Klik di bawah untuk mengetahui apa 
saja yang dilakukan oleh pilihan yang berbeda.
+onboarding.tour-tor-security.description-suffix=Catatan: Secara bawaan, 
NoScript dan HTTPS Everywhere\n tidak termasuk di dalam toolbar, namun Anda 
dapat menyesuaikan toolbar Anda untuk menambahkannya.
+onboarding.tour-tor-security-level.button=Lihat Level Keamanan Anda
+onboarding.tour-tor-security-level.next-button=Pergi ke Tips Pengalaman
+
+onboarding.tour-tor-expect-differences=Tips Pengalaman
+onboarding.tour-tor-expect-differences.title=Harapkan beberapa perubahan.
+onboarding.tour-tor-expect-differences.description=Dengan semua fitur keamanan 
dan privasi yang disediakan oleh Tor, pengalaman Anda saat menjelajahi internet 
mungkin akan sedikit berbeda. Kecepatan internet mungkin akan berkurang, dan 
berdasarkan level keamanan Anda, beberapa elemen mungkin tidak bisa bekerja ada 
dimuat. Anda mungkin juga akan mendapatkan pertanyaan untuk membuktikan bahwa 
Anda adalah manusia dan bukan robot.
+onboarding.tour-tor-expect-differences.button=Lihat FAQs
+onboarding.tour-tor-expect-differences.next-button=Pergi ke Layanan Onion
+
+onboarding.tour-tor-onion-services=Layanan Onion
+onboarding.tour-tor-onion-services.title=Menjadi lebih terlindung.
+onboarding.tour-tor-onion-services.description=Layanan Onion adalah situs yang 
berakhir dengan sebuah .onion yang menyediakan perlindungan lebih kepada 
penerbit dan pengunjung, termasuk tambahan penjagaan terhadap sensor. Layanan 
Onion mengizinkan siapa saja untuk menyediakan konten dan layanan secara 
anonim. Klik di bawah untuk mengunjungu situs onion DuckDuckGo.
+onboarding.tour-tor-onion-services.button=Kunjungi sebuah Onion
+onboarding.tour-tor-onion-services.next-button=Selesai
+
+onboarding.overlay-icon-tooltip-updated2=Lihat apa yang baru\ndi %S
+onboarding.tour-tor-update.prefix-new=Baru
+onboarding.tour-tor-update.prefix-updated=Telah terupdate
+
+onboarding.tour-tor-toolbar=Toolbar
+onboarding.tour-tor-toolbar-update-8.5.title=Tata letak toolbar

[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties

[translation]

commit 7d02b8e8284f8e31f100df81bb86ff2a682cd325
Author: Translation commit bot 
Date:   Thu Apr 25 11:19:45 2019 +

Update translations for torbutton-browseronboardingproperties
---
 id/browserOnboarding.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/id/browserOnboarding.properties b/id/browserOnboarding.properties
index a91fd9238..585064f0b 100644
--- a/id/browserOnboarding.properties
+++ b/id/browserOnboarding.properties
@@ -26,14 +26,14 @@ onboarding.tour-tor-circuit-display.next-button=Pergi ke 
Keamanan
 onboarding.tour-tor-security=Keamanan
 onboarding.tour-tor-security.title=Putuskan pengalamanmu.
 onboarding.tour-tor-security.description=Kami juga menyediakan Anda dengan 
pengaturan tambahan untuk meningkatkan keamanan peramban Anda. Pengaturan 
Keamanan kami mengizinkan anda untuk memblokir elemen-elemen yang dapat 
digunakan untuk menyerang komputer Anda. Klik di bawah untuk mengetahui apa 
saja yang dilakukan oleh pilihan yang berbeda.
-onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and 
HTTPS Everywhere are not included on the toolbar, but you can customize your 
toolbar to add them.
+onboarding.tour-tor-security.description-suffix=Catatan: Secara bawaan, 
NoScript dan HTTPS Everywhere\n tidak termasuk di dalam toolbar, namun Anda 
dapat menyesuaikan toolbar Anda untuk menambahkannya.
 onboarding.tour-tor-security-level.button=Lihat Level Keamanan Anda
 onboarding.tour-tor-security-level.next-button=Pergi ke Tips Pengalaman
 
 onboarding.tour-tor-expect-differences=Tips Pengalaman
 onboarding.tour-tor-expect-differences.title=Harapkan beberapa perubahan.
 onboarding.tour-tor-expect-differences.description=Dengan semua fitur keamanan 
dan privasi yang disediakan oleh Tor, pengalaman Anda saat menjelajahi internet 
mungkin akan sedikit berbeda. Kecepatan internet mungkin akan berkurang, dan 
berdasarkan level keamanan Anda, beberapa elemen mungkin tidak bisa bekerja ada 
dimuat. Anda mungkin juga akan mendapatkan pertanyaan untuk membuktikan bahwa 
Anda adalah manusia dan bukan robot.
-onboarding.tour-tor-expect-differences.button=See FAQs
+onboarding.tour-tor-expect-differences.button=Lihat FAQs
 onboarding.tour-tor-expect-differences.next-button=Pergi ke Layanan Onion
 
 onboarding.tour-tor-onion-services=Layanan Onion
@@ -52,7 +52,7 @@ onboarding.tour-tor-toolbar-update-8.5.description=Kami 
meningkatkan tata letak
 onboarding.tour-tor-toolbar-update-8.5.next-button=Pergi ke Keamanan
 
 onboarding.tour-tor-security-update-8.5.title=Pengalaman tingkat keamanan
-onboarding.tour-tor-security-update-8.5.description=We improved how you see 
and set your security level. We replaced the security slider with a toolbar 
icon that makes your current level visible at all times. Click it to view 
details about your current level or to change your security settings.
+onboarding.tour-tor-security-update-8.5.description=Kami meningkatkan cara 
bagaimana Anda melihat dan mengatur level keamanan Anda. Kami mengganti slider 
keamanan dengan sebuah ikon toolbar yang membuat level Anda saat ini terlihat 
setiap saat. Klik untuk melihat detil tentang level Anda saat ini atau untuk 
mengganti pengaturan keamanan Anda. 
 
 # Circuit Display onboarding.
 onboarding.tor-circuit-display.next=Selanjutnya

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

[tor-commits] [translation/support-portal_completed] Update translations for support-portal_completed

[translation]

commit 887146fda89a7e8f14997ed8bdb818f02fea6483
Author: Translation commit bot 
Date:   Thu Apr 25 10:51:03 2019 +

Update translations for support-portal_completed
---
 contents+es.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index adcdf3c76..a86ee84e1 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -143,9 +143,9 @@ msgid ""
 "Browser](https://www.torproject.org/download) and then using it to navigate "
 "to the blocked site will allow access."
 msgstr ""
-"La mayoría de las veces se logrará el acceso simplemente descargando el "
-"[Navegador Tor](https://www.torproject.org/es/download/)  y luego usándolo "
-"para navegar hacia el sitio bloqueado."
+"La mayoría de las veces simplemente descargar el [Navegador "
+"Tor](https://www.torproject.org/es/download/)  y usarlo para navegar hacia "
+"el sitio bloqueado logrará el acceso."
 
 #: https//support.torproject.org/faq/faq-2/
 #: (content/faq/faq-2/contents+en.lrquestion.description)
@@ -158,8 +158,8 @@ msgid ""
 "circumvention options available, including [pluggable transports](https"
 "://tb-manual.torproject.org/transports/)."
 msgstr ""
-"En lugares donde hay una fuerte censura, tenemos distintas opciones de "
-"elusión disponibles, incluyendo ​[transportes conectables](https://tb-;
+"En lugares donde hay mucha censura tenemos distintas opciones de elusión "
+"disponibles, incluyendo ​[transportes conectables](https://tb-;
 "manual.torproject.org/es/transports/)."
 
 #: https//support.torproject.org/faq/faq-2/

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

[tor-commits] [translation/support-portal] Update translations for support-portal

[translation]

commit d6d9d89d26a5260448613241db45ee9ba56812e1
Author: Translation commit bot 
Date:   Thu Apr 25 10:50:56 2019 +

Update translations for support-portal
---
 contents+es.po | 10 +-
 contents+pl.po |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index adcdf3c76..a86ee84e1 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -143,9 +143,9 @@ msgid ""
 "Browser](https://www.torproject.org/download) and then using it to navigate "
 "to the blocked site will allow access."
 msgstr ""
-"La mayoría de las veces se logrará el acceso simplemente descargando el "
-"[Navegador Tor](https://www.torproject.org/es/download/)  y luego usándolo "
-"para navegar hacia el sitio bloqueado."
+"La mayoría de las veces simplemente descargar el [Navegador "
+"Tor](https://www.torproject.org/es/download/)  y usarlo para navegar hacia "
+"el sitio bloqueado logrará el acceso."
 
 #: https//support.torproject.org/faq/faq-2/
 #: (content/faq/faq-2/contents+en.lrquestion.description)
@@ -158,8 +158,8 @@ msgid ""
 "circumvention options available, including [pluggable transports](https"
 "://tb-manual.torproject.org/transports/)."
 msgstr ""
-"En lugares donde hay una fuerte censura, tenemos distintas opciones de "
-"elusión disponibles, incluyendo ​[transportes conectables](https://tb-;
+"En lugares donde hay mucha censura tenemos distintas opciones de elusión "
+"disponibles, incluyendo ​[transportes conectables](https://tb-;
 "manual.torproject.org/es/transports/)."
 
 #: https//support.torproject.org/faq/faq-2/
diff --git a/contents+pl.po b/contents+pl.po
index b5c6f54a2..6ce0f2a46 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -4322,7 +4322,7 @@ msgstr ""
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "### Onion Browser"
-msgstr ""
+msgstr "### Onion Browser"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)

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

[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties

[translation]

commit ee8ea0a4e4a8724dd058a33f58a396c93eb7c35c
Author: Translation commit bot 
Date:   Thu Apr 25 10:49:36 2019 +

Update translations for torbutton-browseronboardingproperties
---
 id/browserOnboarding.properties | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/id/browserOnboarding.properties b/id/browserOnboarding.properties
index 8aa8be37c..a91fd9238 100644
--- a/id/browserOnboarding.properties
+++ b/id/browserOnboarding.properties
@@ -20,7 +20,7 @@ onboarding.tour-tor-network.button=Pergi ke Tampilan Sirkuit
 onboarding.tour-tor-circuit-display=Tampilan Sirkuit
 onboarding.tour-tor-circuit-display.title=Lihat jalan Anda.
 onboarding.tour-tor-circuit-display.description=Untuk setiap domain yang Anda 
kunjungi, lalu lintas anda disampaikan dan terenkripsi dalam sebuah sirkuit 
melalui tiga relay Tor dari seluruh dunia. Tidak ada situs web mengetahui dari 
mana anda terhubung. Anda dapat meminta sebuah sirkuit baru dengan klik 
'Sirkuit Baru untuk Situs ini' pada Tampilan Sirkuit kami.
-onboarding.tour-tor-circuit-display.button=See My Path
+onboarding.tour-tor-circuit-display.button=Lihat Jalan Saya
 onboarding.tour-tor-circuit-display.next-button=Pergi ke Keamanan
 
 onboarding.tour-tor-security=Keamanan
@@ -34,34 +34,34 @@ onboarding.tour-tor-expect-differences=Tips Pengalaman
 onboarding.tour-tor-expect-differences.title=Harapkan beberapa perubahan.
 onboarding.tour-tor-expect-differences.description=Dengan semua fitur keamanan 
dan privasi yang disediakan oleh Tor, pengalaman Anda saat menjelajahi internet 
mungkin akan sedikit berbeda. Kecepatan internet mungkin akan berkurang, dan 
berdasarkan level keamanan Anda, beberapa elemen mungkin tidak bisa bekerja ada 
dimuat. Anda mungkin juga akan mendapatkan pertanyaan untuk membuktikan bahwa 
Anda adalah manusia dan bukan robot.
 onboarding.tour-tor-expect-differences.button=See FAQs
-onboarding.tour-tor-expect-differences.next-button=Go to Onion Services
+onboarding.tour-tor-expect-differences.next-button=Pergi ke Layanan Onion
 
 onboarding.tour-tor-onion-services=Layanan Onion
 onboarding.tour-tor-onion-services.title=Menjadi lebih terlindung.
 onboarding.tour-tor-onion-services.description=Layanan Onion adalah situs yang 
berakhir dengan sebuah .onion yang menyediakan perlindungan lebih kepada 
penerbit dan pengunjung, termasuk tambahan penjagaan terhadap sensor. Layanan 
Onion mengizinkan siapa saja untuk menyediakan konten dan layanan secara 
anonim. Klik di bawah untuk mengunjungu situs onion DuckDuckGo.
-onboarding.tour-tor-onion-services.button=Visit an Onion
+onboarding.tour-tor-onion-services.button=Kunjungi sebuah Onion
 onboarding.tour-tor-onion-services.next-button=Selesai
 
-onboarding.overlay-icon-tooltip-updated2=See what's new\nin %S
+onboarding.overlay-icon-tooltip-updated2=Lihat apa yang baru\ndi %S
 onboarding.tour-tor-update.prefix-new=Baru
 onboarding.tour-tor-update.prefix-updated=Telah terupdate
 
 onboarding.tour-tor-toolbar=Toolbar
-onboarding.tour-tor-toolbar-update-8.5.title=Toolbar layout
-onboarding.tour-tor-toolbar-update-8.5.description=We improved the browser 
toolbar layout. We moved the Torbutton icon after the URL bar, and we added a 
security level icon next to it.
+onboarding.tour-tor-toolbar-update-8.5.title=Tata letak toolbar
+onboarding.tour-tor-toolbar-update-8.5.description=Kami meningkatkan tata 
letak toolbar peramban. Kami memindahkan ikon Torbutton setelah baris URL, dan 
kami menambahkan sebuah ikon level keamanan di sebelahnya.
 onboarding.tour-tor-toolbar-update-8.5.next-button=Pergi ke Keamanan
 
-onboarding.tour-tor-security-update-8.5.title=Security level experience
+onboarding.tour-tor-security-update-8.5.title=Pengalaman tingkat keamanan
 onboarding.tour-tor-security-update-8.5.description=We improved how you see 
and set your security level. We replaced the security slider with a toolbar 
icon that makes your current level visible at all times. Click it to view 
details about your current level or to change your security settings.
 
 # Circuit Display onboarding.
 onboarding.tor-circuit-display.next=Selanjutnya
 onboarding.tor-circuit-display.done=Selesai
-onboarding.tor-circuit-display.one-of-three=1 of 3
-onboarding.tor-circuit-display.two-of-three=2 of 3
-onboarding.tor-circuit-display.three-of-three=3 of 3
+onboarding.tor-circuit-display.one-of-three=1 dari 3
+onboarding.tor-circuit-display.two-of-three=2 dari 3
+onboarding.tor-circuit-display.three-of-three=3 dari 3
 
-onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.title=Bagaimana sirkuit bekerja?
 onboarding.tor-circuit-display.intro.msg=Sirkuit terbuat dari relay yang 
ditentukan secara acak, yang merupakan komputer di seluruh dunia yang 
terkonfigurasi untuk mengalihkan lalu lintas Tor. Sirkuit mengizinkan anda 
untuk menjelajah secara privat dan terhubung ke layanan onion.
 
 onboarding.tor-circuit-display.diagram.title=Tampilan 

[tor-commits] [onionperf/master] Updates deployment instructions

[irl]

commit db13bb706f82badb120e3faf26993db178f514ab
Author: Ana Custura 
Date:   Tue Mar 19 15:10:30 2019 +

Updates deployment instructions
---
 README.md | 61 +
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index d4f66fc..8594118 100644
--- a/README.md
+++ b/README.md
@@ -11,13 +11,13 @@ performance statistics are logged to disk, analyzed once 
per day to
 produce a json stats database and files that can feed into Torperf, and
 can later be used to visualize changes in Tor client performance over time.
 
-For more information, see https://github.com/robgjansen/onionperf  
+For more information, see https://git.torproject.org/onionperf
 For a dockerized setup, see https://github.com/hiromipaw/onionperf-docker
 
 ### Get OnionPerf
 
 ```
-git clone https://github.com/robgjansen/onionperf.git
+git clone https://git.torproject.org/onionperf.git
 cd onionperf
 ```
 
@@ -27,36 +27,37 @@ cd onionperf
   + **TGen** (Shadow >= v1.11.1): cmake, glib2, igraph
   + **OnionPerf**: python
 
-The easiest way to satisfy all system dependencies is to use a package manager.
+The easiest way to satisfy all system dependencies is to use a package 
manager. TGen is not currently packaged and needs to be built from source.
+Note we only provide support for the current Debian Stable distribution.
 
 ```
-#Fedora/RedHat:
-sudo yum install gcc cmake make glib2 glib2-devel igraph igraph-devel libevent 
libevent-devel openssl openssl-devel python
-# Ubuntu/Debian:
-sudo apt-get install gcc cmake make libglib2.0 libglib2.0-dev libigraph0 
libigraph0-dev libevent libevent-dev openssl openssl-dev python
+sudo apt install cmake make build-essential gcc libigraph0-dev libglib2.0-dev 
python-dev
 ```
 
-**Note**: in newer distributions, `libevent` may be called `libevent-2.0` and 
`openssl-dev` may be called `libssl-dev`.
-
 ### Install Python modules
 
-  + **OnionPerf** python modules: stem (>= v1.4.0), lxml, networkx, numpy, 
matplotlib.
+  + **OnionPerf** python modules: stem (>= v1.7.0), lxml, networkx, numpy, 
matplotlib.
 
  Option 1: Package Manager
 
 The easiest way to satisfy all system dependencies is to use a package manager.
 
 ```
-# Fedora/RedHat:
-sudo yum install python-stem python-lxml python-networkx python-matplotlib 
numpy scipy
-# Ubuntu/Debian:
-sudo apt-get install python-stem python-lxml python-networkx python-matplotlib 
python-numpy python-scipy
+apt install tor libxml2-dev python-lxml python-networkx python-scypy 
python-matplotlib python-numpy
+
+```
+Ensure stem is the latest version for onion v3 service compatiblity, by 
installing from backports:
+
+```
+echo 'deb http://deb.debian.org/debian stretch-backports main' >> 
/etc/apt/sources.list
+apt update
+apt-get -t stretch-backports install python-stem
 ```
 
  Option 2: pip
 
-Python modules can also be installed using `pip`. The python modules that are 
required for each
-OnionPerf subcommand are as follows:
+Python modules can also be installed using `pip`. The python modules that are
+required for each OnionPerf subcommand are as follows:
 
   + `onionperf monitor`: stem
   + `onionperf measure`: stem, lxml, networkx
@@ -64,13 +65,9 @@ OnionPerf subcommand are as follows:
   + `onionperf visualize`: scipy, numpy, pylab, matplotlib
 
 You must first satisfy the system/library requirements of each of the python 
modules.
-
-**Note**: the following commands may not contain all requirements; please 
update if you find more!
+Note: pip installation is not recommended as software installed by pip is not 
verified.
 
 ```
-# Fedora/RedHat:
-sudo yum install python-devel libxml2 libxml2-devel libxslt libxslt-devel 
libpng libpng-devel freetype freetype-devel
-# Ubuntu/Debian:
 sudo apt-get install python-dev libxml2 libxml2-dev libxslt1.1 libxslt1-dev 
libpng12-0 libpng12-dev libfreetype6 libfreetype6-dev
 ```
 
@@ -97,13 +94,20 @@ large dependencies.
 
 ### Build Tor
 
-**Note**: You can install Tor via the package manager as well, though the
-preferred method is to build from source.
+**Note**: You can install Tor with apt, although the
+preferred method is to build from source. To install using apt:
+
+```
+sudo apt install tor
+```
+Or, if building from source:
 
-We need at least version 0.2.7.3-rc
+```
+apt install libevent libevent-dev libssl-dev
+```
 
 ```
-git clone https://git.torproject.org/tor.git -b release-0.2.7
+git clone https://git.torproject.org/tor.git
 cd tor
 ./autogen.sh
 ./configure --disable-asciidoc
@@ -117,12 +121,13 @@ but we will build TGen as an external tool and skip 
building both the full
 simulator and the TGen simulator plugin.
 
 ```
-git clone https://github.com/shadow/shadow.git
-cd shadow/src/plugin/shadow-plugin-tgen
+git clone https://github.com/shadow/tgen.git
+cd tgen
 mkdir build
 cd build
-cmake .. -DSKIP_SHADOW=ON -DCMAKE_MODULE_PATH=`pwd`/../../../../cmake/
+cmake .. 

[tor-commits] [onionperf/master] Fixes return type for IP address function

[irl]

commit 7e59d26d268c2f98f5ea59cb194fc35c775ac623
Author: Ana C. Custura 
Date:   Mon Apr 22 16:25:06 2019 +0100

Fixes return type for IP address function
---
 onionperf/util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/onionperf/util.py b/onionperf/util.py
index 2448600..b8a736a 100644
--- a/onionperf/util.py
+++ b/onionperf/util.py
@@ -117,13 +117,13 @@ def find_ip_address_url(data):
 """
 Parses a string using a regular expression for identifying IPv4 addressses.
 If more than one IP address is found, only the first one is returned.
-If no IP address is found, the function returns an empty string.
+If no IP address is found, the function returns None .
 
 :param data: string
 :returns: string
 """
 
-ip_address = ""
+ip_address = None
 if data is not None and len(data) > 0:
 ip_list = re.findall(r'[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}\.[\d]{1,3}', 
data)
 if ip_list is not None and len(ip_list) > 0:

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

[tor-commits] [onionperf/master] Adds tests for the tgen transfer log parser

[irl]

commit 26f5725e9ec5251963d986e98b2dfb929f3e8b4a
Author: Ana C. Custura 
Date:   Mon Apr 22 16:24:27 2019 +0100

Adds tests for the tgen transfer log parser
---
 onionperf/tests/test_analysis.py | 188 +++
 1 file changed, 188 insertions(+)

diff --git a/onionperf/tests/test_analysis.py b/onionperf/tests/test_analysis.py
new file mode 100644
index 000..150e8f0
--- /dev/null
+++ b/onionperf/tests/test_analysis.py
@@ -0,0 +1,188 @@
+import os
+import pkg_resources
+from nose.tools import *
+from onionperf import analysis
+
+
+def absolute_data_path(relative_path=""):
+"""
+Returns an absolute path for test data given a relative path.
+"""
+return pkg_resources.resource_filename("onionperf",
+   "tests/data/" + relative_path)
+
+
+DATA_DIR = absolute_data_path()
+LINE_ERROR = '2019-04-22 14:41:20 1555940480.647663 [message] 
[shd-tgen-transfer.c:1504] [_tgentransfer_log] [transfer-error] transport 
TCP,12,localhost:127.0.0.1:46878,localhost:127.0.0.1:43735,dc34og3c3aqdqntblnxkstzfvh7iy7llojd4fi5j23y2po32ock2k7ad.onion:0.0.0.0:8080,state=ERROR,error=READ
 transfer transfer5m,4,cyan,GET,5242880,(null),0,state=ERROR,error=PROXY 
total-bytes-read=0 total-bytes-write=0 payload-bytes-read=0/5242880 (0.00%) 
usecs-to-socket-create=11 usecs-to-socket-connect=210 usecs-to-proxy-init=283 
usecs-to-proxy-choice=348 usecs-to-proxy-request=412 usecs-to-proxy-response=-1 
usecs-to-command=-1 usecs-to-response=-1 usecs-to-first-byte=-1 
usecs-to-last-byte=-1 usecs-to-checksum=-1'
+
+
+def test_transfer_status_event():
+transfer = analysis.TransferStatusEvent(LINE_ERROR)
+assert_equals(transfer.is_success, False)
+assert_equals(transfer.is_error, False)
+assert_equals(transfer.is_complete, False)
+assert_equals(transfer.unix_ts_end, 1555940480.647663)
+assert_equals(transfer.endpoint_local, 'localhost:127.0.0.1:46878')
+assert_equals(transfer.endpoint_proxy, 'localhost:127.0.0.1:43735')
+assert_equals(
+transfer.endpoint_remote,
+
'dc34og3c3aqdqntblnxkstzfvh7iy7llojd4fi5j23y2po32ock2k7ad.onion:0.0.0.0:8080'
+)
+assert_equals(
+transfer.endpoint_remote,
+
'dc34og3c3aqdqntblnxkstzfvh7iy7llojd4fi5j23y2po32ock2k7ad.onion:0.0.0.0:8080'
+)
+assert_equals(transfer.transfer_id, 'transfer5m:4')
+assert_equals(transfer.hostname_local, 'cyan')
+assert_equals(transfer.method, 'GET')
+assert_equals(transfer.filesize_bytes, 5242880)
+assert_equals(transfer.hostname_remote, '(null)')
+assert_equals(transfer.error_code, 'PROXY')
+assert_equals(transfer.total_bytes_read, 0)
+assert_equals(transfer.total_bytes_write, 0)
+assert_equals(transfer.is_commander, True)
+assert_equals(transfer.payload_bytes_status, 0)
+assert_equals(transfer.unconsumed_parts, [
+'usecs-to-socket-create=11', 'usecs-to-socket-connect=210',
+'usecs-to-proxy-init=283', 'usecs-to-proxy-choice=348',
+'usecs-to-proxy-request=412', 'usecs-to-proxy-response=-1',
+'usecs-to-command=-1', 'usecs-to-response=-1',
+'usecs-to-first-byte=-1', 'usecs-to-last-byte=-1',
+'usecs-to-checksum=-1'
+])
+assert_equals(transfer.elapsed_seconds, {})
+
+
+def test_transfer_complete_event_init():
+complete = analysis.TransferCompleteEvent(LINE_ERROR)
+assert_equals(complete.is_complete, True)
+assert_equals(
+complete.elapsed_seconds, {
+'proxy_init': 0.000283,
+'proxy_request': 0.000412,
+'proxy_choice': 0.000348,
+'socket_connect': 0.00021,
+'socket_create': 1.1e-05
+})
+assert_equals(complete.unix_ts_start, 1555940480.6472511)
+
+
+def test_transfer_error_event():
+error = analysis.TransferErrorEvent(LINE_ERROR)
+assert_equals(error.is_error, True)
+assert_equals(error.is_success, False)
+
+
+def test_transfer_success_event_init():
+success = analysis.TransferSuccessEvent(LINE_ERROR)
+assert_equals(success.is_success, True)
+
+
+def test_transfer_object_init():
+error = analysis.TransferErrorEvent(LINE_ERROR)
+t = analysis.Transfer(error.transfer_id)
+assert_equals(t.id, 'transfer5m:4')
+assert_equals(t.last_event, None)
+assert_equals(
+t.payload_progress, {
+0.0: None,
+0.1: None,
+0.2: None,
+0.3: None,
+0.4: None,
+0.5: None,
+0.6: None,
+0.7: None,
+0.8: None,
+0.9: None,
+1.0: None
+})
+
+
+def test_transfer_object_add_event():
+error = analysis.TransferErrorEvent(LINE_ERROR)
+t = analysis.Transfer(error.transfer_id)
+t.add_event(error)
+assert_equals(t.last_event, error)
+assert_equals(
+t.payload_progress, {
+0.0: 1555940480.647663,
+0.1: None,
+0.2: None,
+0.3: 

[tor-commits] [onionperf/master] Removes payload_progress field in case of transfer errors

[irl]

commit b32ff68a99d06d22c86c68e64cfda737ea45afe3
Author: Ana C. Custura 
Date:   Mon Apr 22 16:23:46 2019 +0100

Removes payload_progress field in case of transfer errors
---
 onionperf/analysis.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/onionperf/analysis.py b/onionperf/analysis.py
index 691a9cc..2c3c580 100644
--- a/onionperf/analysis.py
+++ b/onionperf/analysis.py
@@ -404,7 +404,8 @@ class Transfer(object):
 if e is None or not e.is_complete:
 return None
 d = e.__dict__
-d['elapsed_seconds']['payload_progress'] = {decile: 
self.payload_progress[decile] - e.unix_ts_start for decile in 
self.payload_progress if self.payload_progress[decile] is not None}
+if not e.is_error:
+d['elapsed_seconds']['payload_progress'] = {decile: 
self.payload_progress[decile] - e.unix_ts_start for decile in 
self.payload_progress if self.payload_progress[decile] is not None}
 return d
 
 class Parser(object):



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

[tor-commits] [translation/support-portal_completed] Update translations for support-portal_completed

[translation]

commit 178b45e358a314aff44c018d3fec654a3e74ac56
Author: Translation commit bot 
Date:   Thu Apr 25 09:22:35 2019 +

Update translations for support-portal_completed
---
 contents+de.po| 158 +
 contents+es.po| 152 +++
 contents+ka.po| 156 +
 contents+pt-BR.po | 152 ---
 contents+tr.po| 152 +--
 contents.pot  | 159 +-
 6 files changed, 309 insertions(+), 620 deletions(-)

diff --git a/contents+de.po b/contents+de.po
index 60c1884fa..323e2082a 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -1,19 +1,18 @@
 # Translators:
-# Jim John , 2018
 # jk , 2019
 # try once, 2019
 # Oliver Baumann , 2019
 # erinm, 2019
-# Curtis Baltimore , 2019
 # Emma Peel, 2019
+# Curtis Baltimore , 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-15 12:30+CET\n"
+"POT-Creation-Date: 2019-04-25 10:51+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Curtis Baltimore , 2019\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1803,8 +1802,8 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.title)
-msgid "Why does Tor Browser ship with Javascript enabled?"
-msgstr "Warum wird Tor Browser mit aktiviertem Javascript gestartet?"
+msgid "Why does Tor Browser ship with JavaScript enabled?"
+msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.description)
@@ -1818,42 +1817,32 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.description)
 msgid ""
-"Most users would give up on Tor entirely if we disabled Javascript by "
+"Most users would give up on Tor entirely if we disabled JavaScript by "
 "default because it would cause so many problems for them."
 msgstr ""
-"Viele würden Tor vollständig aufgeben, wenn wir JavaScript  standardmäßig 
"
-"deaktivieren würden, weil es zu viele Probleme für sie verursachen würde."
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.description)
 msgid ""
 "Ultimately, we want to make Tor Browser as secure as possible while also "
 "making it usable for the majority of people, so for now, that means leaving "
-"Javascript enabled by default."
+"JavaScript enabled by default."
 msgstr ""
-"Letztendlich soll Tor Browser so sicher wie möglich, aber auch für die "
-"meisten nutzbar sein. Im Moment bedeutet das, JavaScript von Hause aus zu "
-"aktivieren."
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.description)
 msgid ""
-"For users who want to have Javascript disabled on all HTTP sites by default,"
+"For users who want to have JavaScript disabled on all HTTP sites by default,"
 " we recommend changing your Tor Browser's security slider (in the Tor "
 "Browser Onion menu under \"Security Settings\")."
 msgstr ""
-"Wer JavaScript für alle HTTP-Seiten deaktivieren möchte, kann das mit Tor "
-"Browsers Sicherheitsregler tun (im Tor Browser Onion-Menü unter "
-"\"Sicherheitseinstellungen\")."
 
 #: https//support.torproject.org/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.description)
 msgid ""
-"The low/default setting allows Javascript, but the medium and high levels "
-"both block Javascript on HTTP sites."
+"The low/default setting allows JavaScript, but the medium and high levels "
+"both block JavaScript on HTTP sites."
 msgstr ""
-"Die niedrige/standard-Einstellung erlaubt JavaScript. Aber die mittlere und "
-"höchste Stufe deaktivieren JavaScript auf allen Seiten."
 
 #: https//support.torproject.org/tbb/tbb-35/
 #: (content/tbb/tbb-35/contents+en.lrquestion.title)
@@ -1902,93 +1891,24 @@ msgstr "Ich brauche Tor Browser in einer anderen 
Sprache als Englisch. "
 #: https//support.torproject.org/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.description)
 msgid ""
-"We currently offer https://www.torproject.org/projects/torbrowser.html.en\;>Tor "
-"Browser in the following languages:"
+"We want everyone to be able to enjoy Tor Browser in their own language. Tor "
+"Browser is now available in 25 different languages, and we are working to "
+"add more. Want to help us translate? [See here](https://tb-;
+"manual.torproject.org/becoming-tor-translator/)"
 msgstr ""
-"Aktuell bieten wir https://www.torproject.org/projects/torbrowser.html.en\;>Tor "
-"Browser in folgenden Sprachen an:"
-
-#: https//support.torproject.org/tbb/tbb-37/
-#: 

[tor-commits] [translation/support-portal_completed] Update translations for support-portal_completed

[translation]

commit eacf21aed3086207e5f6b11b7a65d9ab214c58f6
Author: Translation commit bot 
Date:   Thu Apr 25 08:50:41 2019 +

Update translations for support-portal_completed
---
 contents+es.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index 1ad950395..757f9d973 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -1613,8 +1613,8 @@ msgid ""
 ""
 msgstr ""
-""
+""
 
 #: https//support.torproject.org/tbb/tbb-29/
 #: (content/tbb/tbb-29/contents+en.lrquestion.description)
@@ -2615,7 +2615,7 @@ msgid ""
 msgstr ""
 "Para obtener enlaces para descargar el Navegador Tor, envía un mensaje "
 "directo a ​https://twitter.com/get_tor\;>@get_tor"
-" con uno de los siguientes códigos en él (no necesita seguir la cuenta en "
+" con uno de los siguientes códigos en él (no necesitas seguir la cuenta en "
 "Twitter):"
 
 #: https//support.torproject.org/gettor/gettor-3/

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

[tor-commits] [translation/support-portal] Update translations for support-portal

[translation]

commit 0ea9fefdd7e4910c76e602e5ca3a2e3d213aacc0
Author: Translation commit bot 
Date:   Thu Apr 25 08:50:34 2019 +

Update translations for support-portal
---
 contents+es.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index 1ad950395..757f9d973 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -1613,8 +1613,8 @@ msgid ""
 ""
 msgstr ""
-""
+""
 
 #: https//support.torproject.org/tbb/tbb-29/
 #: (content/tbb/tbb-29/contents+en.lrquestion.description)
@@ -2615,7 +2615,7 @@ msgid ""
 msgstr ""
 "Para obtener enlaces para descargar el Navegador Tor, envía un mensaje "
 "directo a ​https://twitter.com/get_tor\;>@get_tor"
-" con uno de los siguientes códigos en él (no necesita seguir la cuenta en "
+" con uno de los siguientes códigos en él (no necesitas seguir la cuenta en "
 "Twitter):"
 
 #: https//support.torproject.org/gettor/gettor-3/

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

[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties

[translation]

commit 28a93157f4d44d42ff50559d5edc81d7e8fd7e98
Author: Translation commit bot 
Date:   Thu Apr 25 08:49:19 2019 +

Update translations for torbutton-browseronboardingproperties
---
 id/browserOnboarding.properties | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/id/browserOnboarding.properties b/id/browserOnboarding.properties
index 376227860..8aa8be37c 100644
--- a/id/browserOnboarding.properties
+++ b/id/browserOnboarding.properties
@@ -5,7 +5,7 @@
 onboarding.tour-tor-welcome=Selamat datang
 onboarding.tour-tor-welcome.title=Anda siap.
 onboarding.tour-tor-welcome.description=Tor Browser menawarkan standar 
tertinggi atas privasi dan keamanan saat menjelajahi jaringan. Anda sekarang 
dilindungi dari pelacakan, pengintaian, dan penyensoran. Pelatihan singkat ini 
akan menunjukkan Anda bagaimana caranya.
-onboarding.tour-tor-welcome.next-button=Go to Privacy
+onboarding.tour-tor-welcome.next-button=Pergi ke Privasi
 
 onboarding.tour-tor-privacy=Privasi
 onboarding.tour-tor-privacy.title=Menolak pelacak dan pengintai.
@@ -15,20 +15,20 @@ onboarding.tour-tor-privacy.button=Pergi ke Jaringan Tor
 onboarding.tour-tor-network=Jaringan Tor
 onboarding.tour-tor-network.title=Mengelilingi jaringan yang terdesentralisasi.
 onboarding.tour-tor-network.description=Tor Browser menghubungkan Anda ke 
jaringan Tor yang dijalankan oleh ribuan relawan di seluruh dunia. Tidak 
seperti VPN, tidak ada satu titik kesalahan atau entitas sentral yang perlu 
anda percaya untuk menikmati internet secara privat.
-onboarding.tour-tor-network.button=Go to Circuit Display
+onboarding.tour-tor-network.button=Pergi ke Tampilan Sirkuit
 
 onboarding.tour-tor-circuit-display=Tampilan Sirkuit
 onboarding.tour-tor-circuit-display.title=Lihat jalan Anda.
 onboarding.tour-tor-circuit-display.description=Untuk setiap domain yang Anda 
kunjungi, lalu lintas anda disampaikan dan terenkripsi dalam sebuah sirkuit 
melalui tiga relay Tor dari seluruh dunia. Tidak ada situs web mengetahui dari 
mana anda terhubung. Anda dapat meminta sebuah sirkuit baru dengan klik 
'Sirkuit Baru untuk Situs ini' pada Tampilan Sirkuit kami.
 onboarding.tour-tor-circuit-display.button=See My Path
-onboarding.tour-tor-circuit-display.next-button=Go to Security
+onboarding.tour-tor-circuit-display.next-button=Pergi ke Keamanan
 
 onboarding.tour-tor-security=Keamanan
 onboarding.tour-tor-security.title=Putuskan pengalamanmu.
 onboarding.tour-tor-security.description=Kami juga menyediakan Anda dengan 
pengaturan tambahan untuk meningkatkan keamanan peramban Anda. Pengaturan 
Keamanan kami mengizinkan anda untuk memblokir elemen-elemen yang dapat 
digunakan untuk menyerang komputer Anda. Klik di bawah untuk mengetahui apa 
saja yang dilakukan oleh pilihan yang berbeda.
 onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and 
HTTPS Everywhere are not included on the toolbar, but you can customize your 
toolbar to add them.
-onboarding.tour-tor-security-level.button=See Your Security Level
-onboarding.tour-tor-security-level.next-button=Go to Experience Tips
+onboarding.tour-tor-security-level.button=Lihat Level Keamanan Anda
+onboarding.tour-tor-security-level.next-button=Pergi ke Tips Pengalaman
 
 onboarding.tour-tor-expect-differences=Tips Pengalaman
 onboarding.tour-tor-expect-differences.title=Harapkan beberapa perubahan.
@@ -49,7 +49,7 @@ onboarding.tour-tor-update.prefix-updated=Telah terupdate
 onboarding.tour-tor-toolbar=Toolbar
 onboarding.tour-tor-toolbar-update-8.5.title=Toolbar layout
 onboarding.tour-tor-toolbar-update-8.5.description=We improved the browser 
toolbar layout. We moved the Torbutton icon after the URL bar, and we added a 
security level icon next to it.
-onboarding.tour-tor-toolbar-update-8.5.next-button=Go to Security
+onboarding.tour-tor-toolbar-update-8.5.next-button=Pergi ke Keamanan
 
 onboarding.tour-tor-security-update-8.5.title=Security level experience
 onboarding.tour-tor-security-update-8.5.description=We improved how you see 
and set your security level. We replaced the security slider with a toolbar 
icon that makes your current level visible at all times. Click it to view 
details about your current level or to change your security settings.

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

[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

[translation]

commit aeb85a62e4bf241b23f1884f568e7af7e7cbfcc0
Author: Translation commit bot 
Date:   Thu Apr 25 08:19:08 2019 +

Update translations for torbutton-aboutdialogdtd
---
 sw/aboutdialog.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sw/aboutdialog.dtd b/sw/aboutdialog.dtd
index 05bb11345..74bc900f8 100644
--- a/sw/aboutdialog.dtd
+++ b/sw/aboutdialog.dtd
@@ -11,9 +11,9 @@
 
 
 
-
+
 
-
+
 
-
-
+
+

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

[tor-commits] [translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd

[translation]

commit f258573e70a45fe61e719592604c39670b825816
Author: Translation commit bot 
Date:   Thu Apr 25 08:17:39 2019 +

Update translations for tba-torbrowserstringsdtd
---
 id/torbrowser_strings.dtd | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/id/torbrowser_strings.dtd b/id/torbrowser_strings.dtd
index 6b75ae0fe..11b4e73c1 100644
--- a/id/torbrowser_strings.dtd
+++ b/id/torbrowser_strings.dtd
@@ -24,34 +24,34 @@
 
 
 
-
+
 
-
+
 
 
 
-
+
 
-
+
 
 
-
-
+
+
 
 
 
-
-
+
+
 
-
+
 
 
-
+
 
 
-
+
 
 
 
 
-
+

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

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

[translation]

commit 544b1af9ccaa56079d581fef07315d677bb57f60
Author: Translation commit bot 
Date:   Thu Apr 25 08:15:38 2019 +

Update translations for donatepages-messagespot
---
 locale/sw/LC_MESSAGES/messages.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/sw/LC_MESSAGES/messages.po 
b/locale/sw/LC_MESSAGES/messages.po
index 6630d79cd..408611505 100644
--- a/locale/sw/LC_MESSAGES/messages.po
+++ b/locale/sw/LC_MESSAGES/messages.po
@@ -827,7 +827,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:44
 msgid "Questions?"
-msgstr ""
+msgstr "Maswali?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:59
 msgid ""

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

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

[translation]

commit db93dc390279acceda952ae9cbf638b3e33f1fd3
Author: Translation commit bot 
Date:   Thu Apr 25 08:15:06 2019 +

Update translations for abouttor-homepage
---
 sw/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sw/aboutTor.dtd b/sw/aboutTor.dtd
index 4f360a91b..120ac91a8 100644
--- a/sw/aboutTor.dtd
+++ b/sw/aboutTor.dtd
@@ -16,7 +16,7 @@
 
 https://duckduckgo.com;>
 
-
+
 
 
 

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

[tor-commits] [translation/support-portal_completed] Update translations for support-portal_completed

[translation]

commit 00e4bfd83c3dc2528705654d47fa5c19057395c0
Author: Translation commit bot 
Date:   Thu Apr 25 07:50:53 2019 +

Update translations for support-portal_completed
---
 contents+es.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+es.po b/contents+es.po
index 0a0c93f19..1ad950395 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -905,7 +905,7 @@ msgid ""
 msgstr ""
 "La configuración predeterminada en el instalador de Windows también crea un 
"
 "acceso en tu Escritorio, aunque debes tener en cuenta que accidentalmente "
-"puedes haber desmarcado esta opción para crear dicho acceso."
+"puedes haber desmarcado esta opción."
 
 #: https//support.torproject.org/tbb/tbb-11/
 #: (content/tbb/tbb-11/contents+en.lrquestion.description)

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

[tor-commits] [translation/support-portal] Update translations for support-portal

[translation]

commit ccac5e4cc6e3a90499b6689d1e0406e6c51e64ca
Author: Translation commit bot 
Date:   Thu Apr 25 07:50:46 2019 +

Update translations for support-portal
---
 contents+es.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+es.po b/contents+es.po
index 0a0c93f19..1ad950395 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -905,7 +905,7 @@ msgid ""
 msgstr ""
 "La configuración predeterminada en el instalador de Windows también crea un 
"
 "acceso en tu Escritorio, aunque debes tener en cuenta que accidentalmente "
-"puedes haber desmarcado esta opción para crear dicho acceso."
+"puedes haber desmarcado esta opción."
 
 #: https//support.torproject.org/tbb/tbb-11/
 #: (content/tbb/tbb-11/contents+en.lrquestion.description)

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

[tor-commits] [translation/torcheck_completed] Update translations for torcheck_completed

[translation]

commit 0b91b064a889a0e05e08b82b2350eccace9e3a71
Author: Translation commit bot 
Date:   Thu Apr 25 07:49:55 2019 +

Update translations for torcheck_completed
---
 es/torcheck.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/es/torcheck.po b/es/torcheck.po
index c43b609c7..56344900e 100644
--- a/es/torcheck.po
+++ b/es/torcheck.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2019-04-23 08:13+\n"
+"PO-Revision-Date: 2019-04-25 07:24+\n"
 "Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -49,7 +49,7 @@ msgstr "Hay una actualización de seguridad disponible para 
el Tor Browser."
 msgid ""
 "https://www.torproject.org/download/\;>Click here to go to the "
 "download page"
-msgstr "https://www.torproject.org/download/\;>Haz click aquí para 
ir a la página de descargas"
+msgstr "https://www.torproject.org/es/download/\;>Haz click aquí 
para ir a la página de descargas"
 
 msgid "Sorry. You are not using Tor."
 msgstr "Lo sentimos, no estás usando Tor."
@@ -59,7 +59,7 @@ msgid ""
 "href=\"https://www.torproject.org/\;>Tor website and specifically the https://support.torproject.org/#faq\;>frequently asked "
 "questions."
-msgstr "Si estás intentando utilizar el cliente Tor, visita el https://www.torproject.org/\;>sitio web de Tor y específicamente 
las https://support.torproject.org/#faq\;>preguntas frecuentes."
+msgstr "Si estás intentando utilizar el cliente Tor, visita el https://www.torproject.org/es/\;>sitio web de Tor y específicamente 
las https://support.torproject.org/es/#faq\;>preguntas 
frecuentes."
 
 msgid "Sorry, your query failed or an unexpected response was received."
 msgstr "Lo sentimos, tu consulta falló o se recibió una respuesta 
inesperada."

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

[tor-commits] [translation/torcheck] Update translations for torcheck

[translation]

commit ca5c7d481553c8a91530ad013b5a9a271db99bcb
Author: Translation commit bot 
Date:   Thu Apr 25 07:49:49 2019 +

Update translations for torcheck
---
 es/torcheck.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/es/torcheck.po b/es/torcheck.po
index c43b609c7..56344900e 100644
--- a/es/torcheck.po
+++ b/es/torcheck.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2019-04-23 08:13+\n"
+"PO-Revision-Date: 2019-04-25 07:24+\n"
 "Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -49,7 +49,7 @@ msgstr "Hay una actualización de seguridad disponible para 
el Tor Browser."
 msgid ""
 "https://www.torproject.org/download/\;>Click here to go to the "
 "download page"
-msgstr "https://www.torproject.org/download/\;>Haz click aquí para 
ir a la página de descargas"
+msgstr "https://www.torproject.org/es/download/\;>Haz click aquí 
para ir a la página de descargas"
 
 msgid "Sorry. You are not using Tor."
 msgstr "Lo sentimos, no estás usando Tor."
@@ -59,7 +59,7 @@ msgid ""
 "href=\"https://www.torproject.org/\;>Tor website and specifically the https://support.torproject.org/#faq\;>frequently asked "
 "questions."
-msgstr "Si estás intentando utilizar el cliente Tor, visita el https://www.torproject.org/\;>sitio web de Tor y específicamente 
las https://support.torproject.org/#faq\;>preguntas frecuentes."
+msgstr "Si estás intentando utilizar el cliente Tor, visita el https://www.torproject.org/es/\;>sitio web de Tor y específicamente 
las https://support.torproject.org/es/#faq\;>preguntas 
frecuentes."
 
 msgid "Sorry, your query failed or an unexpected response was received."
 msgstr "Lo sentimos, tu consulta falló o se recibió una respuesta 
inesperada."

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

[tor-commits] [translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed

[translation]

commit e8a9b6ee055cd09b346f63a0157837789e295fc1
Author: Translation commit bot 
Date:   Thu Apr 25 07:49:33 2019 +

Update translations for torbutton-browseronboardingproperties_completed
---
 es-ES/browserOnboarding.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/es-ES/browserOnboarding.properties 
b/es-ES/browserOnboarding.properties
index 54626c0b6..3dcbebd82 100644
--- a/es-ES/browserOnboarding.properties
+++ b/es-ES/browserOnboarding.properties
@@ -26,7 +26,7 @@ onboarding.tour-tor-circuit-display.next-button=Ir a Seguridad
 onboarding.tour-tor-security=Seguridad
 onboarding.tour-tor-security.title=Elige tu experiencia.
 onboarding.tour-tor-security.description=También te proporcionamos 
configuraciones adicionales para aumentar la seguridad de tu navegador. Nuestra 
Configuración de Seguridad te permite bloquear elementos que podrían usarse 
para atacar tu computadora. Haz clic a continuación para ver lo que hacen las 
diferentes opciones.
-onboarding.tour-tor-security.description-suffix=Nota: De forma predeterminada, 
NoScript y HTTPS Everywhere no están incluidos en la barra de herramientas, 
pero puedes personalizarla para agregarlos.
+onboarding.tour-tor-security.description-suffix=Nota: De forma predeterminada, 
NoScript y HTTPS Everywhere no están incluidos en la barra de herramientas, 
pero puedes agregarlos.
 onboarding.tour-tor-security-level.button=Mira tu nivel de seguridad
 onboarding.tour-tor-security-level.next-button=Ir a los Consejos para una 
mejor experiencia
 
@@ -47,12 +47,12 @@ onboarding.tour-tor-update.prefix-new=Nuevo
 onboarding.tour-tor-update.prefix-updated=Actualizado
 
 onboarding.tour-tor-toolbar=Barra de herramientas
-onboarding.tour-tor-toolbar-update-8.5.title=barra de tareas
+onboarding.tour-tor-toolbar-update-8.5.title=Composición de la barra de 
herramientas
 onboarding.tour-tor-toolbar-update-8.5.description=Hemos mejorado el diseño 
de la barra de herramientas del navegador. Hemos movido el icono de Torbutton 
tras la barra de URL, y al lado, hemos agregado un icono de nivel de seguridad.
-onboarding.tour-tor-toolbar-update-8.5.next-button=Ir a la Seguridad
+onboarding.tour-tor-toolbar-update-8.5.next-button=Ir a Seguridad
 
-onboarding.tour-tor-security-update-8.5.title=nivel de seguridad
-onboarding.tour-tor-security-update-8.5.description=Hemos mejorado cómo ves y 
estableces tu nivel de seguridad. Hemos reemplazado el control deslizante de 
seguridad con un icono de barra de herramientas que hace visible en todo 
momento, tu nivel actual de seguridad. Haz clic para ver los detalles de tu 
nivel actual o para cambiar la configuración de seguridad.
+onboarding.tour-tor-security-update-8.5.title=Experiencia del nivel de 
seguridad
+onboarding.tour-tor-security-update-8.5.description=Hemos mejorado cómo ves y 
estableces tu nivel de seguridad. Hemos reemplazado el control deslizante de 
seguridad con un icono de barra de herramientas que hace visible en todo 
momento tu nivel actual de seguridad. Haz clic para ver los detalles de tu 
nivel actual o para cambiar la configuración de seguridad.
 
 # Circuit Display onboarding.
 onboarding.tor-circuit-display.next=Siguiente

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

[tor-commits] [translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties

[translation]

commit 8c926274268b82529d3f004dceabb4dfc2458147
Author: Translation commit bot 
Date:   Thu Apr 25 07:49:25 2019 +

Update translations for torbutton-browseronboardingproperties
---
 es-ES/browserOnboarding.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/es-ES/browserOnboarding.properties 
b/es-ES/browserOnboarding.properties
index 54626c0b6..3dcbebd82 100644
--- a/es-ES/browserOnboarding.properties
+++ b/es-ES/browserOnboarding.properties
@@ -26,7 +26,7 @@ onboarding.tour-tor-circuit-display.next-button=Ir a Seguridad
 onboarding.tour-tor-security=Seguridad
 onboarding.tour-tor-security.title=Elige tu experiencia.
 onboarding.tour-tor-security.description=También te proporcionamos 
configuraciones adicionales para aumentar la seguridad de tu navegador. Nuestra 
Configuración de Seguridad te permite bloquear elementos que podrían usarse 
para atacar tu computadora. Haz clic a continuación para ver lo que hacen las 
diferentes opciones.
-onboarding.tour-tor-security.description-suffix=Nota: De forma predeterminada, 
NoScript y HTTPS Everywhere no están incluidos en la barra de herramientas, 
pero puedes personalizarla para agregarlos.
+onboarding.tour-tor-security.description-suffix=Nota: De forma predeterminada, 
NoScript y HTTPS Everywhere no están incluidos en la barra de herramientas, 
pero puedes agregarlos.
 onboarding.tour-tor-security-level.button=Mira tu nivel de seguridad
 onboarding.tour-tor-security-level.next-button=Ir a los Consejos para una 
mejor experiencia
 
@@ -47,12 +47,12 @@ onboarding.tour-tor-update.prefix-new=Nuevo
 onboarding.tour-tor-update.prefix-updated=Actualizado
 
 onboarding.tour-tor-toolbar=Barra de herramientas
-onboarding.tour-tor-toolbar-update-8.5.title=barra de tareas
+onboarding.tour-tor-toolbar-update-8.5.title=Composición de la barra de 
herramientas
 onboarding.tour-tor-toolbar-update-8.5.description=Hemos mejorado el diseño 
de la barra de herramientas del navegador. Hemos movido el icono de Torbutton 
tras la barra de URL, y al lado, hemos agregado un icono de nivel de seguridad.
-onboarding.tour-tor-toolbar-update-8.5.next-button=Ir a la Seguridad
+onboarding.tour-tor-toolbar-update-8.5.next-button=Ir a Seguridad
 
-onboarding.tour-tor-security-update-8.5.title=nivel de seguridad
-onboarding.tour-tor-security-update-8.5.description=Hemos mejorado cómo ves y 
estableces tu nivel de seguridad. Hemos reemplazado el control deslizante de 
seguridad con un icono de barra de herramientas que hace visible en todo 
momento, tu nivel actual de seguridad. Haz clic para ver los detalles de tu 
nivel actual o para cambiar la configuración de seguridad.
+onboarding.tour-tor-security-update-8.5.title=Experiencia del nivel de 
seguridad
+onboarding.tour-tor-security-update-8.5.description=Hemos mejorado cómo ves y 
estableces tu nivel de seguridad. Hemos reemplazado el control deslizante de 
seguridad con un icono de barra de herramientas que hace visible en todo 
momento tu nivel actual de seguridad. Haz clic para ver los detalles de tu 
nivel actual o para cambiar la configuración de seguridad.
 
 # Circuit Display onboarding.
 onboarding.tor-circuit-display.next=Siguiente

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