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

[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

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

11 Apr '15

commit badf76274172c905f269b5eb1b69f7ffd0dfc614 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 11 15:15:52 2015 +0000 Update translations for tor_animation --- zh_HK.srt | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/zh_HK.srt b/zh_HK.srt index 78c998d..d8a8032 100644 --- a/zh_HK.srt +++ b/zh_HK.srt @@ -1,62 +1,56 @@ 1 00:00:00,660 --> 00:00:02,780 -We've gotten very used to the Internet. +我哋已經非常習慣有互聯網 2 00:00:03,120 --> 00:00:07,700 -We are constantly sharing information -about ourselves and our private lives: +我哋不停分享一啲關於我哋自己同埋個人生活嘅資訊 3 00:00:08,000 --> 00:00:09,960 -food we eat, people we meet, +我哋食嘅嘢，我哋見到嘅人 4 00:00:10,180 --> 00:00:12,480 -places we go, and the stuff we read. +我哋去嘅地方，我哋讀緊嘅書 5 00:00:13,280 --> 00:00:14,640 -Let me explain it better. +等我解釋長細啲啦 6 00:00:14,920 --> 00:00:17,740 -Right at this moment, -if someone attempts to look you up, +就喺呢個時候， +如果有人上網嘗試追蹤你 7 00:00:18,060 --> 00:00:22,480 -they'll see your real identity, -precise location, operating system, +佢哋可以見到你真正嘅身份， +準確嘅位置同你部電腦嘅作業系統 8 00:00:22,800 --> 00:00:26,500 -all the sites you've visited, -the browser you use to surf the web, +你上過嘅網站，你所用嘅瀏覽器 9 00:00:26,700 --> 00:00:29,140 -and so much more information -about you and your life +同埋好多好多關於你同埋你生活嘅資料 10 00:00:29,620 --> 00:00:32,460 -which you probably didn't mean -to share with unknown strangers, +你本身都唔發覺同咗啲三唔識七嘅人分享 11 00:00:32,920 --> 00:00:35,840 -who could easily use this data -to exploit you. +佢哋可以好容易地利用呢啲資料 12 00:00:36,220 --> 00:00:38,120 -But not if you're using Tor! +不過如果你用Tor嘅話 13 00:00:39,140 --> 00:00:42,840 -Tor Browser protects our privacy -and identity on the Internet. +Tor保護您嘅個人私隱同埋您嘅身份 14 00:00:43,560 --> 00:00:46,760

1 0