May 2014 - tor-commits - lists.torproject.org

[meek/master] Increase the meek-server readWriteTimeout from 10 s to 20 s.
by dcf＠torproject.org 07 May '14

07 May '14

commit f5d2a2e9c433e7af84de03abfc14385ac9092603 Author: David Fifield <david(a)bamsoftware.com> Date: Wed May 7 13:54:50 2014 -0700 Increase the meek-server readWriteTimeout from 10 s to 20 s. I want to see if this helps the user who reports timeouts during bootstrapping. https://trac.torproject.org/projects/tor/ticket/11612 I do in fact currently see a handful (few dozen in the last two weeks) meek-server log messages like: 2014/04/26 05:08:28 writing to response: write tcp 8.35.201.53:60920: i/o timeout 2014/04/26 06:10:53 writing to response: write tcp 8.35.201.53:56008: i/o timeout 2014/04/26 10:32:07 copying body to ORPort: read tcp 8.35.201.54:62350: i/o timeout --- meek-server/meek-server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index b77b765..c24b8cc 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -27,7 +27,7 @@ const ( // response. turnaroundTimeout = 10 * time.Millisecond // Passed as ReadTimeout and WriteTimeout when constructing the http.Server. - readWriteTimeout = 10 * time.Second + readWriteTimeout = 20 * time.Second maxSessionStaleness = 120 * time.Second )

1 0

[meek/master] Increase the urlfetch timeout from 10 s to 20 s.
by dcf＠torproject.org 07 May '14

07 May '14

commit c53692cf52be4f6a3b8abacfb5b8010b2c9936a7 Author: David Fifield <david(a)bamsoftware.com> Date: Wed May 7 13:28:28 2014 -0700 Increase the urlfetch timeout from 10 s to 20 s. I want to see if this helps the user who reports timeouts during bootstrapping. https://trac.torproject.org/projects/tor/ticket/11612 --- appengine/reflect.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine/reflect.go b/appengine/reflect.go index 27c5941..a5ac291 100644 --- a/appengine/reflect.go +++ b/appengine/reflect.go @@ -15,7 +15,7 @@ import ( const ( forwardURL = "http://meek.bamsoftware.com:7002/" // A timeout of 0 means to use the App Engine default (5 seconds). - urlFetchTimeout = 10 * time.Second + urlFetchTimeout = 20 * time.Second ) var context appengine.Context

1 0

[stem/master] Supporting microdescriptor's new 'id' parameter
by atagar＠torproject.org 07 May '14

07 May '14

commit 365d6b611262f5a9ec85ce49e98757bfef4a0931 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 7 08:25:04 2014 -0700 Supporting microdescriptor's new 'id' parameter Not something our callers will care about (the parameter's just present for collision prevention), so just adding for completeness. --- docs/change_log.rst | 4 ++++ stem/descriptor/microdescriptor.py | 12 ++++++++++++ test/unit/descriptor/microdescriptor.py | 11 +++++++++++ 3 files changed, 27 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index 482f056..f89de76 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -55,6 +55,10 @@ The following are only available within Stem's `git repository * The :func:`~stem.control.Controller.add_event_listener` method couldn't accept event types that Stem didn't already recognize. * The :class:`~stem.exit_policy.ExitPolicy` class couldn't be pickled. + * **Descriptors** + + * Added microdescriptor's new identity and identity_type attributes (:spec:`22cda72`) + * **Utilities** * Added :func:`stem.util.connection.port_usage` diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index 4c05df7..37e49f1 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -164,6 +164,8 @@ class Microdescriptor(Descriptor): :var list family: **\*** nicknames or fingerprints of declared family :var stem.exit_policy.MicroExitPolicy exit_policy: **\*** relay's exit policy :var stem.exit_policy.MicroExitPolicy exit_policy_v6: **\*** exit policy for IPv6 + :var str identifier_type: identity digest key type + :var str identifier: base64 encoded identity digest, this is only used for collision prevention (:trac:`11743`) **\*** attribute is required when we're parsed with validation """ @@ -180,6 +182,8 @@ class Microdescriptor(Descriptor): self.family = [] self.exit_policy = stem.exit_policy.MicroExitPolicy("reject 1-65535") self.exit_policy_v6 = None + self.identifier_type = None + self.identifier = None self._unrecognized_lines = [] @@ -266,6 +270,14 @@ class Microdescriptor(Descriptor): stem.descriptor.router_status_entry._parse_p_line(self, value, validate) elif keyword == "p6": self.exit_policy_v6 = stem.exit_policy.MicroExitPolicy(value) + elif keyword == "id": + value_comp = value.split() + + if len(value_comp) >= 2: + self.identifier_type = value_comp[0] + self.identifier = value_comp[1] + elif validate: + raise ValueError("'id' lines should contain both the key type and digest: %s" % line) else: self._unrecognized_lines.append(line) diff --git a/test/unit/descriptor/microdescriptor.py b/test/unit/descriptor/microdescriptor.py index 2644ffe..cd42f78 100644 --- a/test/unit/descriptor/microdescriptor.py +++ b/test/unit/descriptor/microdescriptor.py @@ -26,6 +26,8 @@ class TestMicrodescriptor(unittest.TestCase): self.assertEquals([], desc.family) self.assertEquals(stem.exit_policy.MicroExitPolicy("reject 1-65535"), desc.exit_policy) self.assertEquals(None, desc.exit_policy_v6) + self.assertEquals(None, desc.identifier_type) + self.assertEquals(None, desc.identifier) self.assertEquals([], desc.get_unrecognized_lines()) def test_unrecognized_line(self): @@ -92,3 +94,12 @@ class TestMicrodescriptor(unittest.TestCase): desc = get_microdescriptor({"p": "accept 80,110,143,443"}) self.assertEquals(stem.exit_policy.MicroExitPolicy("accept 80,110,143,443"), desc.exit_policy) + + def test_identifier(self): + """ + Basic check for 'id' lines. + """ + + desc = get_microdescriptor({"id": "rsa1024 Cd47okjCHD83YGzThGBDptXs9Z4"}) + self.assertEquals('rsa1024', desc.identifier_type) + self.assertEquals('Cd47okjCHD83YGzThGBDptXs9Z4', desc.identifier)

1 0

[torspec/master] Describe how implementations should (not) process "id rsa1024" lines
by nickm＠torproject.org 07 May '14

07 May '14

commit ee5887c40531f73616a68c64718e094fc43986d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 7 11:05:13 2014 -0400 Describe how implementations should (not) process "id rsa1024" lines --- dir-spec.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dir-spec.txt b/dir-spec.txt index 7e1fe13..37e3690 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1205,6 +1205,11 @@ encoded, without trailing =s. This line is included to prevent collisions between microdescriptors. + Implementations MUST ignore "id" lines with unrecognized + key-types in place of "rsa1024". Implementations SHOULD ignore + "id rsa1024" lines as well: they are added to microdescriptors + only to prevent collisions. + (Only included when generating microdescriptors for consensus-method 18 or later.)

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 07 May '14

07 May '14

commit 43d48d3669d2b7ade181f8e79bbfc756a834ca02 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 7 14:45:13 2014 +0000 Update translations for torcheck_completed --- zh_CN/torcheck.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zh_CN/torcheck.po b/zh_CN/torcheck.po index 90a5ef5..75d8d73 100644 --- a/zh_CN/torcheck.po +++ b/zh_CN/torcheck.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-03-26 10:53+0000\n" +"PO-Revision-Date: 2014-05-07 14:31+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -99,3 +99,6 @@ msgstr "JavaScript 已启用。" msgid "JavaScript is disabled." msgstr "JavaScript 已禁用。" + +msgid "However, it does not appear to be the Tor Browser Bundle." +msgstr "不过，你用的看起来并非 Tor Browser Bundle。"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 07 May '14

07 May '14

commit 4c66c7fb852433320ff51173878ba405e51c130d Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 7 14:45:10 2014 +0000 Update translations for torcheck --- zh_CN/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_CN/torcheck.po b/zh_CN/torcheck.po index 1eac560..75d8d73 100644 --- a/zh_CN/torcheck.po +++ b/zh_CN/torcheck.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 08:21+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-07 14:31+0000\n" +"Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -101,4 +101,4 @@ msgid "JavaScript is disabled." msgstr "JavaScript 已禁用。" msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "" +msgstr "不过，你用的看起来并非 Tor Browser Bundle。"

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 07 May '14

07 May '14

commit 770aa56a90eee7dc9f5ca608a86881624cd23baa Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 7 14:15:11 2014 +0000 Update translations for gettor_completed --- fr/gettor.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fr/gettor.po b/fr/gettor.po index 0af396e..12f24c9 100644 --- a/fr/gettor.po +++ b/fr/gettor.po @@ -11,14 +11,15 @@ # Pierre Antoine, 2011 # Pouknouki <pouknouki(a)gmail.com>, 2011 # romainbou <romain.bouye(a)gmail.com>, 2014 +# theolop, 2014 # Towatowa441, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-05-05 14:12+0000\n" -"Last-Translator: romainbou <romain.bouye(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-07 14:10+0000\n" +"Last-Translator: theolop\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,7 +47,7 @@ msgid "" "We only process requests from email services that support \"DKIM\",\n" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." -msgstr "Nous ne traitons que les demandes provenant de services de messagerie prenant en charge \"DKIM\",\nqui est une fonction de messagerie électronique qui nous permet de vérifier que l'adresse dans la\nligne «De» est en fait celui qui a envoyé le mail." +msgstr "Nous ne traitons que les demandes provenant de services de messagerie prenant en charge \"DKIM\",\nqui est une fonction de messagerie électronique qui nous permet de vérifier que l'adresse dans la\nligne «De» est bien celui qui a envoyé le mail." #: lib/gettor/i18n.py:39 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 07 May '14

07 May '14

commit d9662c75cb4f3eaaa4fd297692e1fad16be3befe Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 7 14:15:05 2014 +0000 Update translations for gettor --- fr/gettor.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fr/gettor.po b/fr/gettor.po index 0af396e..12f24c9 100644 --- a/fr/gettor.po +++ b/fr/gettor.po @@ -11,14 +11,15 @@ # Pierre Antoine, 2011 # Pouknouki <pouknouki(a)gmail.com>, 2011 # romainbou <romain.bouye(a)gmail.com>, 2014 +# theolop, 2014 # Towatowa441, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-05-05 14:12+0000\n" -"Last-Translator: romainbou <romain.bouye(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-07 14:10+0000\n" +"Last-Translator: theolop\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,7 +47,7 @@ msgid "" "We only process requests from email services that support \"DKIM\",\n" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." -msgstr "Nous ne traitons que les demandes provenant de services de messagerie prenant en charge \"DKIM\",\nqui est une fonction de messagerie électronique qui nous permet de vérifier que l'adresse dans la\nligne «De» est en fait celui qui a envoyé le mail." +msgstr "Nous ne traitons que les demandes provenant de services de messagerie prenant en charge \"DKIM\",\nqui est une fonction de messagerie électronique qui nous permet de vérifier que l'adresse dans la\nligne «De» est bien celui qui a envoyé le mail." #: lib/gettor/i18n.py:39 msgid ""

1 0

r26767: {website} add new mirror (website/trunk/include)
by Andrew Lewman 07 May '14

07 May '14

Author: phobos Date: 2014-05-07 14:12:47 +0000 (Wed, 07 May 2014) New Revision: 26767 Modified: website/trunk/include/tor-mirrors.csv Log: add new mirror Modified: website/trunk/include/tor-mirrors.csv =================================================================== --- website/trunk/include/tor-mirrors.csv 2014-05-07 14:12:31 UTC (rev 26766) +++ website/trunk/include/tor-mirrors.csv 2014-05-07 14:12:47 UTC (rev 26767) @@ -91,3 +91,4 @@ Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, FALSE, no, http://tor.wasifmalik.com/, , , , http://tor.wasifmalik.com/dist/, , , , Sat Apr 26 16:04:13 2014 fr33tux <AT> general-changelog-team.fr, Tor Supporter, FR, France, FR, TRUE, TRUE, No, http://tor.fr33tux.org, https://tor.fr33tux.org, , , http://tor.fr33tux.org/dist/, https://tor.fr33tux.org/dist/, , , Sat May 3 03:36:35 2014 mirror-service(a)netcologne.de, NetCologne GmbH, DE, NRW, TRUE, TRUE, No, http://mirror.netcologne.de/torproject.org, , rsync://mirror.netcologne.de/torproject.org, ftp://mirror.netcologne.de/torproject.org/, http://mirror.netcologne.de/torproject.org/dist, , rsync://mirror.netcologne.de/torproject.org/dist, , , +sebastian(at)bobrecki(dot)pl,Sebastian M. Bobrecki,PL,Poland,Europe,TRUE,FALSE,No,http://tor.iv.net.pl,https://tor.iv.net.pl,,,http://tor.iv.net.pl/dist/,https://tor.iv.net.pl/dist/,,,

1 0

r26766: {website} Bump version for TBB 3.6.1 (website/trunk/include)
by Mike Perry 07 May '14

07 May '14

Author: mikeperry Date: 2014-05-07 14:12:31 +0000 (Wed, 07 May 2014) New Revision: 26766 Modified: website/trunk/include/versions.wmi Log: Bump version for TBB 3.6.1 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2014-05-07 07:32:53 UTC (rev 26765) +++ website/trunk/include/versions.wmi 2014-05-07 14:12:31 UTC (rev 26766) @@ -23,10 +23,10 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>3.6</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>3.6</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>3.6.1</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>3.6.1</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>3.6</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>3.6.1</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>3.6-beta-2</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> @@ -37,8 +37,8 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.6</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.6</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.6.1</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.6.1</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>3.6-beta-2</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>3.6-beta-2</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> @@ -47,7 +47,7 @@ <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>3.6</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>3.6.1</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag> <define-tag version-torbrowserbundleosx32beta whitespace=delete>3.6-beta-2</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>

1 0