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

[translation/gettor] Update translations for gettor
by translation＠torproject.org 12 Jan '14

12 Jan '14

commit 2dad3708319fc120b22ce7e90b88487fc11128e8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 12 07:45:08 2014 +0000 Update translations for gettor --- he/gettor.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/he/gettor.po b/he/gettor.po index 0826af5..a52c640 100644 --- a/he/gettor.po +++ b/he/gettor.po @@ -6,14 +6,15 @@ # aharonoosh <aharonoosh1(a)gmail.com>, 2012 # Elifelet <arab.with.nargila(a)gmail.com>, 2012 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 +# Kunda, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-04-29 09:24+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"PO-Revision-Date: 2014-01-12 07:41+0000\n" +"Last-Translator: Kunda\n" +"Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -466,7 +467,7 @@ msgid "" "The Browser Bundle (TBB) is the package we recommend to most users. \n" "The bundle comes with everything you need to safely browse the Internet.\n" "Just extract it and run." -msgstr "" +msgstr "חבילת הדפדפן (TBB) היא החבילה אנו ממליצים למרבית המשתמשים.\nהחבילה מגיעה עם כל מה שאתם צריכים כדי לגלוש באינטרנט בבטחה.\nפשוט לפרוס את החבילה ולהריץ." #: lib/gettor/i18n.py:292 msgid "What package should I request?"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 12 Jan '14

12 Jan '14

commit da9daf1bd3b2965ac1ddb2b75721dd5b39cb26ad Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 12 07:45:05 2014 +0000 Update translations for bridgedb_completed --- he/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/he/LC_MESSAGES/bridgedb.po b/he/LC_MESSAGES/bridgedb.po index 2c00bfb..7090f7a 100644 --- a/he/LC_MESSAGES/bridgedb.po +++ b/he/LC_MESSAGES/bridgedb.po @@ -6,14 +6,15 @@ # Translators: # aharonoosh <aharonoosh1(a)gmail.com>, 2012 # GenghisKhan <genghiskhan(a)gmx.ca>, 2013 +# Kunda, 2014 # static172 <static.172(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-07-21 06:40+0000\n" -"Last-Translator: GenghisKhan <genghiskhan(a)gmx.ca>\n" +"PO-Revision-Date: 2014-01-12 07:20+0000\n" +"Last-Translator: Kunda\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -82,7 +83,7 @@ msgstr "צעד 1" #: lib/bridgedb/templates/index.html:8 #, python-format msgid "Get %s Tor Browser Bundle %s" -msgstr "השג את %s Tor Browser Bundle %s" +msgstr "השג את %s חבילת הדפדפן של Tor %s" #: lib/bridgedb/templates/index.html:13 msgid "Step 2"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 12 Jan '14

12 Jan '14

commit fdb006f0ca0ec46ced9923d6f563ec2609a8802e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 12 07:45:03 2014 +0000 Update translations for bridgedb --- he/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/he/LC_MESSAGES/bridgedb.po b/he/LC_MESSAGES/bridgedb.po index 2c00bfb..7090f7a 100644 --- a/he/LC_MESSAGES/bridgedb.po +++ b/he/LC_MESSAGES/bridgedb.po @@ -6,14 +6,15 @@ # Translators: # aharonoosh <aharonoosh1(a)gmail.com>, 2012 # GenghisKhan <genghiskhan(a)gmx.ca>, 2013 +# Kunda, 2014 # static172 <static.172(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-07-21 06:40+0000\n" -"Last-Translator: GenghisKhan <genghiskhan(a)gmx.ca>\n" +"PO-Revision-Date: 2014-01-12 07:20+0000\n" +"Last-Translator: Kunda\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -82,7 +83,7 @@ msgstr "צעד 1" #: lib/bridgedb/templates/index.html:8 #, python-format msgid "Get %s Tor Browser Bundle %s" -msgstr "השג את %s Tor Browser Bundle %s" +msgstr "השג את %s חבילת הדפדפן של Tor %s" #: lib/bridgedb/templates/index.html:13 msgid "Step 2"

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 12 Jan '14

12 Jan '14

commit 54618dc3d8b282fcce6c02285d3809705457533d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 12 07:16:24 2014 +0000 Update translations for torbutton-torbuttonproperties --- he/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/torbutton.properties b/he/torbutton.properties index 0341883..f2398e5 100644 --- a/he/torbutton.properties +++ b/he/torbutton.properties @@ -35,7 +35,7 @@ torbutton.popup.captcha.always = בצע תמיד פעולה זו מעתה והל torbutton.popup.redirect = עבור torbutton.popup.no_redirect = אל תעבור torbutton.popup.prompted_language = על מנת לזכות בפרטיות מוגברת, Torbutton יכול לבקש את הגרסה האנגלית של אתרי אינטרנט. זה עשוי לגרום לכך שאתרים אליהם אתה רגיל יוצגו באנגלית.\n\nהאם ברצונך לבקש לצפות באתרים באנגלית לצורך פרטיות מוגברת? -torbutton.popup.no_newnym = Torbutton אינו מסוגל לספק לך זהות חדשה בביטחון. אין גישה אל Tor Control Port.\n\nהאם אתה מפעיל את +torbutton.popup.no_newnym = Torbutton אינו מסוגל לספק לך זהות חדשה בביטחון. אין גישה אל Tor Control Port.\n\nהאם אתה מפעיל את חבילת הדפדפן של טור? torbutton.popup.use_tbb = נראה שאתה משתמש ב-Torbutton עם פיירפוקס, דבר שאינו מומלץ עוד.\n\nבמקום, אנו ממליצים שתשתמש בגרזה האחרונה של Tor Browser Bundle, אותה תוכל להשיג באמצעות דוא"ל לכתובת gettor(a)torproject.org או בהורדה מהכתובת: torbutton.popup.pref_error = Torbutton אינו יכול לעדכן את ההעדפות בתיקית הפרופיל. torbutton.popup.permission_denied = אנא קבע הרשאות חדשות לתיקייה בה נמצא דפדפן Tor או העתק אותו למיקום חדש.

1 0

[bridgedb/master] Refactor PluggableTransport.getTransportLine() to remove `keyid=`.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit f5adabe5392f0ec67079f8794ced9a6df487ca38 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 02:42:37 2014 +0000 Refactor PluggableTransport.getTransportLine() to remove `keyid=`. * FIXES #10559 * FIXES a bunch of PEP8 problems. * CHANGE getTransportLine() to use `' '.join()` rather than formatting the bridge line inside the return statement. It's faster and safer. --- lib/bridgedb/Bridges.py | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index dd0a7a9..cbc86f9 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -413,14 +413,23 @@ class PluggableTransport: :returns: A configuration line for adding this pluggable transport into a torrc file. """ - if isinstance(self.address,ipaddr.IPv6Address): - address = "[%s]" % self.address - else: address = self.address - host = "%s %s:%d" % (self.methodname, address, self.port) - fp = '' - if includeFingerprint: fp = "keyid=%s" % self.bridge.fingerprint - args = ",".join(["%s=%s"%(k,v) for k,v in self.argdict.items()]).strip() - return "%s %s %s" % (host, fp, args) + sections = [] + + + if isinstance(self.address, ipaddr.IPv6Address): + host = "%s [%s]:%d" % (self.methodname, self.address, self.port) + else: + host = "%s %s:%d" % (self.methodname, self.address, self.port) + sections.append(host) + + if includeFingerprint: + sections.append(self.bridge.fingerprint) + + args = ",".join(["%s=%s" % (k, v) for k, v in self.argdict.items()]) + sections.append(args) + + line = ' '.join(sections) + return line def parseExtraInfoFile(f): """

1 0

[bridgedb/master] Merge branch 'fix/6127-web-server-tracebacks' into develop
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit ff4e39ed6f4c68664be5d521b72a151ffdc11073 Merge: 5c646aa d23599a Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 02:01:13 2014 +0000 Merge branch 'fix/6127-web-server-tracebacks' into develop lib/bridgedb/HTTPServer.py | 65 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 7 deletions(-)

1 0

[bridgedb/master] Add exception-catching wrapper to bridgedb.HTTPServer.render().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit d23599a5b87f0e85a65b35575457d0c0f785eacb Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 01:37:51 2014 +0000 Add exception-catching wrapper to bridgedb.HTTPServer.render(). * ADD a wrapper which catches all unhandled exceptions which occur while generating an HTML response. If such an exception occurs, this ensures that the error is logged and the default "No bridges currently available" response is served to the client (rather than display a traceback to the client, which is what BridgeDB did previously). * FIXES #6127 --- lib/bridgedb/HTTPServer.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 856a753..fc637a4 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -150,9 +150,25 @@ class WebResource(twisted.web.resource.Resource): def render(self, request): """Render a response for a client HTTP request. - Presently, this method merely returns :meth:`getBridgeRequestAnswer`. + Presently, this method merely wraps :meth:`getBridgeRequestAnswer` to + catch any unhandled exceptions which occur (otherwise the server will + display the traceback to the client). If an unhandled exception *does* + occur, the client will be served the default "No bridges currently + available" HTML response page. + + :type request: :api:`twisted.web.http.Request` + :param request: A ``Request`` object containing the HTTP method, full + URI, and any URL/POST arguments and headers present. + :rtype: str + :returns: A plaintext or HTML response to serve. """ - return self.getBridgeRequestAnswer(request) + try: + response = self.getBridgeRequestAnswer(request) + except Exception as err: + logging.exception(err) + response = self.renderAnswer(request) + + return response def getBridgeRequestAnswer(self, request): """Respond to a client HTTP request for bridges.

1 0

[bridgedb/master] Make the 'Bridge ' prefix optional in PluggableTransport.getTransportLine().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 4476867c0747b3ee884c296b2c8bef16ae8b18b1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 02:45:38 2014 +0000 Make the 'Bridge ' prefix optional in PluggableTransport.getTransportLine(). --- lib/bridgedb/Bridges.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index cbc86f9..67fa963 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -398,7 +398,7 @@ class PluggableTransport: self.argdict = argdict else: self.argdict = {} - def getTransportLine(self, includeFingerprint=False): + def getTransportLine(self, includeFingerprint=False, bridgePrefix=False): """Get a torrc line for this pluggable transport. This method does not return lines which are prefixed with the word @@ -409,12 +409,17 @@ class PluggableTransport: :param bool includeFingerprints: If ``True``, include the digest of this bridges public identity key in the torrc line. + :param bool bridgePrefix: If ``True``, add ``'Bridge '`` to the + beginning of each returned line (suitable for pasting directly + into a torrc file). :rtype: str :returns: A configuration line for adding this pluggable transport into a torrc file. """ sections = [] + if bridgePrefix: + sections.append('Bridge') if isinstance(self.address, ipaddr.IPv6Address): host = "%s [%s]:%d" % (self.methodname, self.address, self.port)

1 0

[bridgedb/master] Log countryCodes in BridgeRing.getBridges().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 06f67dc2cb58ea304e4873fbf2f34da412056ea6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 03:05:16 2014 +0000 Log countryCodes in BridgeRing.getBridges(). This is to see if they are ever actually passed into this function. They weren't being used anywhere inside BridgeRing.getBridges(), nor anywhere else. --- lib/bridgedb/Bridges.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 416c1df..73f7d4e 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -853,6 +853,14 @@ class BridgeRing(BridgeHolder): :rtype: list :returns: A list of :class:`~bridgedb.Bridges.Bridge`s. """ + # XXX This can be removed after we determine if countryCode is ever + # actually being used. It seems the countryCode should be passed in + # from bridgedb.HTTPServer.WebResource.getBridgeRequestAnswer() in + # order to hand out bridges which are believed to not be blocked in a + # given country. + if countryCode: + logging.debug("getBridges: countryCode=%r" % countryCode) + forced = [] for _, _, count, subring in self.subrings: if len(subring) < count:

1 0

[bridgedb/master] Use bridges.ip in log message in BridgeRing.insert().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit c953078252c14019cf08172eb7cdd3bc479f44e0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 03:03:38 2014 +0000 Use bridges.ip in log message in BridgeRing.insert(). * REMOVE the comment and other cruft around it. --- lib/bridgedb/Bridges.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index dd0a7a9..416c1df 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -783,10 +783,7 @@ class BridgeRing(BridgeHolder): self.isSorted = False self.bridges[pos] = bridge self.bridgesByID[ident] = bridge - #XXX: just use bridge.ip - if isinstance(bridge.ip, ipaddr.IPv6Address): ip = "[%s]" % bridge.ip - else: ip = bridge.ip - logging.debug("Adding %s to %s", ip, self.name) + logging.debug("Adding %s to %s" % (bridge.ip, self.name)) def _sort(self): """Helper: put the keys in sorted order."""

1 0