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

[weather/master] Update TorCtl install instructions. Closes #8075. Thanks, Matt Kraai!
by kaner＠torproject.org 05 Oct '14

05 Oct '14

commit 1b6f92a901700ba420e7f36cf9cac7c40c91bbf1 Author: Christian Fromme <kaner(a)strace.org> Date: Sat Feb 2 10:58:34 2013 +0100 Update TorCtl install instructions. Closes #8075. Thanks, Matt Kraai! --- doc/INSTALL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/INSTALL b/doc/INSTALL index dc874d1..b90a204 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -16,9 +16,9 @@ 4) A copy of (or link to) the TorCtl package must be located within the weather directory. - $ svn co https://svn.torproject.org/svn/torctl/branches/stable/python/TorCtl + $ git clone https://git.torproject.org/pytorctl.git $ cd current/weather - $ ln -s ../../TorCtl . + $ ln -s ../../pytorctl TorCtl 5) Create a file named auth_token inside the weather.config directory and insert your Tor hashed control password in plain text. The file should

1 0

[weather/master] Apply patch by Matt Kraai (Thanks!) that fixes #8071:
by kaner＠torproject.org 05 Oct '14

05 Oct '14

commit 154dfeeaf205a38a903d55a41b9c5b27fd748696 Author: Christian Fromme <kaner(a)strace.org> Date: Mon Jan 28 09:08:37 2013 +0100 Apply patch by Matt Kraai (Thanks!) that fixes #8071: - Display "node down for 0 hours" instead of "node down for 0 hour" --- weather/weatherapp/emails.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weather/weatherapp/emails.py b/weather/weatherapp/emails.py index af4121f..39dc71b 100644 --- a/weather/weatherapp/emails.py +++ b/weather/weatherapp/emails.py @@ -275,7 +275,7 @@ def node_down_tuple(recipient, fingerprint, name, grace_pd, unsubs_auth, subj = _SUBJECT_HEADER + _NODE_DOWN_SUBJ sender = _SENDER num_hours = str(grace_pd) + " hour" - if grace_pd > 1: + if grace_pd != 1: num_hours += "s" msg = _NODE_DOWN_MAIL % (router, num_hours) msg = _add_generic_footer(msg, unsubs_auth, pref_auth)

1 0

[weather/master] Apply patch by Matt Kraai (Thanks!) that fixes #6616:
by kaner＠torproject.org 05 Oct '14

05 Oct '14

commit 005f4db3110ba4010ce4394a3c3f386d93dbbfec Author: Christian Fromme <kaner(a)strace.org> Date: Sat Feb 2 11:13:29 2013 +0100 Apply patch by Matt Kraai (Thanks!) that fixes #6616: - Change the order of links in the "Node down" email so that it is less confusing - Add a link to atlas.tpo --- weather/weatherapp/emails.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/weather/weatherapp/emails.py b/weather/weatherapp/emails.py index 39dc71b..6028e59 100644 --- a/weather/weatherapp/emails.py +++ b/weather/weatherapp/emails.py @@ -78,7 +78,8 @@ _NODE_DOWN_SUBJ = 'Node Down!' _NODE_DOWN_MAIL = "This is a Tor Weather Report.\n\n" +\ "It appears that the node %s you've been observing " +\ "has been uncontactable through the Tor network for at least %s. "+\ - "You may wish to look at it to see why." + "You may wish to look at it to see why.\n\nYou can find more "+\ + "information at:\n\n%s" _VERSION_SUBJ = 'Node Out of Date!' _VERSION_MAIL = "This is a Tor Weather Report.\n\n"+\ @@ -135,10 +136,9 @@ _LEGAL_INFO = "Additionally, since you are running as an exit node, you " +\ "(https://blog.torproject.org/blog/tips-running-exit-node-minimal-"+\ "harassment).\n\n" -_GENERIC_FOOTER = "\n\nYou can unsubscribe from these reports at any time "+\ - "by visiting the following url:\n\n%s\n\nor change your Tor Weather "+\ - "notification preferences here: \n\n%s" - +_GENERIC_FOOTER = "\n\nYou can change your Tor Weather notification "+\ + "preferences here:\n\n%s\n\nor unsubscribe from these reports at any "+\ + "time by visiting the following url:\n\n%s" def _get_router_name(fingerprint, name): """Returns a string representation of the name and fingerprint of @@ -277,7 +277,8 @@ def node_down_tuple(recipient, fingerprint, name, grace_pd, unsubs_auth, num_hours = str(grace_pd) + " hour" if grace_pd != 1: num_hours += "s" - msg = _NODE_DOWN_MAIL % (router, num_hours) + atlas_url = 'https://atlas.torproject.org/#details/' + fingerprint + msg = _NODE_DOWN_MAIL % (router, num_hours, atlas_url msg = _add_generic_footer(msg, unsubs_auth, pref_auth) return (subj, msg, sender, [recipient])

1 0

[weather/master] Add workaround for concurrency problem in database access. Fixes #5521
by kaner＠torproject.org 05 Oct '14

05 Oct '14

commit af95f0777831d8035b27f06163b914e5cb98e705 Author: Christian Fromme <kaner(a)strace.org> Date: Sun Oct 5 12:49:49 2014 +0200 Add workaround for concurrency problem in database access. Fixes #5521 --- weather/settings.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/weather/settings.py b/weather/settings.py index c665460..9c6ecb5 100644 --- a/weather/settings.py +++ b/weather/settings.py @@ -24,9 +24,14 @@ DATABASES = { 'PASSWORD': '', # Not used with sqlite3. 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. 'PORT': '', # Set to empty string for default. Not used with sqlite3. + 'OPTIONS': { 'timeout': 20, }, } } +DATABASE_OPTIONS: { + 'timeout': 20, +} + # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # although not all choices may be available on all operating systems.

1 0

[weather/master] Fixed #9760 - I think.
by kaner＠torproject.org 05 Oct '14

05 Oct '14

commit c3657f2781fc2ce82c7243283bc57e7a67d635f8 Author: Christian Fromme <kaner(a)strace.org> Date: Sun Sep 21 14:00:45 2014 +0200 Fixed #9760 - I think. There was a problem with handling multiple subscribe requsts for a username/node pair. --- weather/weatherapp/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/weather/weatherapp/views.py b/weather/weatherapp/views.py index 0b542de..1195dd8 100644 --- a/weather/weatherapp/views.py +++ b/weather/weatherapp/views.py @@ -46,14 +46,14 @@ def subscribe(request): try: subscriber = form.create_subscriber() except Exception, e: - return HttpResponseRedirect(e) + return HttpResponseRedirect(str(e)) else: # Creates subscriptions based on form data form.create_subscriptions(subscriber) # Spawn a daemon to send the confirmation email. confirm_auth = subscriber.confirm_auth - unsubs_auth = subscriber.unsubs_auth + unsubs_auth = subscriber.unsubs_auth addr = subscriber.email fingerprint = subscriber.router.fingerprint name = subscriber.router.name

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 05 Oct '14

05 Oct '14

commit b0972a8a1f438bb183234b943199d535f12e9cd7 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 5 10:45:59 2014 +0000 Update translations for tails-misc --- ro.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ro.po b/ro.po index 13630a1..3a618b1 100644 --- a/ro.po +++ b/ro.po @@ -5,6 +5,7 @@ # Translators: # Andrei Draga, 2013 # Draga Bianca - Madalina <dragabianca(a)yahoo.com>, 2014 +# Nicola Radu <estonyte(a)yahoo.com>, 2014 # Roxana Ardelean <roxana.ene(a)gmail.com>, 2014 # titus <titus0818(a)gmail.com>, 2014 # clopotel <yo_sergiu05(a)yahoo.com>, 2014 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 01:59+0200\n" -"PO-Revision-Date: 2014-08-04 11:11+0000\n" -"Last-Translator: titus <titus0818(a)gmail.com>\n" +"POT-Creation-Date: 2014-08-31 21:41+0200\n" +"PO-Revision-Date: 2014-10-05 10:40+0000\n" +"Last-Translator: Nicola Radu <estonyte(a)yahoo.com>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -154,9 +155,9 @@ msgstr "Ai incredere in aceste chei?" #: config/chroot_local-includes/usr/local/bin/gpgApplet:551 msgid "The following selected key is not fully trusted:" msgid_plural "The following selected keys are not fully trusted:" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Urmatoarele chei selectate nu sunt in totalitate de incredere:" +msgstr[1] "Urmatoarele chei selectate nu sunt in totalitate de incredere:" +msgstr[2] "Urmatoarele chei selectate nu sunt in totalitate de incredere:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:569 msgid "Do you trust this key enough to use it anyway?" @@ -198,7 +199,7 @@ msgstr "Rezultate GnuPG" #: config/chroot_local-includes/usr/local/bin/gpgApplet:819 msgid "Output of GnuPG:" -msgstr "" +msgstr "Iesirea GnuPG" #: config/chroot_local-includes/usr/local/bin/gpgApplet:844 msgid "Other messages provided by GnuPG:" @@ -246,7 +247,7 @@ msgstr "" msgid "" "Build information:\n" "%s" -msgstr "" +msgstr "Adun informatia:\n%s" #: config/chroot_local-includes/usr/local/bin/tails-about:27 #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 05 Oct '14

05 Oct '14

commit ecb1830ac8d1a2b6fee7962adf0be9e77b6604f1 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 5 10:45:36 2014 +0000 Update translations for tails-greeter --- ro/ro.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ro/ro.po b/ro/ro.po index 5f085a8..a649e0a 100644 --- a/ro/ro.po +++ b/ro/ro.po @@ -5,15 +5,16 @@ # Translators: # icet208 <icet208(a)yahoo.com>, 2014 # laura berindei <lauraagavriloae(a)yahoo.com>, 2014 +# Nicola Radu <estonyte(a)yahoo.com>, 2014 # titus <titus0818(a)gmail.com>, 2014 # clopotel <yo_sergiu05(a)yahoo.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-20 18:36+0200\n" -"PO-Revision-Date: 2014-08-04 10:40+0000\n" -"Last-Translator: titus <titus0818(a)gmail.com>\n" +"POT-Creation-Date: 2014-08-31 10:36+0200\n" +"PO-Revision-Date: 2014-10-05 10:30+0000\n" +"Last-Translator: Nicola Radu <estonyte(a)yahoo.com>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,7 +60,7 @@ msgstr "Doar-citire?" #: ../glade/persistencewindow.glade.h:10 msgid "Wrong passphrase. Please try again." -msgstr "Parolă greșită. Reâncercați." +msgstr "Parolă greșită. Reincercați." #: ../glade/persistencewindow.glade.h:11 msgid "More options?" @@ -79,7 +80,7 @@ msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.htm msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." -msgstr "Introdu o parola de administrator daca vrei sa efectuezi sarcini de administrator.\nAltfel, va fi dexactivat pentru securitate sporita." +msgstr "Introdu o parola de administrare in cazul in care esti nevoit sa efectuezi sarcini de administrare. Altfel va fi dezactivat pentru o securitate sporita." #: ../glade/optionswindow.glade.h:7 msgid "Password:" @@ -87,7 +88,7 @@ msgstr "Parola:" #: ../glade/optionswindow.glade.h:8 msgid "Verify Password:" -msgstr "Verificati Parola" +msgstr "Verifica Parola" #: ../glade/optionswindow.glade.h:9 msgid "Passwords do not match"

1 0

[tor-browser-bundle/master] Add meek-azure to transports list.
by mikeperry＠torproject.org 04 Oct '14

04 Oct '14

commit 9d57a89e45dfc7ebdb8cf56851b1cd15f13020ea Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Oct 4 16:31:13 2014 -0700 Add meek-azure to transports list. --- Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index a17a1be..d9c2049 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -32,3 +32,4 @@ pref("extensions.torlauncher.default_bridge.scramblesuit.3", "scramblesuit 83.21 pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 url=https://az668014.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[arm/master] Used a named tuple for header panel samplings
by atagar＠torproject.org 04 Oct '14

04 Oct '14

commit e313313ce6e3378bf73e4a78f8fcfc6837592c06 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 4 15:49:21 2014 -0700 Used a named tuple for header panel samplings I keep swapping between dics, named tuples, and standalone classes for this. Think this is the best option I've come up with yet. --- arm/header_panel.py | 205 ++++++++++++++++++++++++--------------------------- 1 file changed, 98 insertions(+), 107 deletions(-) diff --git a/arm/header_panel.py b/arm/header_panel.py index 5dc3127..9b8ecd2 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -4,6 +4,7 @@ This expands the information it presents to two columns if there's room available. """ +import collections import os import time import curses @@ -39,7 +40,7 @@ class HeaderPanel(panel.Panel, threading.Thread): threading.Thread.__init__(self) self.setDaemon(True) - self._vals = Sampling() + self._vals = get_sampling() self._pause_condition = threading.Condition() self._halt = False # terminates thread if true @@ -178,8 +179,10 @@ class HeaderPanel(panel.Panel, threading.Thread): space_left -= x - 43 - initial_x if space_left >= 7 + len(vals.version_status): + version_color = CONFIG['attr.version_status_colors'].get(vals.version_status, 'white') + x = self.addstr(y, x, ' (') - x = self.addstr(y, x, vals.version_status, vals.version_color) + x = self.addstr(y, x, vals.version_status, version_color) self.addstr(y, x, ')') def _draw_ports_section(self, x, y, width, vals): @@ -264,7 +267,7 @@ class HeaderPanel(panel.Panel, threading.Thread): x = self.addstr(y, x, vals.format('fingerprint: {fingerprint}', width)) space_left -= x - initial_x - if space_left >= 30 and vals.fd_used and vals.fd_limit: + if space_left >= 30 and vals.fd_used and vals.fd_limit != -1: fd_percent = 100 * vals.fd_used / vals.fd_limit if fd_percent >= SHOW_FD_THRESHOLD: @@ -372,81 +375,10 @@ class HeaderPanel(panel.Panel, threading.Thread): def _update(self): previous_height = self.get_height() - self._vals = Sampling(self._vals) - - if previous_height != self.get_height(): - # We're toggling between being a relay and client, causing the height - # of this panel to change. Redraw all content so we don't get - # overlapping content. - - arm.controller.get_controller().redraw() - else: - self.redraw(True) # just need to redraw ourselves - - -class Sampling(object): - """ - Statistical information rendered by the header panel. - """ - - def __init__(self, last_sampling = None): - controller = tor_controller() - - self.retrieved = time.time() - self.is_connected = controller.is_alive() - self.connection_time = controller.connection_time() - self.last_heartbeat = time.strftime('%H:%M %m/%d/%Y', time.localtime(controller.get_latest_heartbeat())) - - self.fingerprint = controller.get_info('fingerprint', 'Unknown') - self.nickname = controller.get_conf('Nickname', '') - self.newnym_wait = controller.get_newnym_wait() - self.exit_policy = controller.get_exit_policy(None) - self.flags = getattr(controller.get_network_status(default = None), 'flags', []) - - self.version = str(controller.get_version('Unknown')).split()[0] - self.version_status = controller.get_info('status/version/current', 'Unknown') - self.version_color = CONFIG['attr.version_status_colors'].get(self.version_status, 'white') - - or_listeners = controller.get_listeners(Listener.OR, []) - control_listeners = controller.get_listeners(Listener.CONTROL, []) - self.address = or_listeners[0][0] if (or_listeners and or_listeners[0][0] != '0.0.0.0') else controller.get_info('address', 'Unknown') - self.or_port = or_listeners[0][1] if or_listeners else '' - self.dir_port = controller.get_conf('DirPort', '0') - self.control_port = str(control_listeners[0][1]) if control_listeners else None - self.socket_path = controller.get_conf('ControlSocket', None) - self.is_relay = bool(self.or_port) - - if controller.get_conf('HashedControlPassword', None): - self.auth_type = 'password' - elif controller.get_conf('CookieAuthentication', None) == '1': - self.auth_type = 'cookie' - else: - self.auth_type = 'open' - - self.pid = controller.get_pid('') - self.start_time = system.start_time(self.pid) - - fd_limit = controller.get_info('process/descriptor-limit', '-1') - self.fd_limit = int(fd_limit) if fd_limit.isdigit() else None - - try: - self.fd_used = proc.file_descriptors_used(self.pid) - except IOError: - self.fd_used = None + self._vals = get_sampling(self._vals) - tor_resources = tracker.get_resource_tracker().get_value() - self.arm_total_cpu_time = sum(os.times()[:3]) - self.tor_cpu = '%0.1f' % (100 * tor_resources.cpu_sample) - self.arm_cpu = '%0.1f' % (100 * self._get_cpu_percentage(last_sampling)) - self.memory = str_tools.size_label(tor_resources.memory_bytes) if tor_resources.memory_bytes > 0 else 0 - self.memory_percent = '%0.1f' % (100 * tor_resources.memory_percent) - - uname_vals = os.uname() - self.hostname = uname_vals[1] - self.platform = '%s %s' % (uname_vals[0], uname_vals[2]) # [platform name] [version] - - if self.fd_used and self.fd_limit: - fd_percent = 100 * self.fd_used / self.fd_limit + if self._vals.fd_used and self._vals.fd_limit != -1: + fd_percent = 100 * self._vals.fd_used / self._vals.fd_limit if fd_percent >= 90: log_msg = msg('panel.header.fd_used_at_ninety_percent', percentage = fd_percent) @@ -456,36 +388,95 @@ class Sampling(object): log_msg = msg('panel.header.fd_used_at_sixty_percent', percentage = fd_percent) log.log_once('fd_used_at_sixty_percent', log.NOTICE, log_msg) - def format(self, message, crop_width = None): - """ - Applies our attributes to the given string. - """ - - formatted_msg = message.format(**self.__dict__) - - if crop_width: - formatted_msg = str_tools.crop(formatted_msg, crop_width) - - return formatted_msg - - def _get_cpu_percentage(self, last_sampling): - """ - Determine the cpu usage of our own process since the last sampling. - - :param arm.header_panel.Sampling last_sampling: sampling for which to - provide a CPU usage delta with - - :returns: **float** representation for our cpu usage over the given period - of time - """ + if previous_height != self.get_height(): + # We're toggling between being a relay and client, causing the height + # of this panel to change. Redraw all content so we don't get + # overlapping content. - if last_sampling: - arm_cpu_delta = self.arm_total_cpu_time - last_sampling.arm_total_cpu_time - arm_time_delta = self.retrieved - last_sampling.retrieved + arm.controller.get_controller().redraw() + else: + self.redraw(True) # just need to redraw ourselves - python_cpu_time = arm_cpu_delta / arm_time_delta - sys_call_cpu_time = 0.0 # TODO: add a wrapper around call() to get this - return python_cpu_time + sys_call_cpu_time - else: - return 0.0 +def get_sampling(last_sampling = None): + controller = tor_controller() + retrieved = time.time() + + pid = controller.get_pid('') + tor_resources = tracker.get_resource_tracker().get_value() + arm_total_cpu_time = sum(os.times()[:3]) + + or_listeners = controller.get_listeners(Listener.OR, []) + control_listeners = controller.get_listeners(Listener.CONTROL, []) + + if controller.get_conf('HashedControlPassword', None): + auth_type = 'password' + elif controller.get_conf('CookieAuthentication', None) == '1': + auth_type = 'cookie' + else: + auth_type = 'open' + + try: + fd_used = proc.file_descriptors_used(pid) + except IOError: + fd_used = None + + if last_sampling: + arm_cpu_delta = arm_total_cpu_time - last_sampling.arm_total_cpu_time + arm_time_delta = retrieved - last_sampling.retrieved + + python_cpu_time = arm_cpu_delta / arm_time_delta + sys_call_cpu_time = 0.0 # TODO: add a wrapper around call() to get this + + arm_cpu = python_cpu_time + sys_call_cpu_time + else: + arm_cpu = 0.0 + + attr = { + 'retrieved': retrieved, + 'is_connected': controller.is_alive(), + 'connection_time': controller.connection_time(), + 'last_heartbeat': time.strftime('%H:%M %m/%d/%Y', time.localtime(controller.get_latest_heartbeat())), + + 'fingerprint': controller.get_info('fingerprint', 'Unknown'), + 'nickname': controller.get_conf('Nickname', ''), + 'newnym_wait': controller.get_newnym_wait(), + 'exit_policy': controller.get_exit_policy(None), + 'flags': getattr(controller.get_network_status(default = None), 'flags', []), + + 'version': str(controller.get_version('Unknown')).split()[0], + 'version_status': controller.get_info('status/version/current', 'Unknown'), + + 'address': or_listeners[0][0] if (or_listeners and or_listeners[0][0] != '0.0.0.0') else controller.get_info('address', 'Unknown'), + 'or_port': or_listeners[0][1] if or_listeners else '', + 'dir_port': controller.get_conf('DirPort', '0'), + 'control_port': str(control_listeners[0][1]) if control_listeners else None, + 'socket_path': controller.get_conf('ControlSocket', None), + 'is_relay': bool(or_listeners), + + 'auth_type': auth_type, + 'pid': pid, + 'start_time': system.start_time(pid), + 'fd_limit': int(controller.get_info('process/descriptor-limit', '-1')), + 'fd_used': fd_used, + + 'arm_total_cpu_time': arm_total_cpu_time, + 'tor_cpu': '%0.1f' % (100 * tor_resources.cpu_sample), + 'arm_cpu': arm_cpu, + 'memory': str_tools.size_label(tor_resources.memory_bytes) if tor_resources.memory_bytes > 0 else 0, + 'memory_percent': '%0.1f' % (100 * tor_resources.memory_percent), + + 'hostname': os.uname()[1], + 'platform': '%s %s' % (os.uname()[0], os.uname()[2]), # [platform name] [version] + } + + class Sampling(collections.namedtuple('Sampling', attr.keys())): + def format(self, message, crop_width = None): + formatted_msg = message.format(**super(Sampling, self).__dict__) + + if crop_width: + formatted_msg = str_tools.crop(formatted_msg, crop_width) + + return formatted_msg + + return Sampling(**attr)

1 0

[stem/master] Todo note for swapping Fedora link back
by atagar＠torproject.org 04 Oct '14

04 Oct '14

commit 35d9c20fc71eab0c3d029ccd85c6450893c6180c Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 29 08:14:40 2014 -0700 Todo note for swapping Fedora link back Our ticket got closed in favor of... https://github.com/fedora-infra/fedora-packages/issues/77 Including a TODO note to check in on that someday in the future (looks like it won't be fixed any time soon). --- docs/download.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/download.rst b/docs/download.rst index b6b05e4..8611932 100644 --- a/docs/download.rst +++ b/docs/download.rst @@ -21,6 +21,14 @@ Download * Fedora Source: https://en.wikipedia.org/wiki/File:Fedora_logo_and_wordmark.svg Author: Unknown + + TODO: Switch link back to... + + https://apps.fedoraproject.org/packages/python-stem + + When the following is sorted out... + + https://github.com/fedora-infra/fedora-packages/issues/76 * Red Hat Source: NuoveXT (http://nuovext.pwsp.net/)

1 0