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

[stem/master] Fetching event descriptions directly, rather than use manual.py
by atagar＠torproject.org 22 May '16

22 May '16

commit c0af25275f66e36c05f721167949dd63ef4ebed3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 21 18:37:33 2016 -0700 Fetching event descriptions directly, rather than use manual.py Using the manual's _config() certainly did the trick, but kinda a hack. Populating our own cache of these. This now omits events from _config() so its cache is a little smaller. --- docs/change_log.rst | 1 + stem/control.py | 24 +++++++++++++++++++++--- stem/manual.py | 2 +- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index b443c69..ecfc49a 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -49,6 +49,7 @@ The following are only available within Stem's `git repository * :func:`~stem.connection.connect` and :func:`~stem.control.Controller.from_port` now connect to both port 9051 (relay's default) and 9151 (Tor Browser's default) (:trac:`16075`) * :class:`~stem.exit_policy.ExitPolicy` support for *accept6/reject6* and *\*4/6* wildcards (:trac:`16053`) * Added `support for NETWORK_LIVENESS events <api/response.html#stem.response.events.NetworkLivenessEvent>`_ (:spec:`44aac63`) + * Added :func:`~stem.control.event_description` for getting human-friendly descriptions of tor events (:trac:`19061`) * Added :func:`~stem.control.Controller.reconnect` to the :class:`~stem.control.Controller` * Added :func:`~stem.control.Controller.is_set` to the :class:`~stem.control.Controller` * Added :func:`~stem.control.Controller.is_user_traffic_allowed` to the :class:`~stem.control.Controller` diff --git a/stem/control.py b/stem/control.py index 621aaea..f1eb274 100644 --- a/stem/control.py +++ b/stem/control.py @@ -263,10 +263,10 @@ import stem.descriptor.reader import stem.descriptor.router_status_entry import stem.descriptor.server_descriptor import stem.exit_policy -import stem.manual import stem.response import stem.response.events import stem.socket +import stem.util.conf import stem.util.connection import stem.util.enum import stem.util.str_tools @@ -378,12 +378,15 @@ UNCACHEABLE_GETCONF_PARAMS = ( # number of sequential attempts before we decide that the Tor geoip database # is unavailable + GEOIP_FAILURE_THRESHOLD = 5 SERVER_DESCRIPTORS_UNSUPPORTED = "Tor is currently not configured to retrieve \ server descriptors. As of Tor version 0.2.3.25 it downloads microdescriptors \ instead unless you set 'UseMicrodescriptors 0' in your torrc." +EVENT_DESCRIPTIONS = None + class AccountingStats(collections.namedtuple('AccountingStats', ['retrieved', 'status', 'interval_end', 'time_until_reset', 'read_bytes', 'read_bytes_left', 'read_limit', 'written_bytes', 'write_bytes_left', 'write_limit'])): """ @@ -484,9 +487,24 @@ def event_description(event): :param str event: the event for which a description is needed - :returns: str The event description + :returns: str The event description or **None** if this is an event name we + don't have a description for """ - return stem.manual._config().get('event.description.%s' % event.lower(), None) + + global EVENT_DESCRIPTIONS + + if EVENT_DESCRIPTIONS is None: + config = stem.util.conf.Config() + config_path = os.path.join(os.path.dirname(__file__), 'settings.cfg') + + try: + config.load(config_path) + EVENT_DESCRIPTIONS = dict([(key.lower()[18:], config.get_value(key)) for key in config.keys() if key.startswith('event.description.')]) + except Exception as exc: + log.warn("BUG: stem failed to load its internal manual information from '%s': %s" % (config_path, exc)) + return None + + return EVENT_DESCRIPTIONS.get(event.lower()) class BaseController(object): diff --git a/stem/manual.py b/stem/manual.py index be7b224..1e2a5e1 100644 --- a/stem/manual.py +++ b/stem/manual.py @@ -141,7 +141,7 @@ def _config(lowercase = True): try: config.load(config_path) - config_dict = dict([(key.lower() if lowercase else key, config.get_value(key)) for key in config.keys()]) + config_dict = dict([(key.lower() if lowercase else key, config.get_value(key)) for key in config.keys() if key.startswith('manual.summary.')]) config_dict['manual.important'] = [name.lower() if lowercase else name for name in config.get_value('manual.important', [], multiple = True)] return config_dict except Exception as exc:

1 0

[translation/tor-messenger-fingerdtd_completed] Update translations for tor-messenger-fingerdtd_completed
by translation＠torproject.org 21 May '16

21 May '16

commit a2bdbdd323c9744c9482a31cb3c9d0d21c305a9f Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 21 20:16:27 2016 +0000 Update translations for tor-messenger-fingerdtd_completed --- de/finger.dtd | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/de/finger.dtd b/de/finger.dtd index 279636b..ddeb5a1 100644 --- a/de/finger.dtd +++ b/de/finger.dtd @@ -7,4 +7,9 @@ <!ENTITY finger.protocol "Protokoll"> <!ENTITY finger.verify "Überprüfen"> <!ENTITY finger.remove "Entfernen"> -<!ENTITY finger.intro "Verwalten Sie die Liste mit Fingerabdrücken, die Sie gesehen haben."> \ No newline at end of file +<!ENTITY finger.intro "Verwalten Sie die Liste mit Fingerabdrücken, die Sie gesehen haben."> +<!ENTITY addFingerDialog.title "Fingerabdruck hinzufügen"> +<!ENTITY addFingerDialog.finger "Fingerabdruck"> +<!ENTITY addFingerDialog.accept "OK"> +<!ENTITY addFingerDialog.cancel "Überspringen"> +<!ENTITY addFingerDialog.tooltip "Wenn Sie den 40 hexadezimale Zeichen langen Fingerabdruck von dem OTR privaten Schlüssel Ihres Kontakts kennen, geben Sie ihn jetzt ein."> \ No newline at end of file

1 0

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 21 May '16

21 May '16

commit 30dd1972f963aa5c6b17f8a9f5d518e7fd3b05a5 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 21 20:16:24 2016 +0000 Update translations for tor-messenger-fingerdtd --- de/finger.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/finger.dtd b/de/finger.dtd index e68cc7f..ddeb5a1 100644 --- a/de/finger.dtd +++ b/de/finger.dtd @@ -12,4 +12,4 @@ <!ENTITY addFingerDialog.finger "Fingerabdruck"> <!ENTITY addFingerDialog.accept "OK"> <!ENTITY addFingerDialog.cancel "Überspringen"> -<!ENTITY addFingerDialog.tooltip "If you know the 40 hex char fingerprint of your contact's OTR private key, enter it now."> \ No newline at end of file +<!ENTITY addFingerDialog.tooltip "Wenn Sie den 40 hexadezimale Zeichen langen Fingerabdruck von dem OTR privaten Schlüssel Ihres Kontakts kennen, geben Sie ihn jetzt ein."> \ No newline at end of file

1 0

[webwml/master] add fastly to our sponsors page
by arma＠torproject.org 21 May '16

21 May '16

commit 6d712f45bd0358dc4bae2809f5dd9162865736cb Author: Roger Dingledine <arma(a)torproject.org> Date: Sat May 21 14:41:08 2016 -0400 add fastly to our sponsors page --- about/en/sponsors.wml | 1 + 1 file changed, 1 insertion(+) diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml index 6d02f42..f783dee 100644 --- a/about/en/sponsors.wml +++ b/about/en/sponsors.wml @@ -31,6 +31,7 @@ <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Princeton University (2012-2016)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> via University of Minnesota (2013-2017)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgetown (2015-2018)</li> + <li><a href="https://www.fastly.com/">Fastly</a> (2016)</li> <li><a href="http://www.sri.com/">SRI International</a> (2011-2016)</li> <li><a href="http://www.state.gov/j/drl/">US Department of State Bureau of Democracy, Human Rights, and Labor</a> (2013-2016)</li> <li>An anonymous North American ISP (2009-present)</li>

1 0

[webwml/master] georgia tech isn't on that grant now that nick feamster moved to princeton
by arma＠torproject.org 21 May '16

21 May '16

commit 8e671654b67e6e23640741112aefec22a1c6acce Author: Roger Dingledine <arma(a)torproject.org> Date: Sat May 21 14:35:34 2016 -0400 georgia tech isn't on that grant now that nick feamster moved to princeton --- about/en/sponsors.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml index bdb3ac7..6d02f42 100644 --- a/about/en/sponsors.wml +++ b/about/en/sponsors.wml @@ -28,7 +28,7 @@ <li><a href="<page donate/donate>">Tens of thousands of personal donations from individuals like you</a> (2006-present)</li> <li><a href="http://code.google.com/soc/">Google Summer of Code</a> (2007-2014 and 2016)</li> <li><a href="http://www.rfa.org/english/">Radio Free Asia</a> (2012-2016)</li> - <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgia Tech and Princeton University (2012-2016)</li> + <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Princeton University (2012-2016)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> via University of Minnesota (2013-2017)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgetown (2015-2018)</li> <li><a href="http://www.sri.com/">SRI International</a> (2011-2016)</li>

1 0

[webwml/master] add the fastly logo to our website
by arma＠torproject.org 21 May '16

21 May '16

commit d1e734d925dd5eda83707578223c6a34747f0957 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat May 21 14:21:49 2016 -0400 add the fastly logo to our website --- images/fastly-logo.png | Bin 0 -> 3658 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/fastly-logo.png b/images/fastly-logo.png new file mode 100644 index 0000000..3d83596 Binary files /dev/null and b/images/fastly-logo.png differ

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 21 May '16

21 May '16

commit 5f31ba38e76ed92c0923308977df929d20754a30 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 21 10:46:53 2016 +0000 Update translations for tails-onioncircuits_completed --- hu/onioncircuits.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hu/onioncircuits.pot b/hu/onioncircuits.pot index 7554a5d..38625a0 100644 --- a/hu/onioncircuits.pot +++ b/hu/onioncircuits.pot @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-31 21:31+0200\n" -"PO-Revision-Date: 2016-05-11 17:22+0000\n" +"PO-Revision-Date: 2016-05-21 10:18+0000\n" "Last-Translator: Falu\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 21 May '16

21 May '16

commit 413c2872210484c6739edaadb6cbcd9ae78c9703 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 21 10:46:50 2016 +0000 Update translations for tails-onioncircuits --- hu/onioncircuits.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hu/onioncircuits.pot b/hu/onioncircuits.pot index 7554a5d..38625a0 100644 --- a/hu/onioncircuits.pot +++ b/hu/onioncircuits.pot @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-31 21:31+0200\n" -"PO-Revision-Date: 2016-05-11 17:22+0000\n" +"PO-Revision-Date: 2016-05-21 10:18+0000\n" "Last-Translator: Falu\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tor-messenger-fingerdtd_completed] Update translations for tor-messenger-fingerdtd_completed
by translation＠torproject.org 21 May '16

21 May '16

commit 3454b26efb5b9fee9715c88eda378898054b4a97 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 21 10:46:26 2016 +0000 Update translations for tor-messenger-fingerdtd_completed --- hu/finger.dtd | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hu/finger.dtd b/hu/finger.dtd index a6a014b..9cc151d 100644 --- a/hu/finger.dtd +++ b/hu/finger.dtd @@ -7,4 +7,9 @@ <!ENTITY finger.protocol "Protokoll"> <!ENTITY finger.verify "Megerősít"> <!ENTITY finger.remove "Eltávolít"> -<!ENTITY finger.intro "A látott ujjlenyomatok listájának kezelése."> \ No newline at end of file +<!ENTITY finger.intro "A látott ujjlenyomatok listájának kezelése."> +<!ENTITY addFingerDialog.title "Ujjlenyomat hozzáadás"> +<!ENTITY addFingerDialog.finger "Ujjlenyomat"> +<!ENTITY addFingerDialog.accept "OK"> +<!ENTITY addFingerDialog.cancel "Kihagy"> +<!ENTITY addFingerDialog.tooltip "Ha tudod az ismerősöd privát OTR kulcsának 40 karakteres, hexadecimális ujjlenyomatát, akkor itt megadhatod."> \ No newline at end of file

1 0

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 21 May '16

21 May '16

commit 8161ddf972df0f4c1a09fce538ef1ff02631b262 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 21 10:46:22 2016 +0000 Update translations for tor-messenger-fingerdtd --- hu/finger.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hu/finger.dtd b/hu/finger.dtd index b6cb0b7..9cc151d 100644 --- a/hu/finger.dtd +++ b/hu/finger.dtd @@ -8,8 +8,8 @@ <!ENTITY finger.verify "Megerősít"> <!ENTITY finger.remove "Eltávolít"> <!ENTITY finger.intro "A látott ujjlenyomatok listájának kezelése."> -<!ENTITY addFingerDialog.title "Add Fingerprint"> -<!ENTITY addFingerDialog.finger "Fingerprint"> +<!ENTITY addFingerDialog.title "Ujjlenyomat hozzáadás"> +<!ENTITY addFingerDialog.finger "Ujjlenyomat"> <!ENTITY addFingerDialog.accept "OK"> -<!ENTITY addFingerDialog.cancel "Skip"> -<!ENTITY addFingerDialog.tooltip "If you know the 40 hex char fingerprint of your contact's OTR private key, enter it now."> \ No newline at end of file +<!ENTITY addFingerDialog.cancel "Kihagy"> +<!ENTITY addFingerDialog.tooltip "Ha tudod az ismerősöd privát OTR kulcsának 40 karakteres, hexadecimális ujjlenyomatát, akkor itt megadhatod."> \ No newline at end of file

1 0