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

[flashproxy/master] Fix scope of SSLError.
by dcf＠torproject.org 09 Oct '13

09 Oct '13

commit df44d5a94ca30f836b06729580d4d1afec027e3d Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 9 13:13:48 2013 -0700 Fix scope of SSLError. --- facilitator/facilitator-email-poller | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index bd70f34..49af526 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -406,7 +406,7 @@ while True: try: imap = imap_login() imap_loop(imap) - except (imaplib.IMAP4.abort, ssl.SSLError, M2Crypto.SSL.SSLError, socket.error), e: + except (imaplib.IMAP4.abort, ssl.SSLError, SSL.SSLError, socket.error), e: # Try again after a disconnection. log(u"lost server connection: %s" % str(e)) except KeyboardInterrupt:

1 0

[tor/master] Or maybe it is 2013. Who can say?
by nickm＠torproject.org 09 Oct '13

09 Oct '13

commit 3b6c48328b03d7f0e639785fbdf268c0d973f16f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 12:48:18 2013 -0400 Or maybe it is 2013. Who can say? --- src/config/torrc.sample.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 5822fa6..d842fbc 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -1,5 +1,5 @@ ## Configuration file for a typical Tor user -## Last updated 9 October 2012 for Tor 0.2.5.2-alpha. +## Last updated 9 October 2013 for Tor 0.2.5.2-alpha. ## (may or may not work for much older or much newer versions of Tor.) ## ## Lines that begin with "## " try to explain what's going on. Lines

1 0

[tor/master] Merge remote-tracking branch 'karsten/task-9854-2'
by nickm＠torproject.org 09 Oct '13

09 Oct '13

commit bcde4cc4cf521c8e125e95cdd793aa499d1a36c7 Merge: 0e3cf3e 795c0f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 12:36:24 2013 -0400 Merge remote-tracking branch 'karsten/task-9854-2' src/config/torrc.sample.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Update last modified timestamp of torrc.sample.in.
by nickm＠torproject.org 09 Oct '13

09 Oct '13

commit 795c0f7b002b849a2e81ea7306420085fb159286 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Oct 9 17:41:05 2013 +0200 Update last modified timestamp of torrc.sample.in. --- src/config/torrc.sample.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 78013c2..5822fa6 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -1,5 +1,5 @@ ## Configuration file for a typical Tor user -## Last updated 12 September 2012 for Tor 0.2.4.3-alpha. +## Last updated 9 October 2012 for Tor 0.2.5.2-alpha. ## (may or may not work for much older or much newer versions of Tor.) ## ## Lines that begin with "## " try to explain what's going on. Lines

1 0

[tor/master] Partially revert "Clarify who learns about ContactInfo."
by nickm＠torproject.org 09 Oct '13

09 Oct '13

commit 73a0bb16b9b750be9a51470ff57ee654787836d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 12:02:53 2013 -0400 Partially revert "Clarify who learns about ContactInfo." This reverts the torrc.sample.in changes from commit 66a04a6ac334775dc396025e0c15fa49eca138a7. We're going to not make this change in 0.2.4, since changing torrc.sample.in makes all the debian users do some pointless busywork. see tor-dev discusion of 9 Oct 2013. --- src/config/torrc.sample.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 78013c2..c667efc 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -120,12 +120,9 @@ ## is per month) #AccountingStart month 3 15:00 -## Administrative contact information for this relay or bridge. This line -## can be used to contact you if your relay or bridge is misconfigured or -## something else goes wrong. Note that we archive and publish all -## descriptors containing these lines and that Google indexes them, so -## spammers might also collect them. You may want to obscure the fact that -## it's an email address and/or generate a new address for this purpose. +## Contact info to be published in the directory, so we can contact you +## if your relay is misconfigured or something else goes wrong. Google +## indexes this, so spammers might also collect it. #ContactInfo Random Person <nobody AT example dot com> ## You might also include your PGP or GPG fingerprint if you have one: #ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com>

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 09 Oct '13

09 Oct '13

commit 0e3cf3ebf82a5f53b551ac87bfa1db6887bf6e66 Merge: 882fb83 73a0bb1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 12:07:01 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' Use "ours" strategy to avoid taking 73a0bb16b9b750be9a51470ff5 from 0.2.4. We _do_ want to keep torrc.sample.in changes in 0.2.5.

1 0

[tor/maint-0.2.4] Partially revert "Clarify who learns about ContactInfo."
by nickm＠torproject.org 09 Oct '13

09 Oct '13

commit 73a0bb16b9b750be9a51470ff57ee654787836d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 12:02:53 2013 -0400 Partially revert "Clarify who learns about ContactInfo." This reverts the torrc.sample.in changes from commit 66a04a6ac334775dc396025e0c15fa49eca138a7. We're going to not make this change in 0.2.4, since changing torrc.sample.in makes all the debian users do some pointless busywork. see tor-dev discusion of 9 Oct 2013. --- src/config/torrc.sample.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 78013c2..c667efc 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -120,12 +120,9 @@ ## is per month) #AccountingStart month 3 15:00 -## Administrative contact information for this relay or bridge. This line -## can be used to contact you if your relay or bridge is misconfigured or -## something else goes wrong. Note that we archive and publish all -## descriptors containing these lines and that Google indexes them, so -## spammers might also collect them. You may want to obscure the fact that -## it's an email address and/or generate a new address for this purpose. +## Contact info to be published in the directory, so we can contact you +## if your relay is misconfigured or something else goes wrong. Google +## indexes this, so spammers might also collect it. #ContactInfo Random Person <nobody AT example dot com> ## You might also include your PGP or GPG fingerprint if you have one: #ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com>

1 0

[stem/master] Mocking pydocs referenced functionality we've removed
by atagar＠torproject.org 09 Oct '13

09 Oct '13

commit e28032aebb14043c2149fe949ef49ddb82083c21 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 9 08:55:00 2013 -0700 Mocking pydocs referenced functionality we've removed --- test/mocking.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/mocking.py b/test/mocking.py index b076b1d..3f211e7 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -2,10 +2,7 @@ # See LICENSE for licensing information """ -Helper functions for creating mock objects and monkey patching to help with -testing. With python's builtin unit testing framework the setUp and test -functions set up mocking, which is then reverted in the tearDown method by -calling :func:`test.mocking.revert_mocking`. +Helper functions for creating mock objects. ::

1 0

[stem/master] Chaching version comparison and hash function
by atagar＠torproject.org 09 Oct '13

09 Oct '13

commit 281db911a5912836ceb63247b55d8f8300b639ec Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Oct 8 09:11:48 2013 -0700 Chaching version comparison and hash function Versions are intended to be read-only objects, so we might as well add caching for these methods. --- stem/version.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stem/version.py b/stem/version.py index 68faa36..613c4a5 100644 --- a/stem/version.py +++ b/stem/version.py @@ -187,6 +187,7 @@ class Version(object): return self.version_str + @lru_cache() def _compare(self, other, method): """ Compares version ordering according to the spec. @@ -247,6 +248,7 @@ class Version(object): return self._compare(other, lambda s, o: s >= o) + @lru_cache() def __hash__(self): my_hash = 0

1 0

[flashproxy/master] Link to #7733 also.
by dcf＠torproject.org 09 Oct '13

09 Oct '13

commit 21afa61e82c662eb27e9c831dbae97044ca46662 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 9 08:42:12 2013 -0700 Link to #7733 also. --- proxy/flashproxy.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index db47184..cb2ac9e 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -652,7 +652,8 @@ function FlashProxy() { this.begin_proxy = function(client_addr, relay_addr) { /* Start two proxy connections because of some versions of Tor making two pt connections: - https://lists.torproject.org/pipermail/tor-dev/2012-December/004221.html */ + https://lists.torproject.org/pipermail/tor-dev/2012-December/004221.html + https://trac.torproject.org/projects/tor/ticket/7733 */ this.make_proxy_pair(client_addr, relay_addr); this.make_proxy_pair(client_addr, relay_addr); };

1 0