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

[translation]

commit 9eb87c0b9688059f0b334d85d2a6350c3d1a2c30
Author: Translation commit bot 
Date:   Sat Apr 21 04:49:54 2018 +

Update translations for support-connecting
---
 zh_CN.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_CN.json b/zh_CN.json
index 19d37ef0e..f70a3941e 100644
--- a/zh_CN.json
+++ b/zh_CN.json
@@ -9,7 +9,7 @@
"id": "#连接-2",
"control": "连接-2",
"title": "无法连接到 
Tor，我不知道发生了什么什么错误。",
-   "description": "If you’re having trouble 
connecting, please select the option to \"copy Tor log to clipboard.\" Then 
paste the Tor log into a text file or other document. You should see one of 
these common log errors (look for the following lines in your Tor 
log):Common log error #1: Proxy connection failure 2017-10-29 09:23:40.800 [NOTICE] Opening Socks 
listener on 127.0.0.1:9150 \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: 
Connecting to directory server \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 
10%: Finishing handshake with directory server \n 2017-10-29 09:24:08.900 
[WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:x (\"general 
SOCKS server failure\") \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable 
to connect to xx..xxx..xxx.xx:x  (\"general SOCKS server failure\") \n 
2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect 
toxx..xxx..xxx.xx:x  (\"general SOCKS server fa
 ilure\")If you see lines like these  in 
your Tor log, it means you are failing to connect to a SOCKS proxy. If a SOCKS 
proxy is required for your network setup, then please make sure you’ve 
entered your proxy details correctly.  If a SOCKS proxy is not required, or 
you’re not sure,  please try connecting to the Tor network without a SOCKS 
proxy.Common log error #2: Can’t reach guard relays 11/1/2017 21:11:43 PM.500 [NOTICE] Opening Socks 
listener on 127.0.0.1:9150 \n 11/1/2017 21:11:44 PM.300 [NOTICE] Bootstrapped 
80%: Connecting to the Tor network \n 11/1/2017 21:11:44 PM.300 [WARN] Failed 
to find node for hop 0 of our path. Discarding this circuit. \n 11/1/2017 
21:11:44 PM.500 [NOTICE] Bootstrapped 85%: Finishing handshake with first hop 
\n 11/1/2017 21:11:45 PM.300 [WARN] Failed to find node for hop 0 of our path. 
Discarding this circuit.If you see lines 
like these
  in your Tor log, it means your Tor failed to connect to the first node in the 
Tor circuit. This could mean that you’re on a network that’s censored. 
Please try connecting with bridges, and that should fix the 
problem.Common log error #3: Failed to complete TLS handshake 13-11-17 19:52:24.300 [NOTICE] Bootstrapped 10%: 
Finishing handshake with directory server \n 13-11-17 19:53:49.300 [WARN] 
Problem bootstrapping. Stuck at 10%: Finishing handshake with directory server. 
(DONE; DONE; count 10; recommendation warn; host [host] at xxx.xxx.xxx.xx:xxx) 
\n 13-11-17 19:53:49.300 [WARN] 10 connections have failed: \n 13-11-17 
19:53:49.300 [WARN]  9 connections died in state handshaking (TLS) with SSL 
state SSLv2/v3 read server hello A in HANDSHAKE \n 13-11-17 19:53:49.300 [WARN] 
 1 connections died in state connect()ing with SSL state (No SSL 
object)If you see lines like this in your 
Tor log, it means that Tor 
 failed to complete a TLS handshake with the directory authorities. Using 
bridges will likely fix this.Common log error #4: Clock skew 19.11.2017 00:04:47.400 [NOTICE] Opening Socks 
listener on 127.0.0.1:9150 \n 19.11.2017 00:04:48.000 [NOTICE] Bootstrapped 5%: 
Connecting to directory server \n 19.11.2017 00:04:48.200 [NOTICE] Bootstrapped 
10%: Finishing handshake with directory server \n 19.11.2017 00:04:48.800 
[WARN] Received NETINFO cell with skewed time (OR:xxx.xx.x.xx:): It seems 
that our clock is behind by 1 days, 0 hours, 1 minutes, or that theirs is 
ahead. \n Tor requires an accurate clock to work: please check your time, 
timezone, and date settings.If you see lines 
like this in your Tor log, it means your system clock is incorrect. Please make 
sure your clock is set accurately, including the correct timezone. Then restart 
Tor. "
+   "description": "如果您的连接出现问题，请选择“复制Tor日志到剪贴板”选项。然后粘贴Tor日志到文本文件或è€
…其他文档æ 
¼å¼ã€‚您应该能够在粘贴的Tor日志中发现这些常见问题（请在Tor日志里寻找如下所示的错误）:
 常见错误#1: 代理连接失败 
2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \\n 
2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: Connecting to directory 
server \\n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing 
handshake with directory server \\n 2017-10-29 09:24:08.900 [WARN] Proxy 
Client: unable to connect to xx..xxx..xxx.xx:x (\\\"general SOCKS server 
failure\\\") \\n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect 
to xx..xxx..xxx.xx:x  

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

[translation]

commit 6ce8fb2cc3d8598efdb5861d01fca314c0dbc443
Author: Translation commit bot 
Date:   Sat Apr 21 04:50:29 2018 +

Update translations for support-miscellaneous_completed
---
 zh_CN.json | 90 +++---
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/zh_CN.json b/zh_CN.json
index 2d88acd23..980c79501 100644
--- a/zh_CN.json
+++ b/zh_CN.json
@@ -1,91 +1,91 @@
 {
-"miscellaneus-1": {
-   "id": "#杂项-1",
-   "control": "杂项-1",
+"misc-1": {
+   "id": "#misc-1",
+   "control": "misc-1",
"title": "我必须追查一个tor用户，你们能帮助我吗？",
"description": "tor的开发者
们对于追查tor的使用者这方面无法提供任何帮助。tor避免å…
·æœ‰æ¶æ„çš„人去窥视您的隐私，这个功能对我们也起到同æ 
·çš„效果。"
 },
-"miscellaneus-2": {
-   "id": "#杂项-2",
-   "control": "杂项-2",
+"misc-2": {
+   "id": "#misc-2",
+   "control": "misc-2",
"title": "ä½ 
们为什么不阻止那些心怀不轨的人用tor做坏事呢？",
"description": "tor的设计宗旨是通过避å…
ä»»ä½•äººç›‘视您，包
括我们，来保护您的权利。我们厌恶用tor做糟糕的事情
的人，但是我们并不能在剔除他们的同时，不伤害到人权活动è€
…，记者，虐待后的幸存者们，以及å…
¶ä»–用tor做好事的人们。如果我们要屏蔽特定的用户，我们必
须在程序里添加
后门。这将会导致我们的用户暴露在政府以及敌对势力的攻击之下。"
 },
- "miscellaneus-3": {
-   "id": "#杂项-3",
-   "control": "杂项-3",
+ "misc-3": {
+   "id": "#misc-3",
+   "control": "misc-3",
"title": "哪些个人或者集团在资助tor？",
"description": "tor被许多不同的赞助者
资助过，包括美国联邦机构，私人基金会，个人捐赠者
。点击列表查看https://www.torproject.org/about/sponsors.html.en\;>我们的赞助者
以及一系列的关于我们财务的https://blog.torproject.org/category/tags/form-990\;>博文。我们认为，公开谈论我们的赞助者
以及资助模式，是维持社区信任的最佳方式。我们一直在尝试让我们的资助来源多æ
 ·åŒ–，尤其是基金会以及个人资助者方面。"
  },
- "miscellaneus-4": {
-   "id": "#杂项-4",
-   "control": "杂项-4",
+ "misc-4": {
+   "id": "#misc-4",
+   "control": "misc-4",
"title": "我们将tor和比特流结合起来使用吗？",
"description": "我们不推荐将两者
结合起来使用。更多信息请查阅我们的https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\;>有å…
³è¿™ä¸ªé¡¹ç›®çš„博文。"
  },
- "miscellaneus-5": {
-   "id": "#杂项-5",
-   "control": "杂项-5",
+ "misc-5": {
+   "id": "#misc-5",
+   "control": "misc-5",
"title": 
"我电脑上的一些文件被锁住了，有人要求我下载tor浏览器来支付赎金，赎回文件！",
"description": "我们十分抱歉，您应该是被恶意软件攻击了。tor项目并没有创é€
 è¿™ä¸ªæ¶æ„è½¯ä»¶ã€‚这个软件的作者
要求您下载tor浏览器大概是因
为他们想匿名的获取您的赎金。如果这是您对tor的初体验，我们了解您的心æƒ
…
，您大概会认为我们是纵容那些家伙的坏人。不过，我们的软件每天都被许多人使用，åŒ
…括人权活动者，记者，家庭暴力幸存者，揭发者，执法机å…
³çš„员工等等。不幸的是，我们软件对这些人提供的防护，同时会被罪犯以及恶意软件的作è€
…利用。tor项目坚决不支持或者
容忍恶意的使用我们的软件。"
  },
-"miscellaneus-6": {
-   "id": "#杂项-6",
-   "control": "杂项-6",
+"misc-6": {
+   "id": "#misc-6",
+   "control": "misc-6",
"title": "tor会留存日志吗？",
"description": "tor不会留存可以辨别特定用户的日志。我们会存留一些å
…³äºŽç½‘络功能的日志，用于提高安全性，您可以在https://metrics.torproject.org/\;>tor的量度中查看到。"
 },
-"miscellaneus-7": {
-   "id": "#杂项-7",
-   "control": "杂项-7",
+"misc-7": {
+   "id": "#misc-7",
+   "control": "misc-7",
"title": "tor项目提供邮件服务或者å…
¶ä»–保护隐私的互联网服务吗？",
"description": "抱歉，我们尚未提供任何å…
¶ä»–的网络服务。您可以在我们的https://www.torproject.org/projects/projects.html.en\;>项目网页查看我们所有的软件。"
 },
-"miscellaneus-8": {
-   "id": "#杂项-8",
-   "control": "杂项-8",
+"misc-8": {
+   "id": "#misc-8",
+   "control": "misc-8",
"title": "我能将tor的图标用于我的产品中吗？",
"description": 

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

[translation]

commit 430c8d219f5d7f813255083ac5add46287519479
Author: Translation commit bot 
Date:   Sat Apr 21 04:50:34 2018 +

Update translations for support-tbb
---
 zh_CN.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh_CN.json b/zh_CN.json
index 1d178e78b..46db91b64 100644
--- a/zh_CN.json
+++ b/zh_CN.json
@@ -39,13 +39,13 @@
"id": "#tbb-7",
"control": "tbb-7",
"title": "我最爱的网站屏蔽来自 Tor 的访问。",
-   "description": "Sorry to hear that you can't visit 
the website you wanted! Sometimes websites will block Tor users because they 
can't tell the difference between the average Tor user and automated traffic. 
The best success we've had in getting sites to unblock Tor users is getting 
users to contact the site administrators directly. Something like this might do 
the trick:\"Hi! I tried to access your site xyz.com while using Tor 
Browser and discovered that you don't allow Tor users to access your site. I 
urge you to reconsider this decision; Tor is used by people all over the world 
to protect their privacy and fight censorship. By blocking Tor users, you are 
likely blocking people in repressive countries who want to use a free internet, 
journalists and researchers who want to protect themselves from discovery, 
whistleblowers, activists, and ordinary people who want to opt out of invasive 
third party tracking. Please take a strong stance in favor of digital priv
 acy and internet freedom, and allow Tor users access to xyz.com. Thank 
you.\"In the case of banks, and other sensitive websites, it is also 
common to see geography-based blocking (if a bank knows you generally access 
their services from one country, and suddenly you are connecting from an exit 
relay on the other side of the world, your account may be locked or suspended). 
If you are unable to connect to an onion service, please see I cannot reach X.onion!"
+   "description": "不能访问你
想要的网站真是遗憾呢！有些网站屏蔽了 Tor 因为他们无
法分辨出普通 Tor 用户和机器人的区别。æ 
¹æ®è¿‡åŽ»çš„经验，想要让网站解封来自 Tor 
的访问最有效的方法是由用户直接联系网站管理员。也许这æ 
·çš„消息就可以成功：“嗨，在用 Tor Browser 的时候发现你
的网站 xyz.com 不允许来自 Tor 的访问，希望你
可以重新考虑这个决定。全球各地很多人都在使用 Tor 
来保护隐私和对抗审查，屏蔽 Tor 的同时你
也屏蔽了强权国家中想自由访问互联网的用户、需要隐藏自己的记è€
…和检举者、想躲避网络跟踪的研究者
和普通用户。请站在支持在线隐私和网络自由的立场上，å…
è®¸ Tor 用户访问 xyz.com，谢谢！”另外，银行这类比较敏感的网站经常进行地区范围的屏蔽。如果ä½
 å¹³æ—¶åªåœ¨æŸä¸ªç‰¹å®šçš„国家使用他们的服务
 ，从其他国家进行访问时你的账号可能就会被冻结。如无
法连接 onion 服务，请参阅 http://127.0.0.1:5000/#onionservices-3\\\;>无法连接 
x.onion！"
 },
 "tbb-7-1": {
"id": "#tbb-7-1",
"control": "tbb-7-1",
"title": "我在用tor访问Facebook，Twitter或者å…
¶ä»–的网站的时候无法使用它们的功能。",
-   "description": "Sometimes Javascript-heavy websites 
can have functional issues over Tor Browser. The simplest fix is to click on 
the \"onion menu,\" then click on the security slider. Set your security to 
\"low.\""
+   "description": "有时候用tor浏览器访问一些包
含许多JavaScript的网站会出现功能性的问题。最简单解决这个问题的办法是点击“洋葱目录”，然后点击安å
…¨æ€§æ»‘条。将您的安全性设置到“低”。"
 },
 "tbb-8": {
"id": "#tbb-8",

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

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

[translation]

commit 621cacb3f82e64d8c1ba395d466f09d207b991d4
Author: Translation commit bot 
Date:   Sat Apr 21 04:49:59 2018 +

Update translations for support-connecting_completed
---
 zh_CN.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_CN.json b/zh_CN.json
index d2f692083..f70a3941e 100644
--- a/zh_CN.json
+++ b/zh_CN.json
@@ -9,7 +9,7 @@
"id": "#连接-2",
"control": "连接-2",
"title": "无法连接到 
Tor，我不知道发生了什么什么错误。",
-   "description": "如果您的连接出现问题，请选择“复制Tor日志到剪贴板”选项。然后粘贴Tor日志到文本文件或è€
…其他文档æ 
¼å¼ã€‚您应该能够在粘贴的Tor日志中发现这些常见问题（请在Tor日志里寻找如下所示的错误）:
 常见错误#1: 代理连接失败  
2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 
2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: Connecting to directory 
server \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing 
handshake with directory server \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: 
unable to connect to xx..xxx..xxx.xx:x (\"general SOCKS server failure\") 
\n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to 
xx..xxx..xxx.xx:x  (\"general SOCKS server failure\") \n 2017-10-29 
09:24:08.900 [WARN] Proxy Client: unable to connect toxx..xxx..xxx.xx:x  
(\"general SOCKS server
  failure\") 
如果您看见这些提示出现在您的日志里面，这意味着您连接SOCKS代理失败了。如果您的系统设置需要一个SOCKS代理,
 请保证您正确的输入了关于这个代理的配置。 
如果您的系统不需要代理，或者
您不敢肯定，请尝试直接连接Tor网络。常见错误 #2: 无
法连接到中继 11/1/2017 21:11:43 PM.500 
[NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 11/1/2017 21:11:44 PM.300 
[NOTICE] Bootstrapped 80%: Connecting to the Tor network \n 11/1/2017 21:11:44 
PM.300 [WARN] Failed to find node for hop 0 of our path. Discarding this 
circuit. \n 11/1/2017 21:11:44 PM.500 [NOTICE] Bootstrapped 85%: Finishing 
handshake with first hop \n 11/1/2017 21:11:45 PM.300 [WARN] Failed to find 
node for hop 0 of our path. Discarding this circuit. 
如果您看见这些提示出现在您的日志里面，这意味着æ
 ‚¨çš„Tor连接 
Tor网络中的第一个节点失败了。这可能意味着您处于被监管的网络之中。请尝试通过网桥连接，这应该能解决您的问题。常见错误#3:
 TLS握手失败  13-11-17 19:52:24.300 
[NOTICE] Bootstrapped 10%: Finishing handshake with directory server \n 
13-11-17 19:53:49.300 [WARN] Problem bootstrapping. Stuck at 10%: Finishing 
handshake with directory server. (DONE; DONE; count 10; recommendation warn; 
host [host] at xxx.xxx.xxx.xx:xxx) \n 13-11-17 19:53:49.300 [WARN] 10 
connections have failed: \n 13-11-17 19:53:49.300 [WARN]  9 connections died in 
state handshaking (TLS) with SSL state SSLv2/v3 read server hello A in 
HANDSHAKE \n 13-11-17 19:53:49.300 [WARN]  1 connections died in state 
connect()ing with SSL state (No SSL object)如果您看见这些提示出现在您的日志里面，这意味着Tor
 与中继目录提供服务器的TLS握手失败了。 使
 用网桥应该能解决这个问题常见错误#4: 时间设置错误 
 19.11.2017 00:04:47.400 [NOTICE] Opening Socks listener on 
127.0.0.1:9150 \n 19.11.2017 00:04:48.000 [NOTICE] Bootstrapped 5%: Connecting 
to directory server \n 19.11.2017 00:04:48.200 [NOTICE] Bootstrapped 10%: 
Finishing handshake with directory server \n 19.11.2017 00:04:48.800 [WARN] 
Received NETINFO cell with skewed time (OR:xxx.xx.x.xx:): It seems that our 
clock is behind by 1 days, 0 hours, 1 minutes, or that theirs is ahead. \n 
Tor需要一个准确的时间来维持它的运作。请检查您的时间，时区以及日期设置。如果您看见这些提示出现在您的日志里面，这意味着您的系统时间设置错误。请确认您的时间设置是正确的，åŒ
…括正确的时区。然后重新启动Tor。 "
+   "description": "如果您的连接出现问题，请选择“复制Tor日志到剪贴板”选项。然后粘贴Tor日志到文本文件或è€
…其他文档æ 
¼å¼ã€‚您应该能够在粘贴的Tor日志中发现这些常见问题（请在Tor日志里寻找如下所示的错误）:
 常见错误#1: 代理连接失败 
2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \\n 
2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: Connecting to directory 
server \\n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing 
handshake with directory server \\n 2017-10-29 09:24:08.900 [WARN] Proxy 
Client: unable to connect to xx..xxx..xxx.xx:x (\\\"general SOCKS server 
failure\\\") \\n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect 
to xx..xxx..xxx.xx:x  (\\\"general SOCKS server 

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

[translation]

commit ae1f88db80adf35d568254062ffa329535f925d6
Author: Translation commit bot 
Date:   Sat Apr 21 04:49:50 2018 +

Update translations for support-censorship_completed
---
 zh_CN.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh_CN.json b/zh_CN.json
index 69f34533c..77e144e42 100644
--- a/zh_CN.json
+++ b/zh_CN.json
@@ -9,7 +9,7 @@
"id": "#审查-2",
"control": "审查-2",
"title": "我最爱的网站屏蔽来自 Tor 的访问。",
-   "description": "不能访问你
想要的网站真是遗憾呢！有些网站屏蔽了 Tor 因为他们无
法分辨出普通 Tor 用户和机器人的区别。æ 
¹æ®è¿‡åŽ»çš„经验，想要让网站解封来自 Tor 
的访问最有效的方法是由用户直接联系网站管理员。也许这æ 
·çš„消息就可以成功：“嗨，在用 Tor Browser 的时候发现你
的网站 xyz.com 不允许来自 Tor 的访问，希望你
可以重新考虑这个决定。全球各地很多人都在使用 Tor 
来保护隐私和对抗审查，屏蔽 Tor 的同时你
也屏蔽了强权国家中想自由访问互联网的用户、需要隐藏自己的记è€
…和检举者、想躲避网络跟踪的研究者
和普通用户。请站在支持在线隐私和网络自由的立场上，å…
è®¸ Tor 用户访问 xyz.com，谢谢！”另外，银行这类比较敏感的网站经常进行地区范围的屏蔽。如果ä½
 å¹³æ—¶åªåœ¨æŸä¸ªç‰¹å®šçš„国家使用他们的服务，从位于
 其他国家的出口节点进行访问时你
的账号可能就会被冻结。如无法连接 onion 服务，请参阅 http://127.0.0.1:5000/#onionservices-3\;>无法连接 x.onion！"
+   "description": "不能访问你
想要的网站真是遗憾呢！有些网站屏蔽了 Tor 因为他们无
法分辨出普通 Tor 用户和机器人的区别。æ 
¹æ®è¿‡åŽ»çš„经验，想要让网站解封来自 Tor 
的访问最有效的方法是由用户直接联系网站管理员。也许这æ 
·çš„消息就可以成功：“嗨，在用 Tor Browser 的时候发现你
的网站 xyz.com 不允许来自 Tor 的访问，希望你
可以重新考虑这个决定。全球各地很多人都在使用 Tor 
来保护隐私和对抗审查，屏蔽 Tor 的同时你
也屏蔽了强权国家中想自由访问互联网的用户、需要隐藏自己的记è€
…和检举者、想躲避网络跟踪的研究者
和普通用户。请站在支持在线隐私和网络自由的立场上，å…
è®¸ Tor 用户访问 xyz.com，谢谢！”另外，银行这类比较敏感的网站经常进行地区范围的屏蔽。如果ä½
 å¹³æ—¶åªåœ¨æŸä¸ªç‰¹å®šçš„国家使用他们的服务，从å…
 ¶ä»–国家进行访问时你的账号可能就会被冻结。如无法连接 
onion 服务，请参阅 http://127.0.0.1:5000/#onionservices-3\\\;>无法连接 
x.onion！"
 },
 "censorship-3": {
"id": "#审查-3",
@@ -27,7 +27,7 @@
"id": "#审查-5",
"control": "审查-5",
"title": "无法连接到 
Tor，但我不知道发生了什么什么错误。",
-   "description": "如果您的连接出现问题，请选择“复制Tor日志到剪贴板”选项。然后粘贴Tor日志到文本文件或è€
…其他文档æ 
¼å¼ã€‚您应该能够在粘贴的Tor日志中发现这些常见问题（请在Tor日志里寻找如下所示的错误）:
 常见错误#1: 代理连接失败 
2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 
2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: Connecting to directory 
server \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing 
handshake with directory server \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: 
unable to connect to xx..xxx..xxx.xx:x (\"general SOCKS server failure\") 
\n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to 
xx..xxx..xxx.xx:x  (\"general SOCKS server failure\") \n 2017-10-29 
09:24:08.900 [WARN] Proxy Client: unable to connect toxx..xxx..xxx.xx:x  
(\"general SOCKS server 
 failure\") 
如果您看见这些提示出现在您的日志里面，这意味着您连接SOCKS代理失败了。如果您的系统设置需要一个SOCKS代理,
 请保证您正确的输入了关于这个代理的配置。  
如果您的系统不需要代理，或者
您不敢肯定，请尝试直接连接Tor网络。常见错误 #2: 无
法连接到中继 11/1/2017 21:11:43 PM.500 
[NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 11/1/2017 21:11:44 PM.300 
[NOTICE] Bootstrapped 80%: Connecting to the Tor network \n 11/1/2017 21:11:44 
PM.300 [WARN] Failed to find node for hop 0 of our path. Discarding this 
circuit. \n 11/1/2017 21:11:44 PM.500 [NOTICE] Bootstrapped 85%: Finishing 
handshake with first hop \n 11/1/2017 21:11:45 PM.300 [WARN] Failed to find 
node for hop 0 of our path. Discarding this circuit.如果您看见这些提示出现在您的日志里面，这意味着æ‚
 ¨çš„Tor连接 

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

[translation]

commit 9280deaf75a190f1cc6833f74b7e05477667ee1e
Author: Translation commit bot 
Date:   Sat Apr 21 04:50:46 2018 +

Update translations for support-topics_completed
---
 zh_CN.json | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zh_CN.json b/zh_CN.json
index 8c87f556d..f9afa7cf2 100644
--- a/zh_CN.json
+++ b/zh_CN.json
@@ -49,9 +49,9 @@
"control": "洋葱服务",
"label": "洋葱服务"
 },
-"miscellaneus": {
-   "path": "#杂项",
-   "control": "杂项",
-   "label": "杂项"
+"misc": {
+   "path": "#misc",
+   "control": "misc",
+   "label": "Misc"
 }
 }

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

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

[translation]

commit 87ddaff4617eeb6b129335e162d1ed9a0b0e8d59
Author: Translation commit bot 
Date:   Sat Apr 21 04:49:45 2018 +

Update translations for support-censorship
---
 zh_CN.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh_CN.json b/zh_CN.json
index d681ecd8e..77e144e42 100644
--- a/zh_CN.json
+++ b/zh_CN.json
@@ -9,7 +9,7 @@
"id": "#审查-2",
"control": "审查-2",
"title": "我最爱的网站屏蔽来自 Tor 的访问。",
-   "description": "Sorry to hear that you can't visit 
the website you wanted! Sometimes websites will block Tor users because they 
can't tell the difference between the average Tor user and automated traffic. 
The best success we've had in getting sites to unblock Tor users is getting 
users to contact the site administrators directly. Something like this might do 
the trick:\"Hi! I tried to access your site xyz.com while using Tor 
Browser and discovered that you don't allow Tor users to access your site. I 
urge you to reconsider this decision; Tor is used by people all over the world 
to protect their privacy and fight censorship. By blocking Tor users, you are 
likely blocking people in repressive countries who want to use a free internet, 
journalists and researchers who want to protect themselves from discovery, 
whistleblowers, activists, and ordinary people who want to opt out of invasive 
third party tracking. Please take a strong stance in favor of digital priv
 acy and internet freedom, and allow Tor users access to xyz.com. Thank 
you.\"In the case of banks, and other sensitive websites, it is also 
common to see geography-based blocking (if a bank knows you generally access 
their services from one country, and suddenly you are connecting from an exit 
relay on the other side of the world, your account may be locked or suspended). 
If you are unable to connect to an onion service, please see I cannot reach X.onion!"
+   "description": "不能访问你
想要的网站真是遗憾呢！有些网站屏蔽了 Tor 因为他们无
法分辨出普通 Tor 用户和机器人的区别。æ 
¹æ®è¿‡åŽ»çš„经验，想要让网站解封来自 Tor 
的访问最有效的方法是由用户直接联系网站管理员。也许这æ 
·çš„消息就可以成功：“嗨，在用 Tor Browser 的时候发现你
的网站 xyz.com 不允许来自 Tor 的访问，希望你
可以重新考虑这个决定。全球各地很多人都在使用 Tor 
来保护隐私和对抗审查，屏蔽 Tor 的同时你
也屏蔽了强权国家中想自由访问互联网的用户、需要隐藏自己的记è€
…和检举者、想躲避网络跟踪的研究者
和普通用户。请站在支持在线隐私和网络自由的立场上，å…
è®¸ Tor 用户访问 xyz.com，谢谢！”另外，银行这类比较敏感的网站经常进行地区范围的屏蔽。如果ä½
 å¹³æ—¶åªåœ¨æŸä¸ªç‰¹å®šçš„国家使用他们的服务，从å…
 ¶ä»–国家进行访问时你的账号可能就会被冻结。如无法连接 
onion 服务，请参阅 http://127.0.0.1:5000/#onionservices-3\\\;>无法连接 
x.onion！"
 },
 "censorship-3": {
"id": "#审查-3",
@@ -27,7 +27,7 @@
"id": "#审查-5",
"control": "审查-5",
"title": "无法连接到 
Tor，但我不知道发生了什么什么错误。",
-   "description": "If you’re having trouble 
connecting, please select the option to \"copy Tor log to clipboard.\" Then 
paste the Tor log into a text file or other document. You should see one of 
these common log errors (look for the following lines in your Tor 
log):Common log error #1: Proxy connection failure 2017-10-29 09:23:40.800 [NOTICE] Opening Socks 
listener on 127.0.0.1:9150 \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: 
Connecting to directory server \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 
10%: Finishing handshake with directory server \n 2017-10-29 09:24:08.900 
[WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:x (\"general 
SOCKS server failure\") \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable 
to connect to xx..xxx..xxx.xx:x  (\"general SOCKS server failure\") \n 
2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect 
toxx..xxx..xxx.xx:x  (\"general SOCKS server fa
 ilure\")If you see lines like these  in 
your Tor log, it means you are failing to connect to a SOCKS proxy. If a SOCKS 
proxy is required for your network setup, then please make sure you’ve 
entered your proxy details correctly.  If a SOCKS proxy is not required, or 
you’re not sure,  please try connecting to the Tor network without a SOCKS 
proxy.Common log error #2: Can’t reach guard relays 11/1/2017 21:11:43 PM.500 [NOTICE] Opening Socks 
listener on 127.0.0.1:9150 \n 11/1/2017 21:11:44 PM.300 [NOTICE] Bootstrapped 
80%: Connecting to the Tor network \n 11/1/2017 21:11:44 PM.300 [WARN] Failed 
to find node for hop 0 of our path. Discarding this circuit. \n 

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

[translation]

commit 6f0348ff7c795c01e141bca1fb7c5bfd96f6390f
Author: Translation commit bot 
Date:   Sat Apr 21 04:50:14 2018 +

Update translations for support-gettor_completed
---
 zh_CN.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_CN.json b/zh_CN.json
index c731146f7..97164d034 100644
--- a/zh_CN.json
+++ b/zh_CN.json
@@ -9,7 +9,7 @@
"id": "#获取tor-2",
"control": "获取tor-2",
"title": "通过邮箱使用GetTor。",
-   "description": "向get...@torproject.org发送邮件。在邮件内
容里写下你的操作系统（如Windows，MacOS（OS X），或者
linux）并发送。GetTor会发送回复邮件，包含下载Tor 
Browser的链接，加密签名（核实下载时所需）［加
密签名的学术性定义链接；核实步骤］，生成加
密签名的密钥，以及包裹的校验和。你
可能会有“32-bit”和“64-bit”两个版本的软件可供选择：这取决于ä½
 æ­£ä½¿ç”¨çš„电脑型号；查阅电脑文档以了解更多。"
+   "description": 
"您可以向get...@torproject.org发送邮件。在邮件内
容里写下您的操作系统（如Windows，MacOS（OS X），或者
linux）并发送。GetTor会回复邮件，内容包含下载Tor 
Browser的链接与加密签名（核实下载文件时所需）［加
密签名的学术性定义链接；核实步骤］，生成加
密签名的密钥，以及包裹的校验和。你
可能会有“32-bit”和“64-bit”两个版本的软件可供选择：这取决于ä½
 æ­£ä½¿ç”¨çš„电脑型号。"
 },
 "gettor-3": {
"id": "#获取tor-3",

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

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

[translation]

commit 5221ff2c27e994de402669ecec83359fc4b760a0
Author: Translation commit bot 
Date:   Sat Apr 21 04:50:10 2018 +

Update translations for support-gettor
---
 zh_CN.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_CN.json b/zh_CN.json
index 5fff2fe40..97164d034 100644
--- a/zh_CN.json
+++ b/zh_CN.json
@@ -9,7 +9,7 @@
"id": "#获取tor-2",
"control": "获取tor-2",
"title": "通过邮箱使用GetTor。",
-   "description": "Send an email to 
get...@torproject.org. Write your operating system (such as windows, MacOS (OS 
X), or linux) in the body of the message and send. GetTor will respond with an 
email containing links from which you can download Tor Browser, the 
cryptographic signature (needed for verifying the download) [link to glossary 
definition of cryptographic signature; instructions for verification], the 
fingerprint of the key used to make the signature, and the package’s 
checksum. You may be offered a choice of \"32-bit\" or \"64-bit\" software: 
this depends on the model of the computer you are using; consult documentation 
about your computer to find out more."
+   "description": 
"您可以向get...@torproject.org发送邮件。在邮件内
容里写下您的操作系统（如Windows，MacOS（OS X），或者
linux）并发送。GetTor会回复邮件，内容包含下载Tor 
Browser的链接与加密签名（核实下载文件时所需）［加
密签名的学术性定义链接；核实步骤］，生成加
密签名的密钥，以及包裹的校验和。你
可能会有“32-bit”和“64-bit”两个版本的软件可供选择：这取决于ä½
 æ­£ä½¿ç”¨çš„电脑型号。"
 },
 "gettor-3": {
"id": "#获取tor-3",

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

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

[translation]

commit 6a970cfbe58790019ed0a781c45a83154b30c225
Author: Translation commit bot 
Date:   Sat Apr 21 04:45:30 2018 +

Update translations for https_everywhere
---
 zh_CN/https-everywhere.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh_CN/https-everywhere.dtd b/zh_CN/https-everywhere.dtd
index 95935b903..5865a45e6 100644
--- a/zh_CN/https-everywhere.dtd
+++ b/zh_CN/https-everywhere.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -17,7 +17,7 @@
 
 
 
-
+
 
 
 

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

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

[translation]

commit a6a1e06c5e0facd7191dadfa2523bf1686acaa79
Author: Translation commit bot 
Date:   Sat Apr 21 04:45:39 2018 +

Update translations for https_everywhere_completed
---
 zh_CN/https-everywhere.dtd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zh_CN/https-everywhere.dtd b/zh_CN/https-everywhere.dtd
index 1d908e38d..5865a45e6 100644
--- a/zh_CN/https-everywhere.dtd
+++ b/zh_CN/https-everywhere.dtd
@@ -17,6 +17,7 @@
 
 
 
+
 
 
 

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

[tor-commits] [obfs4/master] (meek_lite) Explicitly set Content-Length to zero when there is no data to send.

[yawning]

commit 89c21805c212bcc2f5a0c4ffdadf424cbff1c7c9
Author: Yawning Angel 
Date:   Sat Apr 21 03:11:26 2018 +

(meek_lite) Explicitly set Content-Length to zero when there is no data to 
send.


https://gitweb.torproject.org/pluggable-transports/meek.git/commit/?h=0.28=0ea861efe5873b517fbd08c4bc48027e4db16a95
---
 ChangeLog   | 2 ++
 transports/meeklite/meek.go | 6 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3a4a178..361ceb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Changes in version 0.0.8 - UNRELEASED:
  - Bug 24793: Send the correct authorization HTTP header for basic auth.
+ - (meek_lite) Explicitly set Content-Length to zero when there is no data
+   to send.
 
 Changes in version 0.0.7 - 2016-11-15:
  - Support configuring the obfs4 IAT parameter as the sole
diff --git a/transports/meeklite/meek.go b/transports/meeklite/meek.go
index f0d29db..e068b68 100644
--- a/transports/meeklite/meek.go
+++ b/transports/meeklite/meek.go
@@ -231,7 +231,11 @@ func (c *meekConn) roundTrip(sndBuf []byte) (recvBuf 
[]byte, err error) {
if c.args.front != "" {
url.Host = c.args.front
}
-   req, err = http.NewRequest("POST", url.String(), 
bytes.NewReader(sndBuf))
+   var body io.Reader
+   if len(sndBuf) > 0 {
+   body = bytes.NewReader(sndBuf)
+   }
+   req, err = http.NewRequest("POST", url.String(), body)
if err != nil {
return nil, err
}

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

[tor-commits] [obfs4/master] fixup! Bug 24793: Send the correct authorization HTTP header for basic auth.

[yawning]

commit e3d4c5308d266ee267aefa7b9aa586107b812276
Author: Yawning Angel 
Date:   Sat Apr 21 03:10:33 2018 +

fixup! Bug 24793: Send the correct authorization HTTP header for basic auth.
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 8c89813..3a4a178 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 Changes in version 0.0.8 - UNRELEASED:
+ - Bug 24793: Send the correct authorization HTTP header for basic auth.
 
 Changes in version 0.0.7 - 2016-11-15:
  - Support configuring the obfs4 IAT parameter as the sole



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

[tor-commits] [webwml/master] Add new Tor Browser version: 8.0a6

[boklm]

commit e595e241af12366c5039843e109d47180f9b270d
Author: Nicolas Vigier 
Date:   Sat Apr 21 00:12:30 2018 +0200

Add new Tor Browser version: 8.0a6
---
 include/versions.wmi   | 4 ++--
 projects/torbrowser/RecommendedTBBVersions | 6 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index a4c56ebd..4acd207b 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -22,8 +22,8 @@
 ../dist/torbrowser//tor-win32-.zip
 
 # *** tor browser beta/alpha ***
-8.0a5
-2018-03-26
+8.0a6
+2018-04-21
 0.0.16
 
 # If all platforms are on the same version, you only need to update
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index c98e4243..2fefb90c 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -6,5 +6,9 @@
 "8.0a5",
 "8.0a5-MacOS",
 "8.0a5-Linux",
-"8.0a5-Windows"
+"8.0a5-Windows",
+"8.0a6",
+"8.0a6-MacOS",
+"8.0a6-Linux",
+"8.0a6-Windows"
 ]

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

[tor-commits] [webwml/master] Remove old key from the signing-keys page

[boklm]

commit b482df8dc1a92039e65c8d1324e4340d0119adf4
Author: Nicolas Vigier 
Date:   Sat Apr 21 00:05:50 2018 +0200

Remove old key from the signing-keys page
---
 docs/en/signing-keys.wml | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml
index 37de1c59..e05c1fbf 100644
--- a/docs/en/signing-keys.wml
+++ b/docs/en/signing-keys.wml
@@ -30,7 +30,7 @@
 David Goulet (0x42E86A2A11F48D36) signs Torsocks releases.
 Sukhbir Singh (0xB01C8B006DA77FAA) signs Tor Messenger and TorBirdy 
releases.
 Other developers include Peter Palfrader (0xC82E0039, or its
-subkey 0xE1DEC577) and Jacob Appelbaum (0xFA7F0E44D487F03F).
+subkey 0xE1DEC577).
 
 
 The fingerprints for the keys should be:
@@ -126,12 +126,6 @@
 uid   [  full  ] Arthur Edelstein 
 sub   2048R/3306E88D27211E0B 2014-12-10
 
-pub   4096R/FA7F0E44D487F03F 2014-06-27 [expires: 2024-06-24]
-  Key fingerprint = D6A9 48CF 297F 7539 30B4  756A FA7F 0E44 D487 F03F
-uid  Jacob Appelbaum ja...@torproject.org
-sub   3072R/36A3F38A 2015-07-01 [expires: 2016-06-30]
-sub   3072R/45EDE84B 2015-07-01 [expires: 2016-06-30]
-
 pub   4096R/0x4E2C6E8793298290 2014-12-15 [expires: 2020-08-24]
   Key fingerprint = EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
 uid   Tor Browser Developers (signing key) 
torbrow...@torproject.org



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

[tor-commits] [webwml/master] Bug 25846: Add Arthur's key to the signing-keys page

[boklm]

commit fc8852c5ab7a5a875e7636947b4b27d1d51a1a97
Author: Nicolas Vigier 
Date:   Thu Apr 19 12:32:09 2018 +0200

Bug 25846: Add Arthur's key to the signing-keys page
---
 docs/en/signing-keys.wml | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml
index 8a868aed..37de1c59 100644
--- a/docs/en/signing-keys.wml
+++ b/docs/en/signing-keys.wml
@@ -16,7 +16,8 @@
 
 The Tor Browser Developers (0x93298290),
 Mike Perry (0x0E3A92E4), Georg Koppen (0x4B7C3223),
-Nicolas Vigier (0xD0220E4B) and Linus Nordberg (0x23291265)
+Nicolas Vigier (0xD0220E4B), Linus Nordberg (0x23291265)
+and Arthur Edelstein (0xD752F538C0D38C3A)
 sign the Tor Browser releases.
 Roger Dingledine (0x28988BF5 and 0x19F78451) or Nick Mathewson
  (0xFE43009C4607B1FB with signing key 0x6AFEE6D49E92B601)
@@ -120,6 +121,11 @@
   Key fingerprint = 4A90 646C 0BAE D9D4 56AB  3111 E5B8 1856 D022 0E4B
 uid  Nicolas Vigier (TBB Builds Signing Key) 
bo...@torproject.org
 
+pub   2048R/D752F538C0D38C3A 2014-12-10
+Key fingerprint = 20B2 4CEF E6AF D615 0B6A  6F18 D752 F538 C0D3 8C3A
+uid   [  full  ] Arthur Edelstein 
+sub   2048R/3306E88D27211E0B 2014-12-10
+
 pub   4096R/FA7F0E44D487F03F 2014-06-27 [expires: 2024-06-24]
   Key fingerprint = D6A9 48CF 297F 7539 30B4  756A FA7F 0E44 D487 F03F
 uid  Jacob Appelbaum ja...@torproject.org

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

[tor-commits] [torspec/master] Add current-time/{local, utc} to GETINFO

[catalyst]

commit f59414d0e210c1eec99bf7ad4ea290051c5714fe
Author: Neel Chauhan 
Date:   Thu Apr 19 20:46:41 2018 -0400

Add current-time/{local,utc} to GETINFO
---
 control-spec.txt | 5 +
 1 file changed, 5 insertions(+)

diff --git a/control-spec.txt b/control-spec.txt
index 03d153d..80ff5a1 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -1066,6 +1066,11 @@
   consensus, base-64 encoded.  An empty value means that either
   the consensus has no shared random value, or Tor has no consensus.
 
+"current-time/local"
+"current-time/utc"
+  The current system or UTC time, as returned by the system, in ISOTime2
+  format.
+
 "config-can-saveconf"
   0 or 1, depending on whether it is possile to use SAVECONF without the
   FORCE flag. (Introduced in 0.3.1.1-alpha.)

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

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

[translation]

commit 18a0a211ae2b7810608c63646d59c80ebb6cbcaa
Author: Translation commit bot 
Date:   Fri Apr 20 18:50:35 2018 +

Update translations for support-miscellaneous
---
 sk_SK.json | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sk_SK.json b/sk_SK.json
index c29993d09..ab10f9ed3 100644
--- a/sk_SK.json
+++ b/sk_SK.json
@@ -14,7 +14,7 @@
  "misc-3": {
"id": "#misc-3",
"control": "misc-3",
-   "title": "Who funds Tor?",
+   "title": "Kto financuje Tor?",
"description": "Tor is funded by a number of 
different sponsors including US federal agencies, private foundations, and 
individual donors. Check out a list of all https://www.torproject.org/about/sponsors.html.en\;>our 
sponsors and a series of https://blog.torproject.org/category/tags/form-990\;>blog 
posts on our financial reports.We feel that 
talking openly about our funders and funding model is the best way to maintain 
trust with our community. We are always seeking more diversity in our funding 
sources, especially from foundations and individuals."
  },
  "misc-4": {
@@ -44,7 +44,7 @@
 "misc-8": {
"id": "#misc-8",
"control": "misc-8",
-   "title": "Can I use the Tor logo in my product?",
+   "title": "Môžem použiť Tor logo v mojom produkte?",
"description": "You can read all about that on our 
https://www.torproject.org/docs/trademark-faq.html\;>​Trademark faq 
page."
 },
 "misc-9": {
@@ -68,13 +68,13 @@
 "misc-12": {
"id": "#misc-12",
"control": "misc-12",
-   "title": "How can I share files anonymously through Tor?",
+   "title": "Môžem cez Tor anonymne zdielať súbory?",
"description": "Many exit nodes are configured to 
block certain types of file sharing traffic, such as bittorrent. Bittorrent in 
specific is https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\;>​not 
anonymous over Tor.For sharing files through 
Tor, ​https://onionshare.org/\;>OnionShare is a 
good option."
 },
 "misc-13": {
"id": "#misc-13",
"control": "misc-13",
-   "title": "Can I use a VPN with Tor?",
+   "title": "Môžem používať VPN s Tor?",
"description": "Generally speaking, we don't 
recommend using a VPN with Tor unless you're an advanced user who knows how to 
configure both in a way that doesn't compromise your privacy. You can find more 
detailed information about Tor + VPN at https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN\;>​our 
wiki."
 },
 "misc-14": {
@@ -86,7 +86,7 @@
 "misc-15": {
"id": "#misc-15",
"control": "misc-15",
-   "title": "How can I donate to Tor Project?",
+   "title": "Ako môžem prispieť projektu Tor?",
"description": "Thank you for your support! You can 
find more information about donating on our https://donate.torproject.org/donor-faq\;>​donor FAQe."
  }
 }

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

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

[translation]

commit bdb48041d487b4d1b676298970dbebfc769645ed
Author: Translation commit bot 
Date:   Fri Apr 20 18:50:44 2018 +

Update translations for support-tbb
---
 sk_SK.json | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sk_SK.json b/sk_SK.json
index e4ba34fc5..673937e56 100644
--- a/sk_SK.json
+++ b/sk_SK.json
@@ -20,7 +20,7 @@
 "tbb-4": {
"id": "#tbb-4",
"control": "tbb-4",
-   "title": "Why is Tor Browser built from Firefox and not some other 
browser",
+   "title": "Prečo je Tor Browser postavený na Firefoxe a nie na nejakom 
inom prehliadači",
"description": "Tor Browser is a modified version of 
Firefox specifically designed for use with Tor. A lot of work has been put into 
making the Tor Browser, including the use of extra patches to enhance privacy 
and security. While it is technically possible to use Tor with other browsers, 
you may open yourself up to potential attacks or information leakage, so we 
strongly discourage it. https://www.torproject.org/projects/torbrowser/design/\;>Learn more 
about the design of Tor Browser."
 },
 "tbb-5": {
@@ -68,7 +68,7 @@
 "tbb-11": {
"id": "#tbb-11",
"control": "tbb-11",
-   "title": "I downloaded and installed Tor Browser for Windows, but now I 
can't find it.",
+   "title": "Stiahol a nainštaloval som Tor Browser pre Windows, ale 
teraz ho nemôžem nájsť.",
"description": "The file you download and run prompts 
you for a destination. If you don't remember what this destination was, it's 
most likely your Downloads or Desktop folder. The default setting in the 
Windows installer also creates a shortcut for you on your Desktop, though be 
aware that you may have accidentally unticked the option to create a shortcut. 
If you can't find it in either of those folders, download it again and look for 
the prompt that asks you to choose a directory to download it in. Choose a 
directory location that you'll remember easily, and once the download finishes 
you should see a Tor Browser folder there."
 },
 "tbb-12": {
@@ -146,13 +146,13 @@
 "tbb-24": {
"id": "#tbb-24",
"control": "tbb-24",
-   "title": "I'm having a problem with DuckDuckGo.",
+   "title": "Mám problém s DuckDuckGo.",
"description": "Please see the ​https://duck.co/help\;>DuckDuckGo support portal. If you 
believe this is a Tor Browser issue, please report it on our ​https://trac.torproject.org/\;>bug tracker."
 },
 "tbb-25": {
"id": "#tbb-25",
"control": "tbb-25",
-   "title": "I'm having a problem with NoScript.",
+   "title": "Mám problém s NoScript.",
"description": "Please see the ​https://noscript.net/faq\;>NoScript FAQ. If you believe this 
is a Tor Browser issue, please report it on our ​https://trac.torproject.org/\;>bug tracker."
 },
 "tbb-26": {
@@ -170,7 +170,7 @@
 "tbb-28": {
"id": "#tbb-28",
"control": "tbb-28",
-   "title": "How do I uninstall Tor Browser?",
+   "title": "Ako odinštalujem Tor Browser?",
"description": "Removing Tor Browser from your system 
is simple:Locate your Tor Browser folder or 
application. The default location on Windows is the Desktop; on macOS it is the 
Applications folder (on macOS, you have to move it into the Applications folder 
when you complete the installation process). On Linux, there is no default 
location, however the folder will be named \"tor-browser_en-US\" if you are 
running the English Tor Browser.Delete the Tor Browser folder or 
application.Empty your Trash.Note that 
your operating system’s standard \"Uninstall\" utility is not used."
 },
 "tbb-29": {
@@ -188,7 +188,7 @@
 "tbb-31": {
"id": "#tbb-31",
"control": "tbb-31",
-   "title": "Which platforms is Tor Browser available for?",
+   "title": "Na akých platformách je Tor Browser dostupný?",
"description": "Tor Browser is currently available on 
Windows, Linux and OSX. For Android, The Guardian Project maintains the 
Tor-powered apps Orbot and Orfox. There is no official version of Tor for iOS 
yet, though we recommend Onion Browser."
 },
 "tbb-32": {

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

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

[translation]

commit ff7aec9ec9787ffadce28271561aa8cdaf476b77
Author: Translation commit bot 
Date:   Fri Apr 20 18:50:19 2018 +

Update translations for support-gettor
---
 sk_SK.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sk_SK.json b/sk_SK.json
index 1f4c42c72..e891cf0dd 100644
--- a/sk_SK.json
+++ b/sk_SK.json
@@ -2,7 +2,7 @@
 "gettor-1": {
"id": "#gettor-1",
"control": "gettor-1",
-   "title": "How do I download Tor if the torproject.org is blocked?",
+   "title": "Ako stiahnuť Tor ak je stránka torproject.org blokovaná?",
"description": "If you can't download Tor through our 
​https://www.torproject.org\;>website, you can get 
a copy of Tor delivered to you via GetTor. GetTor is a service that 
automatically responds to messages with links to the latest version of Tor 
Browser, hosted at a variety of locations that are less likely to be censored, 
such as Dropbox, Google Drive, and Github."
 },
 "gettor-2": {

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

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

[translation]

commit 1040abd8882cf0f504ffd3ad9351fbe8f9cbd894
Author: Translation commit bot 
Date:   Fri Apr 20 18:50:10 2018 +

Update translations for support-faq
---
 sk_SK.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sk_SK.json b/sk_SK.json
index a4a631779..087aa6256 100644
--- a/sk_SK.json
+++ b/sk_SK.json
@@ -20,13 +20,13 @@
 "faq-4": {
"id": "#faq-4",
"control": "faq-4",
-   "title": "Which platforms is Tor Browser available for?",
+   "title": "Na akých platformách je Tor Browser dostupný?",
"description": "Tor Browser is currently available on 
Windows, Linux and macOS (OS X). For Android, The Guardian Project maintains 
the Tor-powered apps Orbot and Orfox. There is no official version of Tor for 
iOS yet, though we recommend Onion Browser."
 },
 "faq-5": {
"id": "#faq-5",
"control": "faq-5",
-   "title": "Can I use a VPN with Tor?",
+   "title": "Môžem používať VPN s Tor?",
"description": "Generally speaking, we don't 
recommend using a VPN with Tor unless you're an advanced user who knows how to 
configure both in a way that doesn't compromise your privacy. Learn more about 
combining Tor + VPN."
 }
 }

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

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

[translation]

commit 2ca2b282f51ccd1d6a7acd277bbbca591a13a735
Author: Translation commit bot 
Date:   Fri Apr 20 18:49:54 2018 +

Update translations for support-censorship
---
 sk_SK.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sk_SK.json b/sk_SK.json
index 9abeb2f10..121cc9918 100644
--- a/sk_SK.json
+++ b/sk_SK.json
@@ -14,7 +14,7 @@
 "censorship-3": {
"id": "#censorship-3",
"control": "censorship-3",
-   "title": "How do I download Tor if the torproject.org is blocked?",
+   "title": "Ako stiahnuť Tor ak je stránka torproject.org blokovaná?",
"description": "If you can't download Tor through our 
​https://www.torproject.org\;>website, you can get 
a copy of Tor delivered to you via GetTor. GetTor is a service that 
automatically responds to messages with links to the latest version of Tor 
Browser, hosted at a variety of locations that are less likely to be censored, 
such as Dropbox, Google Drive, and Github."
 },
 "censorship-4": {

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

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

[translation]

commit d5b19cb190c027693d5a7ab5548058e7078303e9
Author: Translation commit bot 
Date:   Fri Apr 20 18:46:32 2018 +

Update translations for tor-launcher-network-settings
---
 sk_SK/network-settings.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sk_SK/network-settings.dtd b/sk_SK/network-settings.dtd
index ba160db83..c704f6ff7 100644
--- a/sk_SK/network-settings.dtd
+++ b/sk_SK/network-settings.dtd
@@ -1,7 +1,7 @@
 
-
+
 
-
+
 
 
 
@@ -38,7 +38,7 @@
 
 
 
-
+
 
 
 

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

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

[translation]

commit 4638ef8b2767cb5c8a2787563b40c6ebe1b09a22
Author: Translation commit bot 
Date:   Fri Apr 20 18:45:31 2018 +

Update translations for https_everywhere
---
 sk_SK/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sk_SK/https-everywhere.dtd b/sk_SK/https-everywhere.dtd
index 8fd63f337..deda4f144 100644
--- a/sk_SK/https-everywhere.dtd
+++ b/sk_SK/https-everywhere.dtd
@@ -19,7 +19,7 @@
 
 
 
-
+
 
 
 

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

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

[translation]

commit 8f3e8369a0f942709fffd94a128ef4c168869a2b
Author: Translation commit bot 
Date:   Fri Apr 20 18:45:19 2018 +

Update translations for whisperback
---
 sk_SK/sk_SK.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po
index ef74fdd10..05717c914 100644
--- a/sk_SK/sk_SK.po
+++ b/sk_SK/sk_SK.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # once, 2014
+# Vlado Jendroľ, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2017-09-19 17:08+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-04-20 18:24+\n"
+"Last-Translator: Vlado Jendroľ\n"
 "Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,11 +51,11 @@ msgstr ""
 
 #: ../whisperBack/gui.py:114
 msgid "Actual result and description of the error"
-msgstr ""
+msgstr "Skutočný výsledok a popis chyby"
 
 #: ../whisperBack/gui.py:116
 msgid "Desired result"
-msgstr ""
+msgstr "Požadovaný výsledok"
 
 #: ../whisperBack/gui.py:152
 msgid "Unable to load a valid configuration."

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

[tor-commits] [tor/master] Fix documentation bug 25857: the universe is ::/0, not ::/128

[nickm]

commit cb813a352c1ee76c101fe2143b6fff75842b9e42
Author: Nick Mathewson 
Date:   Fri Apr 20 14:35:33 2018 -0400

Fix documentation bug 25857: the universe is ::/0, not ::/128

Patch from CTassisF.
---
 changes/25857 | 3 +++
 doc/tor.1.txt | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/25857 b/changes/25857
new file mode 100644
index 0..e457af2f8
--- /dev/null
+++ b/changes/25857
@@ -0,0 +1,3 @@
+  o Documentation:
+- Correct an IPv6 error in the documentation for ExitPolicy.
+  Closes ticket 25857.  Patch from "CTassisF".
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 369cdb526..dd9f9cefa 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1835,8 +1835,8 @@ is non-zero):
 "**accept[6]**|**reject[6]**  __ADDR__[/__MASK__][:__PORT__]". If 
/__MASK__ is
 omitted then this policy just applies to the host given. Instead of giving
 a host or network you can also use "\*" to denote the universe (0.0.0.0/0
-and ::/128), or \*4 to denote all IPv4 addresses, and \*6 to denote all
-IPv6 addresses.
+and ::/0), or \*4 to denote all IPv4 addresses, and \*6 to denote all IPv6
+addresses.
 __PORT__ can be a single port number, an interval of ports
 "__FROM_PORT__-__TO_PORT__", or "\*". If __PORT__ is omitted, that means
 "\*". +



___
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.3.3'

[nickm]

commit d8ac7d557c0af199d21639a52a8c8c9dd201f555
Merge: 3bf9974b6 cb813a352
Author: Nick Mathewson 
Date:   Fri Apr 20 14:40:09 2018 -0400

Merge branch 'maint-0.3.3'

 changes/25857 | 3 +++
 doc/tor.1.txt | 4 ++--
 2 files changed, 5 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.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm]

commit 84ff776893d248d2fdf5e1f21f765ff58a93403f
Merge: d8a9c9f2c cb813a352
Author: Nick Mathewson 
Date:   Fri Apr 20 14:39:48 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/25857 | 3 +++
 doc/tor.1.txt | 4 ++--
 2 files changed, 5 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.3.3] Fix documentation bug 25857: the universe is ::/0, not ::/128

[nickm]

commit cb813a352c1ee76c101fe2143b6fff75842b9e42
Author: Nick Mathewson 
Date:   Fri Apr 20 14:35:33 2018 -0400

Fix documentation bug 25857: the universe is ::/0, not ::/128

Patch from CTassisF.
---
 changes/25857 | 3 +++
 doc/tor.1.txt | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/25857 b/changes/25857
new file mode 100644
index 0..e457af2f8
--- /dev/null
+++ b/changes/25857
@@ -0,0 +1,3 @@
+  o Documentation:
+- Correct an IPv6 error in the documentation for ExitPolicy.
+  Closes ticket 25857.  Patch from "CTassisF".
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 369cdb526..dd9f9cefa 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1835,8 +1835,8 @@ is non-zero):
 "**accept[6]**|**reject[6]**  __ADDR__[/__MASK__][:__PORT__]". If 
/__MASK__ is
 omitted then this policy just applies to the host given. Instead of giving
 a host or network you can also use "\*" to denote the universe (0.0.0.0/0
-and ::/128), or \*4 to denote all IPv4 addresses, and \*6 to denote all
-IPv6 addresses.
+and ::/0), or \*4 to denote all IPv4 addresses, and \*6 to denote all IPv6
+addresses.
 __PORT__ can be a single port number, an interval of ports
 "__FROM_PORT__-__TO_PORT__", or "\*". If __PORT__ is omitted, that means
 "\*". +

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

[tor-commits] [tor/release-0.3.3] Fix documentation bug 25857: the universe is ::/0, not ::/128

[nickm]

commit cb813a352c1ee76c101fe2143b6fff75842b9e42
Author: Nick Mathewson 
Date:   Fri Apr 20 14:35:33 2018 -0400

Fix documentation bug 25857: the universe is ::/0, not ::/128

Patch from CTassisF.
---
 changes/25857 | 3 +++
 doc/tor.1.txt | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/25857 b/changes/25857
new file mode 100644
index 0..e457af2f8
--- /dev/null
+++ b/changes/25857
@@ -0,0 +1,3 @@
+  o Documentation:
+- Correct an IPv6 error in the documentation for ExitPolicy.
+  Closes ticket 25857.  Patch from "CTassisF".
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 369cdb526..dd9f9cefa 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1835,8 +1835,8 @@ is non-zero):
 "**accept[6]**|**reject[6]**  __ADDR__[/__MASK__][:__PORT__]". If 
/__MASK__ is
 omitted then this policy just applies to the host given. Instead of giving
 a host or network you can also use "\*" to denote the universe (0.0.0.0/0
-and ::/128), or \*4 to denote all IPv4 addresses, and \*6 to denote all
-IPv6 addresses.
+and ::/0), or \*4 to denote all IPv4 addresses, and \*6 to denote all IPv6
+addresses.
 __PORT__ can be a single port number, an interval of ports
 "__FROM_PORT__-__TO_PORT__", or "\*". If __PORT__ is omitted, that means
 "\*". +



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

[tor-commits] [depictor/master] Add a few final known_params and fix unknown param processing

[tom]

commit 00b64da29c56dc22f630bc67abef8818761e808b
Author: Tom Ritter 
Date:   Fri Apr 20 13:37:25 2018 -0500

Add a few final known_params and fix unknown param processing
---
 data/consensus.cfg | 5 -
 website.py | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/data/consensus.cfg b/data/consensus.cfg
index 42d7cf2..ca11041 100644
--- a/data/consensus.cfg
+++ b/data/consensus.cfg
@@ -40,4 +40,7 @@ known_params NumEntryGuards
 known_params Support022HiddenServices
 known_params hsdir_spread_store
 known_params DoSCircuitCreationEnabled
-known_params DoSConnectionEnabled
\ No newline at end of file
+known_params DoSConnectionEnabled
+known_params DoSConnectionMaxConcurrentCount
+known_params hs_service_max_rdv_failures
+known_params DoSRefuseSingleHopClientRendezvous
\ No newline at end of file
diff --git a/website.py b/website.py
index ee34bcf..6fce488 100755
--- a/website.py
+++ b/website.py
@@ -591,7 +591,6 @@ class WebsiteWriter:
   p not in 
self.consensus.params or \
   
self.consensus.params[p] != vote.params[p]:

conflictOrInvalid.append(p)
-   break

if conflictOrInvalid:
self.site.write("  \n"

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

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

[translation]

commit 2972c1f41906e9135cffcf73d0e09414d96b9ba9
Author: Translation commit bot 
Date:   Fri Apr 20 17:15:40 2018 +

Update translations for https_everywhere_completed
---
 ja/https-everywhere.dtd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ja/https-everywhere.dtd b/ja/https-everywhere.dtd
index 7d1342c5b..7d10309e8 100644
--- a/ja/https-everywhere.dtd
+++ b/ja/https-everywhere.dtd
@@ -17,6 +17,7 @@
 
 
 
+
 
 
 

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

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

[translation]

commit 254342c9ab9aa10362ebf357a0ad97d45763d3fb
Author: Translation commit bot 
Date:   Fri Apr 20 17:15:30 2018 +

Update translations for https_everywhere
---
 ja/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ja/https-everywhere.dtd b/ja/https-everywhere.dtd
index e7bf72a1b..7d10309e8 100644
--- a/ja/https-everywhere.dtd
+++ b/ja/https-everywhere.dtd
@@ -17,7 +17,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [stem/master] Clarify what get_server_descriptors provides

[atagar]

commit 27b2cbd7204720520667e9683dc45f2605e5de40
Author: Damian Johnson 
Date:   Fri Apr 20 09:49:05 2018 -0700

Clarify what get_server_descriptors provides

The 'all descriptors in the present consensus' description in our docs was
incorrect. This provides all descriptors known by the relay we're 
downloading
from, but that doesn't necessarily match what's in the consensus...

  https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt#n3840

Pointed out by cypherpunks on...

  https://trac.torproject.org/projects/tor/ticket/25866
---
 stem/descriptor/remote.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py
index 8e5b759d..89019c2d 100644
--- a/stem/descriptor/remote.py
+++ b/stem/descriptor/remote.py
@@ -644,8 +644,8 @@ class DescriptorDownloader(object):
   def get_server_descriptors(self, fingerprints = None, **query_args):
 """
 Provides the server descriptors with the given fingerprints. If no
-fingerprints are provided then this returns all descriptors in the present
-consensus.
+fingerprints are provided then this returns all descriptors known
+by the relay.
 
 :param str,list fingerprints: fingerprint or list of fingerprints to be
   retrieved, gets all descriptors if **None**

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

[tor-commits] [depictor/master] Add known_params DoSConnectionEnabled

[tom]

commit f0269fde55ddcca112e26a6215cc2abe1adf4d08
Author: Tom Ritter 
Date:   Fri Apr 20 11:10:50 2018 -0500

Add known_params DoSConnectionEnabled
---
 data/consensus.cfg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/consensus.cfg b/data/consensus.cfg
index 68be4c3..42d7cf2 100644
--- a/data/consensus.cfg
+++ b/data/consensus.cfg
@@ -39,4 +39,5 @@ known_params NumDirectoryGuards
 known_params NumEntryGuards
 known_params Support022HiddenServices
 known_params hsdir_spread_store
-known_params DoSCircuitCreationEnabled
\ No newline at end of file
+known_params DoSCircuitCreationEnabled
+known_params DoSConnectionEnabled
\ No newline at end of file

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

[tor-commits] [depictor/master] HTML whitespace tweaks

[tom]

commit 3375895ec3a953ebad0d8e763a39081ccb710588
Author: Tom Ritter 
Date:   Fri Apr 20 11:09:00 2018 -0500

HTML whitespace tweaks
---
 website.py | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/website.py b/website.py
index d3fa842..ee34bcf 100755
--- a/website.py
+++ b/website.py
@@ -654,10 +654,10 @@ class WebsiteWriter:
+ "\n"
+ "  \n"
+ "  \n"
-   + "Name"
-   + "Expiry"
-   + "Identity Key Len."
-   + "Signing Key Len."
+   + "Name\n"
+   + "Expiry\n"
+   + "Identity Key Len.\n"
+   + "Signing Key Len.\n"
+ "  \n")
 
if not self.votes:
@@ -711,8 +711,8 @@ class WebsiteWriter:
+ "\n"
+ "  \n"
+ "  \n"
-   + "Name"
-   + "Approximate Clock Skew"
+   + "Name\n"
+   + "Approximate Clock Skew\n"
+ "  \n")
 
if not self.clockskew:



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

[tor-commits] [torsocks/master] connect: Always pass .onion IP cookie to connection object

[dgoulet]

commit 2fa559117c36e2e8e3996048a03c0bbc5c6984e8
Author: David Goulet 
Date:   Fri Apr 20 11:24:05 2018 -0400

connect: Always pass .onion IP cookie to connection object

Fixes #23876

Signed-off-by: David Goulet 
---
 src/lib/connect.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib/connect.c b/src/lib/connect.c
index 7f5657c..854e994 100644
--- a/src/lib/connect.c
+++ b/src/lib/connect.c
@@ -156,10 +156,11 @@ LIBC_CONNECT_RET_TYPE tsocks_connect(LIBC_CONNECT_SIG)
onion_pool_unlock(_onion_pool);
if (on_entry) {
/*
-* Create a connection without a destination address since we 
will set
+* Create a connection with the onion IP cookie since 
getpeername()
+* might need it, and set connection domain and hostname to use
 * the onion address name found before.
 */
-   new_conn = connection_create(sockfd, NULL);
+   new_conn = connection_create(sockfd, addr);
if (!new_conn) {
errno = ENOMEM;
goto error;



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

[tor-commits] [torsocks/master] gethostbyaddr_r: Populate h_addrtype field

[dgoulet]

commit a44660bd6d32de6c58a51eaad7c019f8e9131cf3
Author: David Goulet 
Date:   Fri Apr 20 11:58:12 2018 -0400

gethostbyaddr_r: Populate h_addrtype field

Fixes #25586

Signed-off-by: David Goulet 
---
 src/lib/gethostbyname.c |  1 +
 tests/test_dns.c| 51 +++--
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/lib/gethostbyname.c b/src/lib/gethostbyname.c
index e43ed4a..296099e 100644
--- a/src/lib/gethostbyname.c
+++ b/src/lib/gethostbyname.c
@@ -301,6 +301,7 @@ LIBC_GETHOSTBYADDR_R_RET_TYPE 
tsocks_gethostbyaddr_r(LIBC_GETHOSTBYADDR_R_SIG)
 
he->h_aliases = NULL;
he->h_length = strlen(he->h_name);
+   he->h_addrtype = type;
/* Assign the address list within the data of the given buffer. */
data->addr_list[0] = (char *) addr;
data->addr_list[1] = NULL;
diff --git a/tests/test_dns.c b/tests/test_dns.c
index 2d87744..06fad12 100644
--- a/tests/test_dns.c
+++ b/tests/test_dns.c
@@ -26,7 +26,7 @@
 #include 
 #include "helpers.h"
 
-#define NUM_TESTS 4
+#define NUM_TESTS 5
 
 struct test_host {
const char *name;
@@ -76,26 +76,56 @@ static void test_gethostbyname(const struct test_host *host)
return;
 }
 
+static void test_gethostbyaddr_r(const struct test_host *host)
+{
+  int result;
+  in_addr_t addr;
+  struct hostent ret;
+  char buf[1024];
+  int buflen = sizeof buf;
+  struct hostent *result_entp;
+  int h_errno;
+
+  assert(host);
+  diag("gethostbyaddr_r test");
+
+  addr = inet_addr(host->ip);
+   result = gethostbyaddr_r((const void *),
+   INET_ADDRSTRLEN, AF_INET, , buf, buflen, 
_entp, _errno);
+
+  if (result) {
+fail("Resolving address %s: %d", host->ip, result);
+  }
+
+  if (strcmp(host->name, result_entp->h_name) != 0) {
+fail("Wrong resolved name: %s", result_entp->h_name);
+  }
+
+  if (result_entp->h_addrtype != AF_INET) {
+fail("Wrong resolved address family: %d", result_entp->h_addrtype);
+  }
+
+  ok(1, "Resolved address");
+}
+
 static void test_gethostbyaddr(const struct test_host *host)
 {
struct hostent *he;
-in_addr_t addr;
+  in_addr_t addr;
 
assert(host);
 
diag("gethostbyaddr test");
 
-addr = inet_addr(host->ip);
-
-he = gethostbyaddr((const void *), INET_ADDRSTRLEN, AF_INET);
-if (he) {
-   ok(strcmp(host->name, he->h_name) == 0,
-   "Resolving address %s", host->ip);
-} else {
+   addr = inet_addr(host->ip);
+   he = gethostbyaddr((const void *), INET_ADDRSTRLEN, AF_INET);
+   if (he) {
+   ok(strcmp(host->name, he->h_name) == 0, "Resolving address %s", 
host->ip);
+   } else {
fail("Resolving address %s", host->ip);
}
 
-return;
+   return;
 }
 
 static void test_getaddrinfo(const struct test_host *host)
@@ -148,6 +178,7 @@ int main(int argc, char **argv)
test_getaddrinfo(_check);
test_gethostbyname(_dir_auth1);
test_gethostbyaddr(_dir_auth2);
+   test_gethostbyaddr_r(_dir_auth2);
test_getaddrinfo(_localhost);
 
 end:



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

[tor-commits] [torsocks/master] gethostbyaddr_r: Don't put garbage in data->hostname

[dgoulet]

commit 8013dfb1ebf6cb1d0a8751dcd3531e6b2e5aef39
Author: David Goulet 
Date:   Fri Apr 20 12:04:35 2018 -0400

gethostbyaddr_r: Don't put garbage in data->hostname

Fixes #25627

Signed-off-by: David Goulet 
---
 src/lib/gethostbyname.c |  5 -
 tests/test_dns.c| 24 +++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/lib/gethostbyname.c b/src/lib/gethostbyname.c
index 296099e..df84e14 100644
--- a/src/lib/gethostbyname.c
+++ b/src/lib/gethostbyname.c
@@ -263,9 +263,12 @@ LIBC_GETHOSTBYADDR_R_RET_TYPE 
tsocks_gethostbyaddr_r(LIBC_GETHOSTBYADDR_R_SIG)
/* This call allocates hostname. On error, it's untouched. */
ret = tsocks_tor_resolve_ptr(addr, >hostname, type);
if (ret < 0) {
+   /* We can represent any IPv4 address in dotted quad notation in 
fewer than
+* 32 bytes (max should be 16 if we count a nul terminator). */
+   char addrbuf[32];
const char *ret_str;
 
-   ret_str = inet_ntop(type, addr, buf, buflen);
+   ret_str = inet_ntop(type, addr, [0], sizeof(addrbuf));
if (!ret_str) {
ret = HOST_NOT_FOUND;
if (errno == ENOSPC) {
diff --git a/tests/test_dns.c b/tests/test_dns.c
index 06fad12..7e07663 100644
--- a/tests/test_dns.c
+++ b/tests/test_dns.c
@@ -26,7 +26,7 @@
 #include 
 #include "helpers.h"
 
-#define NUM_TESTS 5
+#define NUM_TESTS 6
 
 struct test_host {
const char *name;
@@ -76,6 +76,27 @@ static void test_gethostbyname(const struct test_host *host)
return;
 }
 
+static void test_gethostbyaddr_r_failed(void)
+{
+   int result;
+   in_addr_t addr;
+   struct hostent ret;
+   char buf[1024];
+   int buflen = sizeof buf;
+   struct hostent *result_entp;
+   int h_errno;
+
+   diag("gethostbyaddr_r test");
+
+   /* RFC 6890 - An address from TEST-NET-1.  Selected in hopes that it 
will
++   * _not_ reverse resolve to anything.
++   */
+   addr = inet_addr("192.0.2.1");
+   result = gethostbyaddr_r((const void *),
+   INET_ADDRSTRLEN, AF_INET, , buf, buflen, 
_entp, _errno);
+   ok(0 != result, "Impossible reverse resolve failed as desired.");
+}
+
 static void test_gethostbyaddr_r(const struct test_host *host)
 {
   int result;
@@ -179,6 +200,7 @@ int main(int argc, char **argv)
test_gethostbyname(_dir_auth1);
test_gethostbyaddr(_dir_auth2);
test_gethostbyaddr_r(_dir_auth2);
+   test_gethostbyaddr_r_failed();
test_getaddrinfo(_localhost);
 
 end:

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

[tor-commits] [torsocks/master] log: Avoid crash or file corruption when closing logs

[dgoulet]

commit e56313a0d59b9a396c260ed1ffcf4bc75d6e986a
Author: David Goulet 
Date:   Fri Apr 20 11:49:58 2018 -0400

log: Avoid crash or file corruption when closing logs

Fixes #24081

Signed-off-by: David Goulet 
---
 src/common/log.c | 38 +-
 src/common/log.h |  1 +
 src/lib/close.c  |  6 ++
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/common/log.c b/src/common/log.c
index 8bf8836..60a56f7 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -145,20 +145,22 @@ int log_init(int level, const char *filepath, enum 
log_time_status t_status)
}
 
if (filepath) {
-   logconfig.fp = fopen(filepath, "a");
-   if (!logconfig.fp) {
-   fprintf(stderr, "[tsocks] Unable to open log file 
%s\n", filepath);
+   logconfig.filepath = strdup(filepath);
+   if (!logconfig.filepath) {
+   perror("[tsocks] log init strdup");
ret = -errno;
goto error;
}
 
-   logconfig.filepath = strdup(filepath);
-   if (!logconfig.filepath) {
-   perror("[tsocks] log init strdup");
+   logconfig.fp = fopen(filepath, "a");
+   if (!logconfig.fp) {
+   fprintf(stderr, "[tsocks] Unable to open log file 
%s\n", filepath);
+   free(logconfig.filepath);
+   logconfig.filepath = NULL;
ret = -errno;
-   fclose(logconfig.fp);
goto error;
}
+   setbuf(logconfig.fp, NULL);
} else {
/* The default output is stderr if no filepath is given. */
ret = fileno(stderr);
@@ -182,12 +184,22 @@ ATTR_HIDDEN
 void log_destroy(void)
 {
free(logconfig.filepath);
-   if (logconfig.fp) {
-   int ret;
+   logconfig.filepath = NULL;
 
-   ret = fclose(logconfig.fp);
-   if (ret) {
-   perror("[tsocks] fclose log destroy");
-   }
+   /* Don't call fclose() because torsocks fclose() generates log messages 
and
+* so calling it here could cause a loop. Just zero out the fp so it 
won't
+* be used again. */
+   logconfig.fp = NULL;
+}
+
+/*
+ * Clean up if the fd for the log file gets closed.
+ */
+ATTR_HIDDEN
+void log_fd_close_notify(int fd)
+{
+   if (fd >= 0 && logconfig.fp && (fd == fileno(logconfig.fp))) {
+   log_print("[tsocks] Log file descriptor closed. Stopping 
logging.\n");
+   log_destroy();
}
 }
diff --git a/src/common/log.h b/src/common/log.h
index e3770df..49d7a77 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -51,6 +51,7 @@ extern int tsocks_loglevel;
 void log_print(const char *fmt, ...);
 int log_init(int level, const char *filepath, enum log_time_status t_status);
 void log_destroy(void);
+void log_fd_close_notify(int fd);
 
 #define __tsocks_print(level, fmt, args...) \
do { \
diff --git a/src/lib/close.c b/src/lib/close.c
index 4381514..0bf9ea7 100644
--- a/src/lib/close.c
+++ b/src/lib/close.c
@@ -52,6 +52,12 @@ LIBC_CLOSE_RET_TYPE tsocks_close(LIBC_CLOSE_SIG)
connection_put_ref(conn);
}
 
+   /*
+* Let the log system detect when the log file fd is about to be
+* closed and clean up.
+*/
+   log_fd_close_notify(fd);
+
/* Return the original libc close. */
return tsocks_libc_close(fd);
 }



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

[tor-commits] [depictor/master] Add known_params DoSCircuitCreationEnabled

[tom]

commit b9b5b95f5af577d859543dac8ec3dc206c940125
Author: Tom Ritter 
Date:   Fri Apr 20 10:32:03 2018 -0500

Add known_params DoSCircuitCreationEnabled
---
 data/consensus.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/consensus.cfg b/data/consensus.cfg
index e4af54a..68be4c3 100644
--- a/data/consensus.cfg
+++ b/data/consensus.cfg
@@ -39,3 +39,4 @@ known_params NumDirectoryGuards
 known_params NumEntryGuards
 known_params Support022HiddenServices
 known_params hsdir_spread_store
+known_params DoSCircuitCreationEnabled
\ No newline at end of file

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

[tor-commits] [depictor/master] Fix leading spaces, turn them into tabs

[tom]

commit 515885814845d42c87199dba4b0e85fda988cff6
Author: Tom Ritter 
Date:   Fri Apr 20 09:39:59 2018 -0500

Fix leading spaces, turn them into tabs
---
 website.py | 44 ++--
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/website.py b/website.py
index 4cfc7cf..02fbdce 100755
--- a/website.py
+++ b/website.py
@@ -1329,12 +1329,12 @@ class WebsiteWriter:
+ "}\n"
+ "let fps = $('#fingerprintBox').val().split(',');\n"
+ "let retrieveData = function(fullFP) {\n"
-+ "  if (loadedRelays.indexOf(fullFP) >= 0) {\n"
-+ "return;\n"
-+ "  }\n"
-+ "  loadedRelays.push(fullFP);\n"
-+ "  let rangeString = 'bytes=' + relayIndexes[fullFP].indexes[0] 
+ '-' + relayIndexes[fullFP].indexes[1];\n"
-+ "  console.log(\"Querying for \" + rangeString);\n"
+   + "  if (loadedRelays.indexOf(fullFP) >= 0) {\n"
+   + "return;\n"
+   + "  }\n"
+   + "  loadedRelays.push(fullFP);\n"
+   + "  let rangeString = 'bytes=' + 
relayIndexes[fullFP].indexes[0] + '-' + relayIndexes[fullFP].indexes[1];\n"
+   + "  console.log(\"Querying for \" + rangeString);\n"
+ "  $.ajax({\n"
+ "url: 'consensus-health.html',\n"
+ "headers: { 'Range' : rangeString },\n"
@@ -1348,23 +1348,23 @@ class WebsiteWriter:
+ "  let partialFP = fps[i].trim().toUpperCase();\n"
+ "  let retrievedData = false;\n"
+ "  if (partialFP in relayIndexes) {\n"
-+ "retrieveData(partialFP);\n"
-+ "retrievedData = true;\n"
-+ "  } else {\n"
-+ "partialloop: for (r in relayIndexes) {\n"
-+ "  if (relayIndexes[r].nickname.toUpperCase() == partialFP) 
{\n"
-+ "retrieveData(r);\n"
-+ "retrievedData = true;\n"
-+ "  }\n"
-+ "  if (r.startsWith(partialFP)) {\n"
-+ "retrieveData(r);\n"
+   + "retrieveData(partialFP);\n"
+   + "retrievedData = true;\n"
+   + "  } else {\n"
+   + "partialloop: for (r in relayIndexes) {\n"
+   + "  if (relayIndexes[r].nickname.toUpperCase() == 
partialFP) {\n"
+   + "retrieveData(r);\n"
+ "retrievedData = true;\n"
-+ "  }\n"
-+ "}\n"
-+ "if (!retrievedData) {\n"
-+ "  alert(\"Could not match \" + partialFP + \" to a full or 
partial fingerprint or a nickname.\");\n"
-+ "}\n"
-+ "  }\n"
+   + "  }\n"
+   + "  if (r.startsWith(partialFP)) {\n"
+   + "retrieveData(r);\n"
+   + "retrievedData = true;\n"
+   + "  }\n"
+   + "}\n"
+   + "if (!retrievedData) {\n"
+   + "  alert(\"Could not match \" + partialFP + \" to a 
full or partial fingerprint or a nickname.\");\n"
+   + "}\n"
+   + "  }\n"
+ "}\n"
+ "  };\n"
+ " $('#relay-addition-javascript-pointer').html('But you can 
add individual "



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

[tor-commits] [depictor/master] Add Clock Skew. Closes #25767

[tom]

commit a91384c90639c71dad3486813f85b9bbf79bf2c4
Author: Tom Ritter 
Date:   Fri Apr 20 10:30:59 2018 -0500

Add Clock Skew. Closes #25767
---
 data/consensus.cfg |  3 +++
 utility.py | 28 +++
 website.py | 56 +-
 write_website.py   |  5 -
 4 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/data/consensus.cfg b/data/consensus.cfg
index 02f39b1..e4af54a 100644
--- a/data/consensus.cfg
+++ b/data/consensus.cfg
@@ -9,6 +9,9 @@ graph_logical_min 125
 # do not show values values greater than this on the graph. You can leave this 
high
 graph_logical_max 25000
 
+# we highlight clockskew that is 20 seconds or greater
+clockskew_threshold 20
+
 # recognized tor consensus parameters
 
 known_params bwweightscale
diff --git a/utility.py b/utility.py
old mode 100644
new mode 100755
index 6b2cfae..d4f9a68
--- a/utility.py
+++ b/utility.py
@@ -1,4 +1,7 @@
+#!/usr/bin/env python
+
 import time
+import urllib
 import datetime
 
 import stem.descriptor
@@ -81,6 +84,26 @@ def _get_documents(label, resource):
 
return documents, issues, runtimes
 
+def get_clockskew():
+   clockskew = {}
+   for (nickname, authority) in get_dirauths().items():
+   authority_address = "http://; + str(authority.address) + ":" + 
str(authority.dir_port)
+   try:
+   startTimeStamp = datetime.datetime.utcnow()
+   startTime = time.time()
+   f = urllib.urlopen(authority_address)
+   for h in f.info().headers:
+   if h.upper().startswith('DATE:'):
+   clockskew[nickname] = 
datetime.datetime.strptime(h[6:].strip(), '%a, %d %b %Y %H:%M:%S %Z')
+   processing = time.time() - startTime
+   if processing > 5:
+   clockskew[nickname] -= 
datetime.timedelta(seconds=(processing / 2))
+   clockskew[nickname] -= startTimeStamp
+   clockskew[nickname] = 
clockskew[nickname].total_seconds()
+   except:
+   continue
+   return clockskew
+
 def unix_time(dt):
 return (dt - datetime.datetime.utcfromtimestamp(0)).total_seconds() * 
1000.0
 
@@ -98,3 +121,8 @@ class FileMock():
pass
def write(self, str):
pass
+
+if __name__ == "__main__":
+   skew = get_clockskew()
+   for c in skew:
+   print c, skew[c]
\ No newline at end of file
diff --git a/website.py b/website.py
index 02fbdce..d3fa842 100755
--- a/website.py
+++ b/website.py
@@ -24,6 +24,7 @@ class WebsiteWriter:
consensus = None
votes = None
fallback_dirs = None
+   clockskew = None
known_authorities = []
bandwidth_authorities = []
consensus_expiry = datetime.timedelta(hours=3)
@@ -51,6 +52,7 @@ class WebsiteWriter:
self._write_recommended_versions()
self._write_consensus_parameters()
self._write_authority_keys()
+   self._write_authority_clocks()
self._write_shared_random()
self._write_protocols()
self._write_bandwidth_weights()
@@ -82,6 +84,8 @@ class WebsiteWriter:
self.known_params = config['known_params']
def set_fallback_dirs(self, fallback_dirs):
self.fallback_dirs = fallback_dirs
+   def set_clockskew(self, clockskew):
+   self.clockskew = clockskew
def get_consensus_time(self):
return self.consensus.valid_after
def all_votes_present(self):
@@ -691,6 +695,55 @@ class WebsiteWriter:
+ "\n")
 

#-
+   def _write_authority_clocks(self):
+   """
+   Write authority clock skew
+   """
+   self.site.write("\n\n\n"
+   + " "
+   + "\n"
+   + ""
+   + "Authority Clock Skew\n"
+   + "\n"
+   + "\n"
+   + "  \n"
+   + "\n"
+   + "\n"
+   + "  \n"
+   + "  \n"
+   + "Name"
+   + "Approximate Clock Skew"
+   + "  \n")
+
+   if not self.clockskew:
+   self.site.write("  (No clock skew 
data.)\n")
+   else:
+   for dirauth_nickname in self.known_authorities:
+   if dirauth_nickname in self.clockskew:
+   clock = self.clockskew[dirauth_nickname]
+
+   if clock > 
self.config['clockskew_threshold']:
+   

[tor-commits] [depictor/master] Allow Nickname to be case insensitive when searching

[tom]

commit 7795022d0ac9cd86c8ee5905c1393c0bdc6b41d5
Author: Tom Ritter 
Date:   Fri Apr 20 09:38:53 2018 -0500

Allow Nickname to be case insensitive when searching
---
 website.py | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/website.py b/website.py
index 9e12145..4cfc7cf 100755
--- a/website.py
+++ b/website.py
@@ -1345,18 +1345,18 @@ class WebsiteWriter:
+ "  });\n"
+ "}\n"
+ "relayloop: for (i in fps) {\n"
-   + "  let partialFP = fps[i].trim();\n"
+   + "  let partialFP = fps[i].trim().toUpperCase();\n"
+ "  let retrievedData = false;\n"
-   + "  if (partialFP.toUpperCase() in relayIndexes) {\n"
+   + "  if (partialFP in relayIndexes) {\n"
 + "retrieveData(partialFP);\n"
 + "retrievedData = true;\n"
 + "  } else {\n"
 + "partialloop: for (r in relayIndexes) {\n"
-+ "  if (relayIndexes[r].nickname == partialFP) {\n"
++ "  if (relayIndexes[r].nickname.toUpperCase() == partialFP) 
{\n"
 + "retrieveData(r);\n"
 + "retrievedData = true;\n"
 + "  }\n"
-+ "  if (r.startsWith(partialFP.toUpperCase())) {\n"
++ "  if (r.startsWith(partialFP)) {\n"
 + "retrieveData(r);\n"
+ "retrievedData = true;\n"
 + "  }\n"
@@ -1478,7 +1478,7 @@ class WebsiteWriter:
import base64, binascii
start = self.site.tell()

#self.indexes.write(base64.b64encode(binascii.unhexlify(relay_fp)) + ":" + 
str(start))
-   self.indexes.write(relay_fp + ":" + relay_nickname + ":" + 
str(start))
+   self.indexes.write(relay_fp.upper() + ":" + relay_nickname + 
":" + str(start))
self.site.write("  \n")
if relay_fp in self.consensus.routers and \
"Named" in self.consensus.routers[relay_fp].flags and \



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

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

[translation]

commit 51078a0d3a00a16bab3d5b8723f814718919b4c9
Author: Translation commit bot 
Date:   Fri Apr 20 15:20:24 2018 +

Update translations for support-tbb
---
 it.json | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/it.json b/it.json
index 249615c58..8758e7e08 100644
--- a/it.json
+++ b/it.json
@@ -111,7 +111,7 @@
"id": "#tbb-18",
"control": "tbb-18",
"title": "Esiste un supporto per *BSD?",
-   "description": "Sorry, but there is currently no 
official support for running Tor Browser on *BSD. There is something called the 
TorBSD project, but their Tor Browser is not officially supported."
+   "description": "Siamo spiacenti, ma, ad ora, non 
esiste un supporto ufficiale per eseguire Tor Browser su *BSD. Esiste il TorBSD 
project, ma non è ufficialmente supportato."
 },  
 "tbb-19": {
"id": "#tbb-19",
@@ -146,25 +146,25 @@
 "tbb-24": {
"id": "#tbb-24",
"control": "tbb-24",
-   "title": "I'm having a problem with DuckDuckGo.",
+   "title": "Sto avendo un problema con DuckDuckGo.",
"description": "Please see the ​https://duck.co/help\;>DuckDuckGo support portal. If you 
believe this is a Tor Browser issue, please report it on our ​https://trac.torproject.org/\;>bug tracker."
 },
 "tbb-25": {
"id": "#tbb-25",
"control": "tbb-25",
-   "title": "I'm having a problem with NoScript.",
+   "title": "Sto avendo un problema con NoScript.",
"description": "Please see the ​https://noscript.net/faq\;>NoScript FAQ. If you believe this 
is a Tor Browser issue, please report it on our ​https://trac.torproject.org/\;>bug tracker."
 },
 "tbb-26": {
"id": "#tbb-26",
"control": "tbb-26",
-   "title": "I'm having a problem with HTTPS Everywhere.",
+   "title": "Sto avendo un problema con HTTPS Everywhere.",
"description": "Please see the ​https://www.eff.org/https-everywhere/faq\;>HTTPS Everywhere. 
If you believe this is a Tor Browser issue, please report it on our ​https://trac.torproject.org/\;>bug tracker."
 },
 "tbb-27": {
"id": "#tbb-27",
"control": "tbb-27",
-   "title": "How do I update Tor Browser?",
+   "title": "Come aggiorno Tor Browser?",
"description": "You can update Tor Browser as soon as 
a new version is released.Tor Browser will 
prompt you to update the software once a new version has been released.The Torbutton icon (the little green onion in the top left 
corner of the browser) will display a yellow triangle.You may see a written indication when Tor Browser opens telling 
you that an update is available.Card titleCard 
textTor browser will install the 
updates.Card titleCard 
text"
 },
 "tbb-28": {

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

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

[translation]

commit 0ac3d52ad338913e318ae3269d4e61ba05a364e8
Author: Translation commit bot 
Date:   Fri Apr 20 15:20:17 2018 +

Update translations for support-miscellaneous
---
 it.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/it.json b/it.json
index 65749dcb9..928f62d0c 100644
--- a/it.json
+++ b/it.json
@@ -21,7 +21,7 @@
"id": "#misc-4",
"control": "misc-4",
"title": "Posso usare Tor con bittorrent?",
-   "description": "We do not recommend using Tor with 
bittorrent. For further details, please see our https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\;>​blog 
post on the subject."
+   "description": "Non consigliamo di usare Tor con 
bittorrent. Per ulteriori dettagli, guarda il nostro https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\;>blog 
post in materia."
  },
  "misc-5": {
"id": "#misc-5",

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

[tor-commits] [torsocks/master] Make torsocks always connect to the configured Tor port

[dgoulet]

commit f7f4154dd687da2285c7f0eaa1bca034c410224c
Author: David Goulet 
Date:   Fri Apr 20 10:52:20 2018 -0400

Make torsocks always connect to the configured Tor port

Whatever we use IPv4 or IPv6, make torsocks use the configured SocksPort in
the configuration.

Signed-off-by: David Goulet 
---
 src/common/socks5.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/socks5.c b/src/common/socks5.c
index bf6019a..9f7853b 100644
--- a/src/common/socks5.c
+++ b/src/common/socks5.c
@@ -165,7 +165,7 @@ int socks5_connect(struct connection *conn)
 * the right socket family. Thus, trying to establish a connection to a
 * remote IPv6, we have to connect to the Tor daemon in v6.
 */
-   switch (conn->dest_addr.domain) {
+   switch (tsocks_config.socks5_addr.domain) {
case CONNECTION_DOMAIN_NAME:
/*
 * For a domain name such as an onion address, use the default 
IPv4 to



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

[tor-commits] [torsocks/master] socks5: Always use ATYP 0x03 for CONNECT command

[dgoulet]

commit a0070f02d77315b640dbc00105a246ef64d89011
Author: David Goulet 
Date:   Fri Apr 20 10:34:34 2018 -0400

socks5: Always use ATYP 0x03 for CONNECT command

Because of the SafeSocks parameter of Tor, if set, we can't pass a raw IP
address to Tor since it will believe we did a DNS resolution from the
application.

Now, thanks to #22461, Tor safely accepts an IPv4/IPv6 address withing a 
FQDN
connect request which avoids the SafeSocks warnings.

The #22461 wasn't backported which means that torsocks working with 
SafeSocks
is only possible in tor >= 0.3.2 stable series.

Fixes #23667

Signed-off-by: David Goulet 
---
 src/common/socks5.c  | 80 ++--
 tests/unit/test_socks5.c | 54 ++--
 2 files changed, 46 insertions(+), 88 deletions(-)

diff --git a/src/common/socks5.c b/src/common/socks5.c
index 1be2ab8..bf6019a 100644
--- a/src/common/socks5.c
+++ b/src/common/socks5.c
@@ -385,75 +385,60 @@ int socks5_send_connect_request(struct connection *conn)
unsigned char buffer[1500];
ssize_t buf_len, ret_send;
struct socks5_request msg;
+   struct socks5_request_domain req_name;
+   const char *retp;
 
assert(conn);
assert(conn->fd >= 0);
 
+   memset(_name, 0, sizeof(req_name));
memset(buffer, 0, sizeof(buffer));
buf_len = sizeof(msg);
 
+   /* Set up the header part. It is always the same, even the address type 
as
+* Tor handles IPv4/IPv6 as a Domain Name so SafeSocks doesn't 
complain. For
+* this reason, we always send ATYP 0x03 (domain name) to Tor. */
msg.ver = SOCKS5_VERSION;
msg.cmd = SOCKS5_CMD_CONNECT;
/* Always zeroed. */
msg.rsv = 0;
+   msg.atyp = SOCKS5_ATYP_DOMAIN;
+   memcpy(buffer, , buf_len);
 
+   /* Depending on the domain of the connection, we'll set the hostname
+* accordingly that is transforming the address into a text format. */
switch (conn->dest_addr.domain) {
case CONNECTION_DOMAIN_INET:
{
-   struct socks5_request_ipv4 req_ipv4;
-
-   msg.atyp = SOCKS5_ATYP_IPV4;
-   /* Copy the first part of the request. */
-   memcpy(buffer, , buf_len);
-
-   /* Prepare the ipv4 payload to be copied in the send buffer. */
-   memcpy(req_ipv4.addr, >dest_addr.u.sin.sin_addr,
-   sizeof(req_ipv4.addr));
-   req_ipv4.port = conn->dest_addr.u.sin.sin_port;
-
-   /* Copy ipv4 request portion in the buffer. */
-   memcpy(buffer + buf_len, _ipv4, sizeof(req_ipv4));
-   buf_len += sizeof(req_ipv4);
+   retp = inet_ntop(AF_INET, >dest_addr.u.sin.sin_addr,
+   (char *) req_name.name, sizeof(req_name.name));
+   if (retp == NULL) {
+   ERR("Socks5 connection malformed IPv4");
+   ret = -EINVAL;
+   goto error;
+   }
+   req_name.port = conn->dest_addr.u.sin.sin_port;
break;
}
case CONNECTION_DOMAIN_INET6:
{
-   struct socks5_request_ipv6 req_ipv6;
-
-   msg.atyp = SOCKS5_ATYP_IPV6;
-   /* Copy the first part of the request. */
-   memcpy(buffer, , buf_len);
-
-   /* Prepare the ipv6 payload to be copied in the send buffer. */
-   memcpy(req_ipv6.addr, >dest_addr.u.sin6.sin6_addr,
-   sizeof(req_ipv6.addr));
-   req_ipv6.port = conn->dest_addr.u.sin6.sin6_port;
-
-   /* Copy ipv6 request portion in the buffer. */
-   memcpy(buffer + buf_len, _ipv6, sizeof(req_ipv6));
-   buf_len += sizeof(req_ipv6);
+   retp = inet_ntop(AF_INET6, >dest_addr.u.sin6.sin6_addr,
+   (char *) req_name.name, sizeof(req_name.name));
+   if (retp == NULL) {
+   ERR("Socks5 connection malformed IPv4");
+   ret = -EINVAL;
+   goto error;
+   }
+   req_name.port = conn->dest_addr.u.sin6.sin6_port;
break;
}
case CONNECTION_DOMAIN_NAME:
{
-   struct socks5_request_domain req_name;
-
-   msg.atyp = SOCKS5_ATYP_DOMAIN;
-   /* Copy the first part of the request. */
-   memcpy(buffer, , buf_len);
-
/* Setup domain name request buffer. */
req_name.len = strlen(conn->dest_addr.hostname.addr);
-   memcpy(req_name.name, conn->dest_addr.hostname.addr, 
req_name.len);
+   memcpy(req_name.name, conn->dest_addr.hostname.addr,
+   

[tor-commits] [torsocks/master] test: Make getpeername test connect to moria1

[dgoulet]

commit c32050ae282bc69bff1c959c96253ee9bc0d4c61
Author: David Goulet 
Date:   Fri Apr 20 10:51:29 2018 -0400

test: Make getpeername test connect to moria1

The other IP doesn't work anymore and I can't recall what it was ;).

Signed-off-by: David Goulet 
---
 tests/test_getpeername.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_getpeername.c b/tests/test_getpeername.c
index c09e487..269d2a1 100644
--- a/tests/test_getpeername.c
+++ b/tests/test_getpeername.c
@@ -35,7 +35,7 @@ static void test_getpeername(void)
struct sockaddr_in addrv4;
struct sockaddr_storage ss;
socklen_t addrlen;
-   const char *ip = "93.95.227.222";
+   const char *ip = "128.31.0.39";
 
ret = pipe(pipe_fds);
if (ret < 0) {
@@ -60,7 +60,7 @@ static void test_getpeername(void)
 
/* Connect socket through Tor so we can test the wrapper. */
addrv4.sin_family = AF_INET;
-   addrv4.sin_port = htons(443);
+   addrv4.sin_port = htons(9131);
inet_pton(addrv4.sin_family, ip, _addr);
memset(addrv4.sin_zero, 0, sizeof(addrv4.sin_zero));
 



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

[tor-commits] [torsocks/master] Bug 23715: Support memfd_create(2).

[dgoulet]

commit dc1d6ae5639a84103a1b067775238f33b4590533
Author: Yawning Angel 
Date:   Sat Sep 30 07:09:13 2017 +

Bug 23715: Support memfd_create(2).

Enough things use this now, that the syscall(2) wrapper should support
it, since glibc doesn't provide a wrapper for it, and the documentation
says to invoke it using syscall(2).
---
 src/common/compat.h |  4 
 src/lib/syscall.c   | 17 +
 2 files changed, 21 insertions(+)

diff --git a/src/common/compat.h b/src/common/compat.h
index f490113..a9b73c2 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -126,6 +126,9 @@ void tsocks_once(tsocks_once_t *o, void 
(*init_routine)(void));
 #ifndef __NR_fork
 #define __NR_fork -18
 #endif
+#ifndef __NR_memfd_create
+#define __NR_memfd_create -19
+#endif
 
 #define TSOCKS_NR_SOCKET__NR_socket
 #define TSOCKS_NR_CONNECT   __NR_connect
@@ -145,6 +148,7 @@ void tsocks_once(tsocks_once_t *o, void 
(*init_routine)(void));
 #define TSOCKS_NR_GETTIMEOFDAY __NR_gettimeofday
 #define TSOCKS_NR_CLOCK_GETTIME __NR_clock_gettime
 #define TSOCKS_NR_FORK  __NR_fork
+#define TSOCKS_NR_MEMFD_CREATE __NR_memfd_create
 
 /*
  * Despite glibc providing wrappers for these calls for a long time
diff --git a/src/lib/syscall.c b/src/lib/syscall.c
index 41cba28..7fba580 100644
--- a/src/lib/syscall.c
+++ b/src/lib/syscall.c
@@ -423,6 +423,20 @@ static LIBC_SYSCALL_RET_TYPE handle_fork(void)
 {
return tsocks_libc_syscall(TSOCKS_NR_FORK);
 }
+
+/*
+ * Handle memfd_create(2) syscall.
+ */
+static LIBC_SYSCALL_RET_TYPE handle_memfd_create(va_list args)
+{
+   const char *name;
+   unsigned int flags;
+
+   name = va_arg(args, __typeof__(name));
+   flags = va_arg(args, __typeof__(flags));
+
+   return tsocks_libc_syscall(TSOCKS_NR_MEMFD_CREATE, name, flags);
+}
 #endif /* __linux__ */
 
 /*
@@ -541,6 +555,9 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int number, 
va_list args)
case TSOCKS_NR_FORK:
ret = handle_fork();
break;
+   case TSOCKS_NR_MEMFD_CREATE:
+   ret = handle_memfd_create(args);
+   break;
 #endif /* __linux__ */
default:
/*



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

[tor-commits] [torsocks/master] Merge remote-tracking branch 'yawning/bug23715'

[dgoulet]

commit 8258eac291341cf493f6ddaf5c4d8541fd57729b
Merge: f7f4154 dc1d6ae
Author: David Goulet 
Date:   Fri Apr 20 10:54:42 2018 -0400

Merge remote-tracking branch 'yawning/bug23715'

 src/common/compat.h |  4 
 src/lib/syscall.c   | 17 +
 2 files changed, 21 insertions(+)

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

[tor-commits] [torsocks/master] Merge remote-tracking branch 'upstream/master'

[dgoulet]

commit f75543371864ae9a4d041cf3b75efa2d96e33d37
Merge: fd7b0d7 70822d0
Author: David Goulet 
Date:   Fri Apr 20 09:16:48 2018 -0400

Merge remote-tracking branch 'upstream/master'

 README.md   |  1 +
 src/lib/connect.c   |  2 +-
 src/lib/torsocks.c  |  4 ++--
 tests/Makefile.am   |  2 +-
 tests/test_fd_passing.c | 10 +-
 5 files changed, 14 insertions(+), 5 deletions(-)

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

[tor-commits] [torsocks/master] doc: Clarify the libc limitation in README

[dgoulet]

commit fd7b0d71a0e9f511d2e32fde51fc4f63c5fb7000
Author: David Goulet 
Date:   Fri Apr 20 09:11:05 2018 -0400

doc: Clarify the libc limitation in README

Fixes #22068

Signed-off-by: David Goulet 
---
 README.md | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 8ad574f..dde1676 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,13 @@ Torsocks allows you to use most applications in a safe way 
with Tor. It ensures
 that DNS requests are handled safely and explicitly rejects any traffic other
 than TCP from the application you're using.
 
-Torsocks is an ELF shared library that is loaded before all others. The library
-overrides every needed Internet communication libc function calls such as
-connect(2) or gethostbyname(3).
+Torsocks is an ELF shared library that is loaded before all others. The
+library overrides every needed Internet communication libc function calls such
+as connect(2) or gethostbyname(3).
+
+BE ADVISE: It uses the LD\_PRELOAD mechanism (man ld.so.8) which means that if
+the application is not using the libc or for instance uses raw syscalls,
+torsocks will be useless and the traffic will not go through Tor.
 
 This process is transparent to the user and if torsocks detects any
 communication that can't go through the Tor network such as UDP traffic, for
@@ -20,7 +24,7 @@ will force the application to quit and stop everything.
 Requirements
 -
 
-- autoconf
+   - autoconf
- automake
- libtool
- gcc



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

[tor-commits] [torsocks/master] accept4: Initialize libc symbol early

[dgoulet]

commit e4601e0f89b47c5aff9df30238a10224e8bd04a6
Author: David Goulet 
Date:   Fri Apr 20 09:01:17 2018 -0400

accept4: Initialize libc symbol early

Fixes #17618

Signed-off-by: David Goulet 
---
 src/lib/torsocks.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib/torsocks.c b/src/lib/torsocks.c
index 731b33c..b7e7cdd 100644
--- a/src/lib/torsocks.c
+++ b/src/lib/torsocks.c
@@ -234,8 +234,9 @@ static void init_libc_symbols(void)
tsocks_libc_socket = dlsym(libc_ptr, LIBC_SOCKET_NAME_STR);
tsocks_libc_syscall = dlsym(libc_ptr, LIBC_SYSCALL_NAME_STR);
tsocks_libc_execve = dlsym(libc_ptr, LIBC_EXECVE_NAME_STR);
-   if (!tsocks_libc_connect || !tsocks_libc_close || !tsocks_libc_socket
-   || !tsocks_libc_syscall || !tsocks_libc_execve) {
+   tsocks_libc_accept4 = dlsym(libc_ptr, LIBC_ACCEPT4_NAME_STR);
+   if (!tsocks_libc_connect || !tsocks_libc_close || !tsocks_libc_socket ||
+   !tsocks_libc_syscall || !tsocks_libc_execve || ! 
tsocks_libc_accept4) {
ERR("Unable to lookup symbols in " LIBC_NAME "(%s)", dlerror());
goto error;
}



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

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

[translation]

commit 5d89c23e26cee92836bf9f8c0f9388c13f5caa61
Author: Translation commit bot 
Date:   Fri Apr 20 10:15:38 2018 +

Update translations for https_everywhere_completed
---
 es/https-everywhere.dtd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd
index 4491b1c0d..62195f4a4 100644
--- a/es/https-everywhere.dtd
+++ b/es/https-everywhere.dtd
@@ -17,6 +17,7 @@
 
 
 
+
 
 
 

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

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

[translation]

commit 7373cb4ba84db1f8c37fc9a84dd4fb7aeaa4a36d
Author: Translation commit bot 
Date:   Fri Apr 20 10:15:29 2018 +

Update translations for https_everywhere
---
 es/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd
index 3fa3ef4f6..62195f4a4 100644
--- a/es/https-everywhere.dtd
+++ b/es/https-everywhere.dtd
@@ -17,7 +17,7 @@
 
 
 
-
+
 
 
 

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