April 2015 - tor-commits - lists.torproject.org

[stem/master] Torture English a little less
by atagar＠torproject.org 12 Apr '15

12 Apr '15

commit d66a8491adffe8fd1c1562daa5ee390d4ed8c681 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 11 18:50:43 2015 -0700 Torture English a little less I've been treating presently as a synonym of currently. It isn't. While it's fun to watch Roger weep openly, I've had my fun. Time to find something new to make him writhe. --- docs/faq.rst | 2 +- run_tests.py | 2 +- stem/__init__.py | 4 ++-- stem/control.py | 26 +++++++++++++------------- stem/descriptor/hidden_service_descriptor.py | 2 +- stem/descriptor/remote.py | 2 +- stem/interpreter/commands.py | 2 +- stem/interpreter/settings.cfg | 2 +- stem/response/events.py | 2 +- stem/socket.py | 2 +- stem/util/system.py | 2 +- test/integ/descriptor/remote.py | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/faq.rst b/docs/faq.rst index 81f1597..2a4ec83 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -512,7 +512,7 @@ How can I test compatibility with multiple python versions? ----------------------------------------------------------- Stem supports python versions 2.6 and above, including the 3.x series. You can -test all versions of python you presently have installed on your system with +test all versions of python you currently have installed on your system with `tox <https://testrun.org/tox/>`_. If you're using a Debian based system this can be as simple as... diff --git a/run_tests.py b/run_tests.py index 8f70d09..c7ac574 100755 --- a/run_tests.py +++ b/run_tests.py @@ -59,7 +59,7 @@ https://pypi.python.org/pypi/mock/ """ NEW_CAPABILITIES_FOUND = """\ -Your version of Tor has capabilities stem presently isn't taking advantage of. +Your version of Tor has capabilities stem currently isn't taking advantage of. If you're running the latest version of stem then please file a ticket on: https://trac.torproject.org/projects/tor/wiki/doc/stem/bugs diff --git a/stem/__init__.py b/stem/__init__.py index 5339342..4752a99 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -70,7 +70,7 @@ Library for working with the tor process. **NAMED** relay can be referred to by its nickname **RUNNING** relay is currently usable **STABLE** relay's suitable for long-lived circuits - **UNNAMED** relay isn't presently bound to a nickname + **UNNAMED** relay isn't currently bound to a nickname **V2DIR** relay supports the v2 directory protocol **VALID** relay has been validated ================= =========== @@ -133,7 +133,7 @@ Library for working with the tor process. **TORPROTOCOL** violation in the tor protocol **INTERNAL** internal error **REQUESTED** requested by the client via a TRUNCATE command - **HIBERNATING** relay is presently hibernating + **HIBERNATING** relay is currently hibernating **RESOURCELIMIT** relay is out of memory, sockets, or circuit IDs **CONNECTFAILED** unable to contact the relay **OR_IDENTITY** relay had the wrong OR identification diff --git a/stem/control.py b/stem/control.py index 4308eca..c4cbc0b 100644 --- a/stem/control.py +++ b/stem/control.py @@ -83,9 +83,9 @@ If you're fine with allowing your script to raise exceptions then this can be mo |- get_pid - provides the pid of our tor process | |- get_microdescriptor - querying the microdescriptor for a relay - |- get_microdescriptors - provides all presently available microdescriptors + |- get_microdescriptors - provides all currently available microdescriptors |- get_server_descriptor - querying the server descriptor for a relay - |- get_server_descriptors - provides all presently available server descriptors + |- get_server_descriptors - provides all currently available server descriptors |- get_network_status - querying the router status entry for a relay |- get_network_statuses - provides all preently available router status entries | @@ -125,7 +125,7 @@ If you're fine with allowing your script to raise exceptions then this can be mo |- close_stream - close a stream | |- signal - sends a signal to the tor client - |- is_newnym_available - true if tor would presently accept a NEWNYM signal + |- is_newnym_available - true if tor would currently accept a NEWNYM signal |- get_newnym_wait - seconds until tor would accept a NEWNYM signal |- get_effective_rate - provides our effective relaying rate limit |- is_geoip_unavailable - true if we've discovered our geoip db to be unavailable @@ -357,7 +357,7 @@ UNCACHEABLE_GETCONF_PARAMS = ( # is unavailable GEOIP_FAILURE_THRESHOLD = 5 -SERVER_DESCRIPTORS_UNSUPPORTED = "Tor is presently not configured to retrieve \ +SERVER_DESCRIPTORS_UNSUPPORTED = "Tor is currently not configured to retrieve \ server descriptors. As of Tor version 0.2.3.25 it downloads microdescriptors \ instead unless you set 'UseMicrodescriptors 0' in your torrc." @@ -598,7 +598,7 @@ class BaseController(object): def connection_time(self): """ Provides the unix timestamp for when our socket was either connected or - disconnected. That is to say, the time we connected if we're presently + disconnected. That is to say, the time we connected if we're currently connected and the time we disconnected if we're not connected. .. versionadded:: 1.3.0 @@ -1537,7 +1537,7 @@ class Controller(BaseController): """ get_microdescriptors(default = UNDEFINED) - Provides an iterator for all of the microdescriptors that tor presently + Provides an iterator for all of the microdescriptors that tor currently knows about. **Tor does not expose this information via the control protocol** @@ -1650,7 +1650,7 @@ class Controller(BaseController): """ get_server_descriptors(default = UNDEFINED) - Provides an iterator for all of the server descriptors that tor presently + Provides an iterator for all of the server descriptors that tor currently knows about. **As of Tor version 0.2.3.25 relays no longer get server descriptors by @@ -1776,7 +1776,7 @@ class Controller(BaseController): get_network_statuses(default = UNDEFINED) Provides an iterator for all of the router status entries that tor - presently knows about. + currently knows about. This provides :class:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` @@ -2688,7 +2688,7 @@ class Controller(BaseController): """ get_circuit(circuit_id, default = UNDEFINED) - Provides a circuit presently available from tor. + Provides a circuit currently available from tor. :param int circuit_id: circuit to be fetched :param object default: response if the query fails @@ -2706,7 +2706,7 @@ class Controller(BaseController): if circ.id == circuit_id: return circ - raise ValueError("Tor presently does not have a circuit with the id of '%s'" % circuit_id) + raise ValueError("Tor currently does not have a circuit with the id of '%s'" % circuit_id) @with_default() def get_circuits(self, default = UNDEFINED): @@ -3004,12 +3004,12 @@ class Controller(BaseController): def is_newnym_available(self): """ - Indicates if tor would presently accept a NEWNYM signal. This can only + Indicates if tor would currently accept a NEWNYM signal. This can only account for signals sent via this controller. .. versionadded:: 1.2.0 - :returns: **True** if tor would presently accept a NEWNYM signal, **False** + :returns: **True** if tor would currently accept a NEWNYM signal, **False** otherwise """ @@ -3175,7 +3175,7 @@ class Controller(BaseController): def _attach_listeners(self): """ Attempts to subscribe to the self._event_listeners events from tor. This is - a no-op if we're not presently authenticated. + a no-op if we're not currently authenticated. :returns: tuple of the form (set_events, failed_events) diff --git a/stem/descriptor/hidden_service_descriptor.py b/stem/descriptor/hidden_service_descriptor.py index fec17e4..31a99cc 100644 --- a/stem/descriptor/hidden_service_descriptor.py +++ b/stem/descriptor/hidden_service_descriptor.py @@ -299,7 +299,7 @@ class HiddenServiceDescriptor(Descriptor): elif authentication_type == STEALTH_AUTH: content = HiddenServiceDescriptor._decrypt_stealth_auth(content, authentication_cookie) else: - raise DecryptionFailure("Unrecognized authentication type '%s', presently we only support basic auth (%s) and stealth auth (%s)" % (authentication_type, BASIC_AUTH, STEALTH_AUTH)) + raise DecryptionFailure("Unrecognized authentication type '%s', currently we only support basic auth (%s) and stealth auth (%s)" % (authentication_type, BASIC_AUTH, STEALTH_AUTH)) if not content.startswith(b'introduction-point '): raise DecryptionFailure('Unable to decrypt the introduction-points, maybe this is the wrong key?') diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index effe3ca..4d3423d 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -653,7 +653,7 @@ class DirectoryAuthority(object): Added the is_bandwidth_authority attribute. :var str nickname: nickname of the authority - :var str address: IP address of the authority, presently they're all IPv4 but + :var str address: IP address of the authority, currently they're all IPv4 but this may not always be the case :var int or_port: port on which the relay services relay traffic :var int dir_port: port on which directory information is available diff --git a/stem/interpreter/commands.py b/stem/interpreter/commands.py index f065110..4047517 100644 --- a/stem/interpreter/commands.py +++ b/stem/interpreter/commands.py @@ -260,7 +260,7 @@ class ControlInterpretor(code.InteractiveConsole): if not arg: status = 'enabled' if self._run_python_commands else 'disabled' - return format('Python support is presently %s.' % status, *STANDARD_OUTPUT) + return format('Python support is currently %s.' % status, *STANDARD_OUTPUT) elif arg.lower() == 'enable': self._run_python_commands = True elif arg.lower() == 'disable': diff --git a/stem/interpreter/settings.cfg b/stem/interpreter/settings.cfg index ce78ba7..290e646 100644 --- a/stem/interpreter/settings.cfg +++ b/stem/interpreter/settings.cfg @@ -40,7 +40,7 @@ msg.startup_banner |For more information run '/help'. | -msg.tor_unavailable Tor isn't running and the command presently isn't in your PATH. +msg.tor_unavailable Tor isn't running and the command currently isn't in your PATH. msg.starting_tor |Tor isn't running. Starting a temporary Tor instance for our interpreter to diff --git a/stem/response/events.py b/stem/response/events.py index 20676c6..47d6a0f 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -621,7 +621,7 @@ class GuardEvent(Event): class HSDescEvent(Event): """ - Event triggered when we fetch a hidden service descriptor that presently isn't in our cache. + Event triggered when we fetch a hidden service descriptor that currently isn't in our cache. The HS_DESC event was introduced in tor version 0.2.5.2-alpha. diff --git a/stem/socket.py b/stem/socket.py index 344e1a0..8024098 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -208,7 +208,7 @@ class ControlSocket(object): def connection_time(self): """ Provides the unix timestamp for when our socket was either connected or - disconnected. That is to say, the time we connected if we're presently + disconnected. That is to say, the time we connected if we're currently connected and the time we disconnected if we're not connected. .. versionadded:: 1.3.0 diff --git a/stem/util/system.py b/stem/util/system.py index f42951d..c263ce3 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -158,7 +158,7 @@ def is_gentoo(): def is_bsd(): """ - Checks if we are within the BSD family of operating systems. This presently + Checks if we are within the BSD family of operating systems. This currently recognizes Macs, FreeBSD, and OpenBSD but may be expanded later. :returns: **bool** to indicate if we're on a BSD OS diff --git a/test/integ/descriptor/remote.py b/test/integ/descriptor/remote.py index 4c7779b..4a9cd9b 100644 --- a/test/integ/descriptor/remote.py +++ b/test/integ/descriptor/remote.py @@ -155,7 +155,7 @@ class TestDescriptorDownloader(unittest.TestCase): # TODO: method needs to be fixed - not quite sure what's going wrong... - test.runner.skip(self, '(test presently broken)') + test.runner.skip(self, '(test currently broken)') return downloader = stem.descriptor.remote.DescriptorDownloader(validate = True)

1 0

[stem/master] Drop use of sys.maxint
by atagar＠torproject.org 11 Apr '15

11 Apr '15

commit c8fea2899a40299550b4224c96ec89f670b60796 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 11 14:02:52 2015 -0700 Drop use of sys.maxint Turns out python 3.x dropped sys.maxint... http://stackoverflow.com/questions/13795758/what-is-sys-maxint-in-python-3 That's fine. Honestly just used it to avoid some 'is None' checks. --- stem/util/system.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index f33d8b7..f42951d 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -50,7 +50,6 @@ import os import platform import re import subprocess -import sys import tarfile import time @@ -772,19 +771,15 @@ def tail(target, lines = None): return - if lines is None: - lines = sys.maxint - # based on snippet from... # https://stackoverflow.com/questions/136168/get-last-n-lines-of-a-file-with-… target.seek(0, 2) # go to the end of the file block_end_byte = target.tell() - lines_left = lines block_number = -1 content = '' - while lines_left > 0 and block_end_byte > 0: + while (lines is None or lines > 0) and block_end_byte > 0: if (block_end_byte - BLOCK_SIZE > 0): # read the last block we haven't yet read target.seek(block_number * BLOCK_SIZE, 2) @@ -795,8 +790,10 @@ def tail(target, lines = None): completed_lines = target.read(block_end_byte) + content for line in reversed(completed_lines.splitlines()): - if lines_left > 0: - lines_left -= 1 + if lines is None or lines > 0: + if lines is not None: + lines -= 1 + yield line block_end_byte -= BLOCK_SIZE

1 0

[stem/master] Missing bytes conversion for test data
by atagar＠torproject.org 11 Apr '15

11 Apr '15

commit f5ec8919847aa1e9d32ceda97e8acaf77a579839 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 11 14:14:42 2015 -0700 Missing bytes conversion for test data ====================================================================== ERROR: test_event_handling ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/runner.py", line 127, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/integ/control/controller.py", line 161, in test_event_handling controller.set_conf('NodeFamily', random_fingerprint()) File "/home/atagar/Desktop/stem/test/integ/control/controller.py", line 50, in random_fingerprint return hashlib.sha1(str(time.time())).hexdigest().upper() TypeError: Unicode-objects must be encoded before hashing ---------------------------------------------------------------------- --- test/integ/control/controller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 5deda2b..2265cb2 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -47,7 +47,7 @@ def random_fingerprint(): Provides a random 40 character hex string. """ - return hashlib.sha1(str(time.time())).hexdigest().upper() + return hashlib.sha1(stem.util.str_tools._to_bytes(str(time.time()))).hexdigest().upper() class TestController(unittest.TestCase):

1 0

[stem/master] Compatibility fixes for python3
by atagar＠torproject.org 11 Apr '15

11 Apr '15

commit eea3d9d882b9c06009e53114d220c95809dcc06e Merge: 938728d ccda9b5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 11 14:15:42 2015 -0700 Compatibility fixes for python3 Fixing a few regressions for our python3 support that slipped in. Thanks to toralf for pointing out that the tests were failing. stem/control.py | 2 +- stem/util/system.py | 13 +++++-------- test/integ/control/controller.py | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-)

1 0

[stem/master] Missing list wrapper causing stacktraces during controller shutdown
by atagar＠torproject.org 11 Apr '15

11 Apr '15

commit ccda9b59044d2d95d8183811ac88e57f1abdb206 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 11 14:15:10 2015 -0700 Missing list wrapper causing stacktraces during controller shutdown Traceback (most recent call last): File "/usr/lib/python3.2/threading.py", line 740, in _bootstrap_inner self.run() File "/usr/lib/python3.2/threading.py", line 693, in run self._target(*self._args, **self._kwargs) File "/home/atagar/Desktop/stem/stem/control.py", line 848, in _reader_loop control_message = self._socket.recv() File "/home/atagar/Desktop/stem/stem/socket.py", line 174, in recv self.close() File "/home/atagar/Desktop/stem/stem/socket.py", line 296, in close self._close() File "/home/atagar/Desktop/stem/stem/control.py", line 763, in _close self._notify_status_listeners(State.CLOSED) File "/home/atagar/Desktop/stem/stem/control.py", line 813, in _notify_status_listeners self._state_change_threads.append(notice_thread) AttributeError: 'filter' object has no attribute 'append' --- stem/control.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/control.py b/stem/control.py index 52a8de3..4308eca 100644 --- a/stem/control.py +++ b/stem/control.py @@ -800,7 +800,7 @@ class BaseController(object): if expect_alive is not None and expect_alive != self.is_alive(): return - self._state_change_threads = filter(lambda t: t.is_alive(), self._state_change_threads) + self._state_change_threads = list(filter(lambda t: t.is_alive(), self._state_change_threads)) for listener, spawn in self._status_listeners: if spawn:

1 0

[stem/master] Port correction for 994 (irc => ircs)
by atagar＠torproject.org 11 Apr '15

11 Apr '15

commit 938728d595e42059b0fa0ebdaaf3b8cd6da327ad Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 11 11:37:55 2015 -0700 Port correction for 994 (irc => ircs) Another correction from toralf... ircs 994/tcp # irc protocol over TLS/SSL --- stem/util/ports.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/util/ports.cfg b/stem/util/ports.cfg index a7b6ae4..2b0527f 100644 --- a/stem/util/ports.cfg +++ b/stem/util/ports.cfg @@ -212,7 +212,7 @@ port 990 => FTPS port 991 => NAS port 992 => Telnets port 993 => IMAPS -port 994 => IRC +port 994 => IRCS port 995 => POP3S port 999 => ScimoreDB port 1001 => JtoMB

1 0

[stem/master] Change port 992 description to Telnets
by atagar＠torproject.org 11 Apr '15

11 Apr '15

commit b7a87d790b8a4b6e8c0b49c0d8a3644549890912 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 11 11:22:50 2015 -0700 Change port 992 description to Telnets Interesting! This is a correction from toralf... 10:54 < toralf> atagar: port_usage from stem.util.connection should result for value 992 as "Telnets", currently it is "Telnet" 11:20 < atagar> toralf: 'port_usage from stem.util.connection should result for value 992 as "Telnets", currently it is "Telnet"' => Why would it be plural? I could certainly be missing something but telnet in my mind is an application, and in looking at its wiki it's not pluralized anywhere on it... 11:20 < atagar> https://en.wikipedia.org/wiki/Telnet 11:20 < qwerty1> atagar: telnet-sekure 11:21 < toralf> atagar: it is the secure Telnet port like HTTPS , isn't it ? 11:21 < atagar> oh, didn't realize that 11:22 < toralf> grep 992 /etc/services : telnets 992/tcp # telnet protocol over TLS/SSL --- stem/util/ports.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/util/ports.cfg b/stem/util/ports.cfg index 90c5e90..a7b6ae4 100644 --- a/stem/util/ports.cfg +++ b/stem/util/ports.cfg @@ -210,7 +210,7 @@ port 981 => SofaWare Firewall port 989 => FTPS port 990 => FTPS port 991 => NAS -port 992 => Telnet +port 992 => Telnets port 993 => IMAPS port 994 => IRC port 995 => POP3S

1 0

[webwml/master] Drop HTTPSEverywhere project idea
by atagar＠torproject.org 11 Apr '15

11 Apr '15

commit 061e5517754041741c2cf339c1c5409d49d12ddd Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 11 11:13:41 2015 -0700 Drop HTTPSEverywhere project idea Request from Peter. --- getinvolved/en/volunteer.wml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 36a6218..644d78e 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -1046,27 +1046,6 @@ meetings around the world.</li> </li> - <a id="httpsEverywhereRulesetTesting"></a> - <li> - Incorporate Ruleset Testing into the HTTPS Everywhere release process - - Effort Level: Medium - - Skill Level: Medium - - Likely Mentors: Peter Eckersley (pde), Micah Lee - -Ondrej Mikle has implemented a codebase for testing HTTPS Everywhere rulesets -by crawling pages that are affected by the ruleset (<a href="https://github.com/hiviah/https-everywhere-checker">repository</a>). - - - -This codebase still has some rough edges that need to be smoothed over, but -once those are done it should be incorporated into the HTTPS Everywhere build -process, in order to improve the quality of our releases. - - </li> - <a id="censorshipAnalyzer"></a> <li> Develop a Censorship Analyzer

1 0

[translation/tor_animation_completed] Update translations for tor_animation_completed
by translation＠torproject.org 11 Apr '15

11 Apr '15

commit 9d6c7fcc8e26eb3dd113784a5e0a1c3b69327cdb Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 11 15:46:01 2015 +0000 Update translations for tor_animation_completed --- zh_HK.srt | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) diff --git a/zh_HK.srt b/zh_HK.srt new file mode 100644 index 0000000..cc7e1f8 --- /dev/null +++ b/zh_HK.srt @@ -0,0 +1,142 @@ +1 +00:00:00,660 --> 00:00:02,780 +我哋已經非常習慣有互聯網 + +2 +00:00:03,120 --> 00:00:07,700 +我哋不停分享一啲關於我哋自己同埋個人生活嘅資訊 + +3 +00:00:08,000 --> 00:00:09,960 +我哋食嘅嘢，我哋見到嘅人 + +4 +00:00:10,180 --> 00:00:12,480 +我哋去嘅地方，我哋讀緊嘅書 + +5 +00:00:13,280 --> 00:00:14,640 +等我解釋長細啲啦 + +6 +00:00:14,920 --> 00:00:17,740 +就喺呢個時候， +如果有人上網嘗試追蹤你 + +7 +00:00:18,060 --> 00:00:22,480 +佢哋可以見到你真正嘅身份， +準確嘅位置同你部電腦嘅作業系統 + +8 +00:00:22,800 --> 00:00:26,500 +你上過嘅網站，你所用嘅瀏覽器 + +9 +00:00:26,700 --> 00:00:29,140 +同埋好多好多關於你同埋你生活嘅資料 + +10 +00:00:29,620 --> 00:00:32,460 +你本身都唔發覺同咗啲三唔識七嘅人分享 + +11 +00:00:32,920 --> 00:00:35,840 +佢哋可以好容易地利用呢啲資料 + +12 +00:00:36,220 --> 00:00:38,120 +不過如果你用Tor嘅話 + +13 +00:00:39,140 --> 00:00:42,840 +Tor保護您嘅個人私隱同埋您嘅身份 + +14 +00:00:43,560 --> 00:00:46,760 +Tor用三層加密嚟保護您嘅連線 + +15 +00:00:46,940 --> 00:00:51,760 +同埋經由三個世界各地義務營運嘅伺服器 + +16 +00:00:52,280 --> 00:00:55,520 +從而容許您喺互聯網上匿名地溝通 + +17 +00:00:58,560 --> 00:01:00,280 +Tor亦都保護您嘅資料 + +18 +00:01:00,400 --> 00:01:03,900 +遠離大公司或者政府嘅監控 + +19 +00:01:04,880 --> 00:01:09,340 +可能您住喺一個強權管治，嘗試控制同埋監視互聯網嘅國家 + +20 +00:01:09,900 --> 00:01:13,800 +或者您唔想大公司利用您嘅個人資訊 + +21 +00:01:14,880 --> 00:01:17,640 +Tor令到所有用戶望上去一模一樣 + +22 +00:01:17,920 --> 00:01:20,800 +從而令到睇嘅睇唔清，令到你變成匿名 + +23 +00:01:21,500 --> 00:01:24,980 +所以，愈多人用Tor，Tor就變得愈強 + +24 +00:01:25,140 --> 00:01:29,800 +因為可以更容易令一班人望落一模一樣 + +25 +00:01:30,700 --> 00:01:33,240 +同埋無拘無束地越過網絡審查 + +26 +00:01:33,400 --> 00:01:36,100 +而且審查者唔知您上網做咗啲乜 + +27 +00:01:38,540 --> 00:01:41,440 +一式一樣嘅廣告唔會跟住您幾個月 + +28 +00:01:41,640 --> 00:01:43,300 +因為您最初㩒咗落一個廣告度 + +29 +00:01:45,880 --> 00:01:49,380 +透過使用Tor，您上嘅網站唔會知道您係邊個 + +30 +00:01:49,540 --> 00:01:51,760 +唔會知你喺世界邊度上佢個網站 + +31 +00:01:51,920 --> 00:01:53,920 +除非您登入話畀佢知你係邊個 + +32 +00:01:56,200 --> 00:01:57,840 +透過下載同使用Tor， + +33 +00:01:58,200 --> 00:02:00,560 +您可以保護一啲需要隱姓埋名嘅人 + +34 +00:02:00,880 --> 00:02:03,640 +例如活動家，記者同埋博客 + +35 +00:02:04,000 --> 00:02:09,000 +下載同埋用Tor，或者營運一個節點啦！ +

1 0

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 11 Apr '15

11 Apr '15

commit 6d37c5b17214c0de7f274d809cd0d7c98c6ba695 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 11 15:45:55 2015 +0000 Update translations for tor_animation --- zh_HK.srt | 61 ++++++++++++++++++++++--------------------------------------- 1 file changed, 22 insertions(+), 39 deletions(-) diff --git a/zh_HK.srt b/zh_HK.srt index d8a8032..cc7e1f8 100644 --- a/zh_HK.srt +++ b/zh_HK.srt @@ -54,106 +54,89 @@ Tor保護您嘅個人私隱同埋您嘅身份 14 00:00:43,560 --> 00:00:46,760 -Tor secures your connection -with three layers of encryption +Tor用三層加密嚟保護您嘅連線 15 00:00:46,940 --> 00:00:51,760 -and passes it through three voluntarily -operated servers around the world, +同埋經由三個世界各地義務營運嘅伺服器 16 00:00:52,280 --> 00:00:55,520 -which enables us to communicate -anonymously over the Internet. +從而容許您喺互聯網上匿名地溝通 17 00:00:58,560 --> 00:01:00,280 -Tor also protects our data +Tor亦都保護您嘅資料 18 00:01:00,400 --> 00:01:03,900 -against corporate or government targeted -and mass surveillance. +遠離大公司或者政府嘅監控 19 00:01:04,880 --> 00:01:09,340 -Perhaps you live in a repressive country -which tries to control and surveil the Internet. +可能您住喺一個強權管治，嘗試控制同埋監視互聯網嘅國家 20 00:01:09,900 --> 00:01:13,800 -Or perhaps you don't want big corporations -taking advantage of your personal information. +或者您唔想大公司利用您嘅個人資訊 21 00:01:14,880 --> 00:01:17,640 -Tor makes all of its users -to look the same +Tor令到所有用戶望上去一模一樣 22 00:01:17,920 --> 00:01:20,800 -which confuses the observer -and makes you anonymous. +從而令到睇嘅睇唔清，令到你變成匿名 23 00:01:21,500 --> 00:01:24,980 -So, the more people use the Tor network, -the stronger it gets +所以，愈多人用Tor，Tor就變得愈強 24 00:01:25,140 --> 00:01:29,800 -as it's easier to hide in a crowd -of people who look exactly the same. +因為可以更容易令一班人望落一模一樣 25 00:01:30,700 --> 00:01:33,240 -You can bypass the censorship -without being worried about +同埋無拘無束地越過網絡審查 26 00:01:33,400 --> 00:01:36,100 -the censor knowing what you do -on the Internet. +而且審查者唔知您上網做咗啲乜 27 00:01:38,540 --> 00:01:41,440 -The ads won't follow you -everywhere for months, +一式一樣嘅廣告唔會跟住您幾個月 28 00:01:41,640 --> 00:01:43,300 -starting when you first -clicked on a product. +因為您最初㩒咗落一個廣告度 29 00:01:45,880 --> 00:01:49,380 -By using Tor, the sites you visit -won't even know who you are, +透過使用Tor，您上嘅網站唔會知道您係邊個 30 00:01:49,540 --> 00:01:51,760 -from what part of the world -you're visiting them, +唔會知你喺世界邊度上佢個網站 31 00:01:51,920 --> 00:01:53,920 -unless you login and tell them so. +除非您登入話畀佢知你係邊個 32 00:01:56,200 --> 00:01:57,840 -By downloading and using Tor, +透過下載同使用Tor， 33 00:01:58,200 --> 00:02:00,560 -you can protect the people -who need anonymity, +您可以保護一啲需要隱姓埋名嘅人 34 00:02:00,880 --> 00:02:03,640 -like activists, journalists and bloggers. +例如活動家，記者同埋博客 35 00:02:04,000 --> 00:02:09,000 -Download and use Tor! Or run a relay! +下載同埋用Tor，或者營運一個節點啦！

1 0