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

[bridgedb/develop] Fix ReCaptchaProtectedResource.checkSolution() to pull response from deferred.
by isis＠torproject.org 17 Mar '14

17 Mar '14

commit 45876ea43d4aa570d5801aed244d753624af9543 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 17 00:05:34 2014 +0000 Fix ReCaptchaProtectedResource.checkSolution() to pull response from deferred. * FIXES a bug introduced in #11127 where checkSolution() was expecting the boolean response from the reCaptcha API server, not a deferred as is now returned. --- lib/bridgedb/HTTPServer.py | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 49700c5..e9abc78 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -424,19 +424,24 @@ class ReCaptchaProtectedResource(CaptchaProtectedResource): challenge, response = self.extractClientSolution(request) clientIP = self.getClientIP(request) remoteIP = self.getRemoteIP() - solution = txrecaptcha.submit(challenge, response, - self.recaptchaPrivKey, remoteIP) + logging.debug("Captcha from %r. Parameters: %r" % (Util.logSafely(clientIP), request.args)) - if solution.is_valid: - logging.info("Valid CAPTCHA solution from %r." - % Util.logSafely(clientIP)) - return True - else: - logging.info("Invalid CAPTCHA solution from %r: %r" - % (Util.logSafely(clientIP), solution.error_code)) - return False + + def checkResponse(solution, clientIP): + if solution.is_valid: + logging.info("Valid CAPTCHA solution from %r." + % Util.logSafely(clientIP)) + return True + else: + logging.info("Invalid CAPTCHA solution from %r: %r" + % (Util.logSafely(clientIP), solution.error_code)) + return False + + d = txrecaptcha.submit(challenge, response, self.recaptchaPrivKey, + remoteIP).addCallback(checkResponse, clientIP) + return d def render_GET(self, request): """Retrieve a ReCaptcha from the API server and serve it to the client.

1 0

[bridgedb/develop] Merge branch 'fix/11218-deferred-solution-isvalid' into develop
by isis＠torproject.org 17 Mar '14

17 Mar '14

commit f5230149ea962a652512440f29ccd1d2fbf233a4 Merge: d40b410 45876ea Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 17 00:36:44 2014 +0000 Merge branch 'fix/11218-deferred-solution-isvalid' into develop lib/bridgedb/HTTPServer.py | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)

1 0

[stem/master] EventType mistakenly listed HS_DIR rather then HS_DESC
by atagar＠torproject.org 16 Mar '14

16 Mar '14

commit d3bcdb32eb6c4942f524c0c513b5ce625f4ff9e8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 16 16:05:32 2014 -0700 EventType mistakenly listed HS_DIR rather then HS_DESC Oops. Another mistake spotted by wfn. --- stem/control.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/control.py b/stem/control.py index 44f555a..4d7f5b3 100644 --- a/stem/control.py +++ b/stem/control.py @@ -122,7 +122,7 @@ providing its own for interacting at a higher level. **DESCCHANGED** :class:`stem.response.events.DescChangedEvent` **ERR** :class:`stem.response.events.LogEvent` **GUARD** :class:`stem.response.events.GuardEvent` - **HS_DIR** :class:`stem.response.events.HSDescEvent` + **HS_DESC** :class:`stem.response.events.HSDescEvent` **INFO** :class:`stem.response.events.LogEvent` **NEWCONSENSUS** :class:`stem.response.events.NewConsensusEvent` **NEWDESC** :class:`stem.response.events.NewDescEvent` @@ -197,7 +197,7 @@ EventType = stem.util.enum.UppercaseEnum( "DESCCHANGED", "ERR", "GUARD", - "HS_DIR", + "HS_DESC", "INFO", "NEWCONSENSUS", "NEWDESC",

1 0

[stem/master] Adding HS_DIR to the EventType enum
by atagar＠torproject.org 16 Mar '14

16 Mar '14

commit fbe7505822d16810dad8f3255b99053116962882 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 16 16:03:28 2014 -0700 Adding HS_DIR to the EventType enum Oops, we documented HS_DIR but didn't actually include it in the enum. Spotted by wfn. Also sorting the enum to make it match the docs. --- stem/control.py | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/stem/control.py b/stem/control.py index b0832ed..44f555a 100644 --- a/stem/control.py +++ b/stem/control.py @@ -185,31 +185,32 @@ from stem.util import log State = stem.util.enum.Enum("INIT", "RESET", "CLOSED") EventType = stem.util.enum.UppercaseEnum( - "CIRC", - "STREAM", - "ORCONN", + "ADDRMAP", + "AUTHDIR_NEWDESCS", + "BUILDTIMEOUT_SET", "BW", + "CIRC", + "CIRC_MINOR", + "CONF_CHANGED", + "CLIENTS_SEEN", "DEBUG", - "INFO", - "NOTICE", - "WARN", + "DESCCHANGED", "ERR", + "GUARD", + "HS_DIR", + "INFO", + "NEWCONSENSUS", "NEWDESC", - "ADDRMAP", - "AUTHDIR_NEWDESCS", - "DESCCHANGED", - "STATUS_GENERAL", + "NOTICE", + "NS", + "ORCONN", + "SIGNAL", "STATUS_CLIENT", + "STATUS_GENERAL", "STATUS_SERVER", - "GUARD", - "NS", + "STREAM", "STREAM_BW", - "CLIENTS_SEEN", - "NEWCONSENSUS", - "BUILDTIMEOUT_SET", - "SIGNAL", - "CONF_CHANGED", - "CIRC_MINOR", + "WARN", ) Listener = stem.util.enum.UppercaseEnum(

1 0

[torbirdy/master] added version, homepage and source of gpg.conf optimized for privacy
by sukhbir＠torproject.org 16 Mar '14

16 Mar '14

commit c00d91959121a265111e335457e25605a9a0a21a Author: Patrick Schleizer <adrelanos(a)riseup.net> Date: Tue Mar 11 19:19:06 2014 +0000 added version, homepage and source of gpg.conf optimized for privacy --- gpg.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gpg.conf b/gpg.conf index 32b146c..82a20c7 100644 --- a/gpg.conf +++ b/gpg.conf @@ -1,4 +1,8 @@ -## gpg.conf optimized for privacy +## gpg.conf optimized for privacy 0.2 +## homepage: +## https://github.com/ioerror/torbirdy/pull/11 +## source: +## https://github.com/ioerror/torbirdy/blob/master/gpg.conf ################################################################## ## BEGIN some suggestions from TorBirdy setting extensions.enigmail.agentAdditionalParam

1 0

[torbirdy/master] Merge pull request #15 from adrelanos/gpg.conf_comments
by sukhbir＠torproject.org 16 Mar '14

16 Mar '14

commit 89f771363ababcbb718b64136e1bcd545c67171c Merge: a178f33 c00d919 Author: Sukhbir Singh <sukhbir.in(a)gmail.com> Date: Tue Mar 11 20:10:50 2014 -0400 Merge pull request #15 from adrelanos/gpg.conf_comments added version, homepage and source of gpg.conf optimized for privacy gpg.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 16 Mar '14

16 Mar '14

commit 2d9e7cc0ee8f37c47166f6d690299fdce4996090 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 16 21:15:33 2014 +0000 Update translations for tor-launcher-properties --- cy/torlauncher.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cy/torlauncher.properties b/cy/torlauncher.properties index e3c315d..bbb1f49 100644 --- a/cy/torlauncher.properties +++ b/cy/torlauncher.properties @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=Dylech benodi un neu mwy o bontydd. # torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. # torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -# torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(awgrymwyd) torlauncher.connect=Cysylltu torlauncher.quit=Cau @@ -44,11 +44,11 @@ torlauncher.bootstrapStatus.loading_status=Yn llwytho statws rhwydwaith # torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information # torlauncher.bootstrapStatus.loading_descriptors=Loading relay information torlauncher.bootstrapStatus.conn_or=Cysylltu â'r rhwydwaith Tor -# torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit +torlauncher.bootstrapStatus.handshake_or=Yn sefydlu cylched Tor torlauncher.bootstrapStatus.done=Cysylltwyd â rhwydwaith Tor! # torlauncher.bootstrapWarning.done=done -# torlauncher.bootstrapWarning.connectrefused=connection refused +torlauncher.bootstrapWarning.connectrefused=gwrthodwyd y cysylltiad # torlauncher.bootstrapWarning.misc=miscellaneous # torlauncher.bootstrapWarning.resourcelimit=insufficient resources # torlauncher.bootstrapWarning.identity=identity mismatch

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 16 Mar '14

16 Mar '14

commit c97a8eafa445e58fe036bddf5165568f927d86be Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 16 21:15:28 2014 +0000 Update translations for mat-gui --- cy.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cy.po b/cy.po index 1bda263..d2ec0b5 100644 --- a/cy.po +++ b/cy.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-03-16 20:30+0000\n" +"PO-Revision-Date: 2014-03-16 21:00+0000\n" "Last-Translator: huwwaters <huwwaters(a)gmail.com>\n" "Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/language/cy/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgstr "Pob ffeil" #: mat-gui:142 msgid "Supported files" -msgstr "" +msgstr "Ffeiliau a gefnogwyd" #: mat-gui:157 msgid "No metadata found" @@ -181,7 +181,7 @@ msgstr "Cynnwys" #: data/mat.ui:452 msgid "Supported formats" -msgstr "" +msgstr "Fformatau a gefnogwyd" #: data/mat.ui:486 msgid "Support" @@ -197,4 +197,4 @@ msgstr "" #: data/mat.ui:560 msgid "Fileformat" -msgstr "" +msgstr "Fformat ffeil"

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 16 Mar '14

16 Mar '14

commit 114ab0175ab1fdb031a2f2837a51b5c3a1bdcb0c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 16 20:45:37 2014 +0000 Update translations for tor-launcher-properties --- cy/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cy/torlauncher.properties b/cy/torlauncher.properties index 715654f..e3c315d 100644 --- a/cy/torlauncher.properties +++ b/cy/torlauncher.properties @@ -38,7 +38,7 @@ torlauncher.forAssistance=Am gymorth, cysylltu â %S # torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory # torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -# torlauncher.bootstrapStatus.requesting_status=Retrieving network status +torlauncher.bootstrapStatus.requesting_status=Yn adalw statws y rhwydwaith torlauncher.bootstrapStatus.loading_status=Yn llwytho statws rhwydwaith # torlauncher.bootstrapStatus.loading_keys=Loading authority certificates # torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 16 Mar '14

16 Mar '14

commit 1231f4faabed471936837a79bef6ee0861da8bea Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 16 20:45:34 2014 +0000 Update translations for mat-gui --- cy.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cy.po b/cy.po index c84a47f..1bda263 100644 --- a/cy.po +++ b/cy.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-03-16 20:15+0000\n" +"PO-Revision-Date: 2014-03-16 20:30+0000\n" "Last-Translator: huwwaters <huwwaters(a)gmail.com>\n" "Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/language/cy/)\n" "MIME-Version: 1.0\n" @@ -106,7 +106,7 @@ msgstr "Enw ffeil" #: mat-gui:336 msgid "Reason" -msgstr "" +msgstr "Rheswm" #: mat-gui:348 msgid "Non-supported files in archive" @@ -128,12 +128,12 @@ msgstr "" #: mat-gui:394 #, python-format msgid "Checking %s" -msgstr "" +msgstr "Yn gwirio %s" #: mat-gui:409 #, python-format msgid "Cleaning %s" -msgstr "" +msgstr "Yn glanhau %s" #: data/mat.ui:63 msgid "_File" @@ -177,7 +177,7 @@ msgstr "Enw" #: data/mat.ui:390 msgid "Content" -msgstr "" +msgstr "Cynnwys" #: data/mat.ui:452 msgid "Supported formats" @@ -185,11 +185,11 @@ msgstr "" #: data/mat.ui:486 msgid "Support" -msgstr "" +msgstr "Cymorth" #: data/mat.ui:512 msgid "Method" -msgstr "" +msgstr "Dull" #: data/mat.ui:525 msgid "Remaining"

1 0