October 2013 - tor-commits - lists.torproject.org

[flashproxy/master] Remove FROM parameter in PUT commands.
by dcf＠torproject.org 17 Oct '13

17 Oct '13

commit f40667c75b0c0c184760cd0e227b2e575c2bf8b4 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 16 22:08:06 2013 -0700 Remove FROM parameter in PUT commands. It was planned to be used for source-based rate limiting, but was unused. Adapted from "Support new client registrations." https://gitweb.torproject.org/user/asn/flashproxy.git/commitdiff/7b3010e1d4… "http registration: set default remote address properly - put_reg FROM is never actually … [View More]read by facilitator" https://github.com/infinity0/flashproxy/commit/4b8d3d65fbc78eca400e6c33e998… "report more detailed errors and show stacktraces when unsafe logging" https://github.com/infinity0/flashproxy/commit/c1af35b2e2d57cb8850b1cf345d2… --- facilitator/fac.py | 4 +--- facilitator/facilitator | 2 -- facilitator/facilitator.cgi | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/facilitator/fac.py b/facilitator/fac.py index 70d482d..5e334a5 100644 --- a/facilitator/fac.py +++ b/facilitator/fac.py @@ -239,13 +239,11 @@ def transact(f, command, *params): raise ValueError("No newline at end of string returned by facilitator") return parse_transaction(line[:-1]) -def put_reg(facilitator_addr, client_addr, registrant_addr=None): +def put_reg(facilitator_addr, client_addr): """Send a registration to the facilitator using a one-time socket. Returns true iff the command was successful.""" f = fac_socket(facilitator_addr) params = [("CLIENT", format_addr(client_addr))] - if registrant_addr is not None: - params.append(("FROM", format_addr(registrant_addr))) try: command, params = transact(f, "PUT", *params) finally: diff --git a/facilitator/facilitator b/facilitator/facilitator index dfa5660..f7ebf10 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -248,8 +248,6 @@ class Handler(SocketServer.StreamRequestHandler): if client_spec is None: return self.error(u"PUT missing CLIENT param") - # FROM - try: reg = Reg.parse(client_spec) except ValueError, e: diff --git a/facilitator/facilitator.cgi b/facilitator/facilitator.cgi index 3adbc15..f967555 100755 --- a/facilitator/facilitator.cgi +++ b/facilitator/facilitator.cgi @@ -89,7 +89,7 @@ def do_post(): client_addr = fac.parse_addr_spec(client_spec, defhost=remote_addr[0]) except ValueError: exit_error(400) - if not fac.put_reg(FACILITATOR_ADDR, client_addr, remote_addr): + if not fac.put_reg(FACILITATOR_ADDR, client_addr): exit_error(500) print """\ Status: 200\r [View Less]

1 0

[tor/release-0.2.4] fold in changes entries
by arma＠torproject.org 17 Oct '13

17 Oct '13

commit 00f95c208e1098ddc575ccb07e167c2548b02b2e Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Oct 17 02:51:06 2013 -0400 fold in changes entries --- ChangeLog | 39 +++++++++++++++++++++++++++++++++++++-- changes/9854 | 3 --- changes/bug6979 | 4 ---- changes/bug9596 | 4 ---- changes/bug9644 | 4 ---- changes/bug9880 | 8 -------- changes/bug9904 | 4 ---- changes/… [View More]bug9927 | 4 ---- changes/bug9928 | 6 ------ changes/bug9946 | 11 ----------- changes/geoip-october2013 | 3 --- changes/ticket9866 | 3 --- 12 files changed, 37 insertions(+), 56 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a37480..2647723 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,12 +2,39 @@ Changes in version 0.2.4.18-rc - 2013-10-?? Tor 0.2.4.18-rc is the fourth release candidate for the Tor 0.2.4.x series. [...] - o Minor bugfixes: + o Major bugfixes: + - Stop trying to bootstrap all our directory information from + only our first guard. Discovered while fixing bug 9946; bugfix + on 0.2.4.8-alpha. + + o Minor bugfixes (on 0.2.4.x): + - Correctly log long IPv6 exit policies, instead of truncating them + or reporting an error. Fixes bug 9596; bugfix on 0.2.4.7-alpha. + - Free directory authority certificate download statuses on exit + rather than leaking them. Fixes bug 9644; bugfix on 0.2.4.13-alpha. - Always call circuit_n_chan_done(chan, 0) from channel_closed(), so we can't leak pending circuits in some cases where run_connection_housekeeping() calls connection_or_close_normally(). Fixes bug 9776; bugfix on 0.2.4.17. + o Minor bugfixes (on 0.2.3.x and earlier): + - If the guard we choose first doesn't answer, we would try the + second guard, but once we connected to the second guard we would + abandon it and retry the first one, slowing down bootstrapping. + The fix is to treat all our initially chosen guards as acceptable + to use. Fixes bug 9946; bugfix on 0.1.1.11-alpha. + - Fix an assertion failure that would occur when disabling the + ORPort setting on a running Tor process while accounting was + enabled. Fixes bug 6979; bugfix on 0.2.2.18-alpha. + - When examining the list of network interfaces to find our address, + do not consider non-running or disabled network interfaces. Fixes + bug 9904; bugfix on 0.2.3.11-alpha. Patch from "hantwister". + - Avoid an off-by-one error when checking buffer boundaries when + formatting the exit status of a pluggable transport helper. + This is probably not an exploitable bug, but better safe than + sorry. Fixes bug 9928; bugfix on 0.2.3.18-rc. Bug found by + Pedro Ribeiro. + o Minor features: - Clients no longer send timestamps in their NETINFO cells. These were not used for anything, and they provided one small way for clients @@ -22,7 +49,15 @@ Changes in version 0.2.4.18-rc - 2013-10-?? good purpose, and isn't needed. Implements part of proposal 222. - Reduce down accuracy of timestamps in hidden service descriptors. Implements part of proposal 222. - - Update to the September 4 2013 Maxmind GeoLite Country database. + - Generate bootstrapping status update events correctly when fetching + microdescriptors. Fixes bug 9927. + - Add anchors to the manpage so we can link to the html version of + the documentation for specific options. Resolves ticket 9866. + - Update to the October 2 2013 Maxmind GeoLite Country database. + + o Documentation fixes: + - Clarify the usage and risks of setting the ContactInfo torrc line + for your relay or bridge. Resolves ticket 9854. Changes in version 0.2.4.17-rc - 2013-09-05 diff --git a/changes/9854 b/changes/9854 deleted file mode 100644 index 30105cb..0000000 --- a/changes/9854 +++ /dev/null @@ -1,3 +0,0 @@ - o Documentation fixes: - - Clarify the usage and risks of ContactInfo. Resolves ticket 9854. - diff --git a/changes/bug6979 b/changes/bug6979 deleted file mode 100644 index 55572ec..0000000 --- a/changes/bug6979 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Fix an assertion failure that would occur when disabling the - ORPort setting on a running Tor process while accounting was - enabled. Fixes bug 6979; bugfix on 0.2.2.18-alpha. diff --git a/changes/bug9596 b/changes/bug9596 deleted file mode 100644 index b3d138e..0000000 --- a/changes/bug9596 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Correctly log long IPv6 exit policy, instead of truncating them - or reporting an error. Fixes bug 9596; bugfix on 0.2.4.7-alpha. - diff --git a/changes/bug9644 b/changes/bug9644 deleted file mode 100644 index 51c58a5..0000000 --- a/changes/bug9644 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Fix a small memory leak on exit. (We weren't freeing directory - authority certificate download statuses.) Fixes bug 9644; bugfix - on 0.2.4.13-alpha. diff --git a/changes/bug9880 b/changes/bug9880 deleted file mode 100644 index a7dda8f..0000000 --- a/changes/bug9880 +++ /dev/null @@ -1,8 +0,0 @@ - o Minor bugfixes: - - - When closing a channel that has already been open, do not close - pending circuits that were waiting to connect to the same relay. - Fixes bug 9880; bugfix on 0.2.5.1-alpha. Thanks to skruffy for - finding this bug. (Bug was merged to 0.2.4 branch but not released - in any 0.2.4 version) - diff --git a/changes/bug9904 b/changes/bug9904 deleted file mode 100644 index eec4144..0000000 --- a/changes/bug9904 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - When examining list of network interfaces to find our address, do - not consider non-running or disabled network interfaces. Fixes bug - 9904; bugfix on 0.2.3.11-alpha. Patch from "hantwister". diff --git a/changes/bug9927 b/changes/bug9927 deleted file mode 100644 index e66280c..0000000 --- a/changes/bug9927 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features: - - Generate bootstrapping status update events correctly for fetching - microdescriptors. Fixes bug 9927. - diff --git a/changes/bug9928 b/changes/bug9928 deleted file mode 100644 index b72cea3..0000000 --- a/changes/bug9928 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - Avoid an off-by-one error when checking buffer boundaries when - formatting the exit status of a pluggable transport helper. - This is probably not an exploitable bug, but better safe than - sorry. Fixes bug 9928; bugfix on 0.2.3.18-rc. Bug found by - Pedro Ribeiro. diff --git a/changes/bug9946 b/changes/bug9946 deleted file mode 100644 index 5d1c888..0000000 --- a/changes/bug9946 +++ /dev/null @@ -1,11 +0,0 @@ - o Minor bugfixes: - - If the guard we choose first doesn't answer, we would try the - second guard, but once we connected to the second guard we would - abandon it and retry the first one, slowing down bootstrapping. - The fix is to treat all our initially chosen guards as acceptable - to use. Fixes bug 9946; bugfix on 0.1.1.11-alpha. - - o Major bugfixes: - - Stop trying to fetch all our directory information from our first - guard. Discovered while fixing bug 9946; bugfix on 0.2.4.8-alpha. - diff --git a/changes/geoip-october2013 b/changes/geoip-october2013 deleted file mode 100644 index bc72850..0000000 --- a/changes/geoip-october2013 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the October 2 2013 Maxmind GeoLite Country database. - diff --git a/changes/ticket9866 b/changes/ticket9866 deleted file mode 100644 index 6cbb111..0000000 --- a/changes/ticket9866 +++ /dev/null @@ -1,3 +0,0 @@ - o Documentation: - - Add anchors to the manpage so we can link to the documentation for - specific options. Resolves ticket 9866. [View Less]

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 17 Oct '13

17 Oct '13

commit 426217817b080d2d9feecfb64acd6c9934f70729 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 17 06:16:16 2013 +0000 Update translations for tor-launcher-properties --- zh_TW/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/torlauncher.properties b/zh_TW/torlauncher.properties index 2014fe0..e5ad554 100644 --- a/zh_TW/torlauncher.properties +++ b/zh_TW/torlauncher.properties @@ -23,7 +23,7 @@ … [View More]

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 17 Oct '13

17 Oct '13

commit 2b8ad704bdf7f15a3320a61c5f779634cc0e8027 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 17 06:15:57 2013 +0000 Update translations for torcheck_completed --- zh_TW/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/torcheck.po b/zh_TW/torcheck.po index 5242d6c..3ec2f93 100644 --- a/zh_TW/torcheck.po +++ b/zh_TW/torcheck.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-… [View More]

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 17 Oct '13

17 Oct '13

commit 5839c45fa27570aa26c61f63b03d9105b96c3315 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 17 06:15:54 2013 +0000 Update translations for torcheck --- zh_TW/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/torcheck.po b/zh_TW/torcheck.po index 5242d6c..3ec2f93 100644 --- a/zh_TW/torcheck.po +++ b/zh_TW/torcheck.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https:… [View More]

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 17 Oct '13

17 Oct '13

commit 9e5df5c29a3156a4a7d6ff7b94b519c961ce3962 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 17 06:15:24 2013 +0000 Update translations for vidalia_alpha --- zh_TW/vidalia_zh_TW.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/vidalia_zh_TW.po b/zh_TW/vidalia_zh_TW.po index 067d04f..f466952 100644 --- a/zh_TW/vidalia_zh_TW.po +++ b/zh_TW/vidalia_zh_TW.po @@ -1973,7 +1973,7 @@ msgstr "" msgctxt "MainWindow" msgid "… [View More]

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 17 Oct '13

17 Oct '13

commit c33e883960f23b360e18db180f7c8d18b99e245d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 17 06:15:13 2013 +0000 Update translations for gettor_completed --- zh_TW/gettor.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/gettor.po b/zh_TW/gettor.po index 6c8dc6c..644dfad 100644 --- a/zh_TW/gettor.po +++ b/zh_TW/gettor.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https:… [View More]

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 17 Oct '13

17 Oct '13

commit 0a8f4341bc9e5cbfa7e1cca8940cf86831e5a0af Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 17 06:15:05 2013 +0000 Update translations for gettor --- zh_TW/gettor.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/gettor.po b/zh_TW/gettor.po index 6c8dc6c..644dfad 100644 --- a/zh_TW/gettor.po +++ b/zh_TW/gettor.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.… [View More]

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 17 Oct '13

17 Oct '13

commit f4d7c35042c6f7831bd895ebd199b237a98abe86 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 17 04:16:14 2013 +0000 Update translations for tor-launcher-network-settings_completed --- zh_TW/network-settings.dtd | 56 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd new file mode 100644 index 0000000..6b589a3 --- /dev/null +++ b/zh_TW/network-settings.… [View More]dtd @@ -0,0 +1,56 @@ +<!ENTITY torsettings.dialog.title "Tor網絡設定"> + + + +<!ENTITY torsettings.prompt "在Tor瀏覽器套件嘗試連結到Tor網路之前，您需要提供關於此電腦的網路連結訊息。"> + +<!ENTITY torSettings.yes "確定"> +<!ENTITY torSettings.no "取消"> + +<!ENTITY torSettings.firstQuestion "下列哪項最能描述您的情況？"> +<!ENTITY torSettings.configurePrompt1 "此電腦的網路連結被審查、過濾、或代理。"> +<!ENTITY torSettings.configurePrompt2 "我需要設定網絡設定。"> +<!ENTITY torSettings.configure "設定"> +<!ENTITY torSettings.connectPrompt1 "此電腦的網路連結已越過障礙。"> +<!ENTITY torSettings.connectPrompt2 "我想直接連結到Tor網路。"> +<!ENTITY torSettings.connect "連結"> + +<!ENTITY torSettings.proxyQuestion "這台電腦上是否需要使用代理服務器存取網際網路？"> + +<!ENTITY torSettings.proxyHelp "若您無法確定如何回答這個問題，看看另一個瀏覽器的上網設定，看它是否被設定為使用代理服務器。"> +<!ENTITY torSettings.enterProxy "輸入代理服務器設定。"> +<!ENTITY torSettings.firewallQuestion "此計算機的網路連結是否通過一個防火牆，只允許某些端口的連結？"> +<!ENTITY torSettings.firewallHelp "若您無法確定如何回答這個問題，請選擇“否”，若遇到問題而無法連結到Tor網路，請改變此設定。"> +<!ENTITY torSettings.enterFirewall "在防火牆允許的端口中輸入一個逗號分隔的列表。"> +<!ENTITY torSettings.bridgeQuestion "若此電腦的網路連結被審查，您將需要取得和使用橋接中繼&#160。若沒有，只需點擊連結。"> + + + +<!ENTITY torsettings.startingTor "正在等待Tor的開始..."> +<!ENTITY torsettings.restart "重新啟動"> + +<!ENTITY torsettings.optional "選項"> + +<!ENTITY torsettings.useProxy.checkbox "這台電腦需要使用代理服務器存取網際網路"> +<!ENTITY torsettings.useProxy.type "代理類型："> +<!ENTITY torsettings.useProxy.address "地址:"> +<!ENTITY torsettings.useProxy.address.placeholder "IP地址或主機名"> +<!ENTITY torsettings.useProxy.port "連接埠:"> +<!ENTITY torsettings.useProxy.username "用戶名"> +<!ENTITY torsettings.useProxy.password "密碼:"> +<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> +<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> +<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> +<!ENTITY torsettings.firewall.checkbox "這台電腦通過一防火牆，只允許連結到某些端口"> +<!ENTITY torsettings.firewall.allowedPorts "允許的連接埠 :"> +<!ENTITY torsettings.useBridges.checkbox "我的網際網路服務提供者(ISP)封鎖連結到Tor網絡"> +<!ENTITY torsettings.useBridges.label "輸入一個或多個橋接中繼(每行一個)。"> +<!ENTITY torsettings.useBridges.placeholder "地址：端口或傳輸地址：端口"> + +<!ENTITY torsettings.copyLog "複製Tor記錄到剪貼簿"> +<!ENTITY torsettings.bridgeHelpTitle "橋接中繼說明"> +<!ENTITY torsettings.bridgeHelp1 "若您無法連接到Tor網路，也可能是您的網際網路服務提供者(ISP)或其他機構封鎖Tor&#160。通常情況下，你可以透過使用Tor橋接隱藏中繼以防止封鎖，解決這個問題。"> +<!ENTITY torsettings.bridgeHelp2 "要取得一些橋接中繼，請使用網路瀏覽器參訪以下頁面：https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3 "查找公眾橋接地址的另一種方式是發送郵件到bridges(a)torproject.org'橋接'本身在信內的訊息&#160。然而，為了使攻擊者更難取得更多橋接地址，您必須從一個電子郵件地址發送此請求於以下網域：gmail.com或yahoo.com之一。"> +<!ENTITY torsettings.bridgeHelp4 "您也可以藉由透過發送於下列電子郵件以請求橋接中繼 +help(a)rt.torproject.org."> [View Less]

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 17 Oct '13

17 Oct '13

commit e6c73b0d228cd5b3a6d9e601b5cd5dd5578932c4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 17 04:16:10 2013 +0000 Update translations for tor-launcher-network-settings --- zh_TW/network-settings.dtd | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd index 8088223..6b589a3 100644 --- a/zh_TW/network-settings.dtd +++ b/zh_TW/network-settings.dtd @@… [View More] -8,7 +8,7 @@ <!ENTITY torSettings.no "取消"> <!ENTITY torSettings.firstQuestion "下列哪項最能描述您的情況？"> -<!ENTITY torSettings.configurePrompt1 ""> +<!ENTITY torSettings.configurePrompt1 "此電腦的網路連結被審查、過濾、或代理。"> <!ENTITY torSettings.configurePrompt2 "我需要設定網絡設定。"> <!ENTITY torSettings.configure "設定"> <!ENTITY torSettings.connectPrompt1 "此電腦的網路連結已越過障礙。"> @@ -20,19 +20,19 @@ <!ENTITY torSettings.proxyHelp "若您無法確定如何回答這個問題，看看另一個瀏覽器的上網設定，看它是否被設定為使用代理服務器。"> <!ENTITY torSettings.enterProxy "輸入代理服務器設定。"> <!ENTITY torSettings.firewallQuestion "此計算機的網路連結是否通過一個防火牆，只允許某些端口的連結？"> -<!ENTITY torSettings.firewallHelp ""> -<!ENTITY torSettings.enterFirewall ""> -<!ENTITY torSettings.bridgeQuestion ""> +<!ENTITY torSettings.firewallHelp "若您無法確定如何回答這個問題，請選擇“否”，若遇到問題而無法連結到Tor網路，請改變此設定。"> +<!ENTITY torSettings.enterFirewall "在防火牆允許的端口中輸入一個逗號分隔的列表。"> +<!ENTITY torSettings.bridgeQuestion "若此電腦的網路連結被審查，您將需要取得和使用橋接中繼&#160。若沒有，只需點擊連結。">  <!ENTITY torsettings.startingTor "正在等待Tor的開始..."> -<!ENTITY torsettings.restart ""> +<!ENTITY torsettings.restart "重新啟動"> <!ENTITY torsettings.optional "選項"> -<!ENTITY torsettings.useProxy.checkbox ""> -<!ENTITY torsettings.useProxy.type ""> +<!ENTITY torsettings.useProxy.checkbox "這台電腦需要使用代理服務器存取網際網路"> +<!ENTITY torsettings.useProxy.type "代理類型："> <!ENTITY torsettings.useProxy.address "地址:"> <!ENTITY torsettings.useProxy.address.placeholder "IP地址或主機名"> <!ENTITY torsettings.useProxy.port "連接埠:"> @@ -41,15 +41,16 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox ""> +<!ENTITY torsettings.firewall.checkbox "這台電腦通過一防火牆，只允許連結到某些端口"> <!ENTITY torsettings.firewall.allowedPorts "允許的連接埠 :"> <!ENTITY torsettings.useBridges.checkbox "我的網際網路服務提供者(ISP)封鎖連結到Tor網絡"> -<!ENTITY torsettings.useBridges.label ""> -<!ENTITY torsettings.useBridges.placeholder ""> +<!ENTITY torsettings.useBridges.label "輸入一個或多個橋接中繼(每行一個)。"> +<!ENTITY torsettings.useBridges.placeholder "地址：端口或傳輸地址：端口"> <!ENTITY torsettings.copyLog "複製Tor記錄到剪貼簿"> <!ENTITY torsettings.bridgeHelpTitle "橋接中繼說明"> -<!ENTITY torsettings.bridgeHelp1 ""> +<!ENTITY torsettings.bridgeHelp1 "若您無法連接到Tor網路，也可能是您的網際網路服務提供者(ISP)或其他機構封鎖Tor&#160。通常情況下，你可以透過使用Tor橋接隱藏中繼以防止封鎖，解決這個問題。"> <!ENTITY torsettings.bridgeHelp2 "要取得一些橋接中繼，請使用網路瀏覽器參訪以下頁面：https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3 ""> -<!ENTITY torsettings.bridgeHelp4 ""> +<!ENTITY torsettings.bridgeHelp3 "查找公眾橋接地址的另一種方式是發送郵件到bridges(a)torproject.org'橋接'本身在信內的訊息&#160。然而，為了使攻擊者更難取得更多橋接地址，您必須從一個電子郵件地址發送此請求於以下網域：gmail.com或yahoo.com之一。"> +<!ENTITY torsettings.bridgeHelp4 "您也可以藉由透過發送於下列電子郵件以請求橋接中繼 +help(a)rt.torproject.org."> [View Less]

1 0