September 2017 - tor-commits - lists.torproject.org

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 16 Sep '17

16 Sep '17

commit baf659f82b4a043b841f9156b4d8934a455df65c Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 16 22:49:35 2017 +0000 Update translations for tor-browser-manual --- tr/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index accd4d32f..ee17a56bc 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -593,9 +593,9 @@ msgid "" "select this option. Tor Browser will take you through a series of " "configuration options." msgstr "" -"Bağlantınızın sansürlendiğini veya vekil sunucu kullandığını biliyorsanız, " +"Bağlantınızın sansürlendiğini ya da vekil sunucu kullandığını biliyorsanız, " "bu seçeneği seçmelisiniz. Tor Browser size bir dizi yapılandırma seçeneği " -"sunacaktır." +"sunar." #: first-time.page:44 msgid ""

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 16 Sep '17

16 Sep '17

commit 2e2a5986ef62ce183ed5f7730d1dc13c0d5ea068 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 16 22:49:19 2017 +0000 Update translations for tails-greeter-2 --- be/be.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/be.po b/be/be.po index fae6855a4..03f4a491e 100644 --- a/be/be.po +++ b/be/be.po @@ -35,7 +35,7 @@ msgstr "" #: ../data/greeter.ui.h:4 msgid "Confirm" -msgstr "" +msgstr "Пацвердзіць" #: ../data/greeter.ui.h:5 msgid "Confirm your administration password"

1 0

[translation/tor-messenger-privdtd] Update translations for tor-messenger-privdtd
by translation＠torproject.org 16 Sep '17

16 Sep '17

commit da81b3e6a00b365c98c9242feef743ba6a6efcf9 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 16 22:48:57 2017 +0000 Update translations for tor-messenger-privdtd --- be/priv.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/be/priv.dtd b/be/priv.dtd new file mode 100644 index 000000000..a16bd57cb --- /dev/null +++ b/be/priv.dtd @@ -0,0 +1,2 @@ +<!ENTITY privDialog.title "Generating private key"> +<!ENTITY privDialog.done "Зроблена"> \ No newline at end of file

1 0

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

16 Sep '17

commit 41e79cad5ab8a6ed542aad3516c85fda126bfe91 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 16 22:48:35 2017 +0000 Update translations for tor-messenger-fingerdtd --- be/finger.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/finger.dtd b/be/finger.dtd index 7563e291c..9e9f5c412 100644 --- a/be/finger.dtd +++ b/be/finger.dtd @@ -4,7 +4,7 @@ <!ENTITY finger.verified "Verified"> <!ENTITY finger.fingerprint "Fingerprint"> <!ENTITY finger.account "Account"> -<!ENTITY finger.protocol "Protocol"> +<!ENTITY finger.protocol "Пратакол"> <!ENTITY finger.verify "Verify"> <!ENTITY finger.remove "Remove"> <!ENTITY finger.intro "Manage the list of fingerprints you've seen.">

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 16 Sep '17

16 Sep '17

commit 852e621fd516867f80f091a851c15bc67698680f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 16 22:47:24 2017 +0000 Update translations for tails-perl5lib --- be.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/be.po b/be.po index cd7c08bcf..21b16c12b 100644 --- a/be.po +++ b/be.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2016-01-11 15:40+0100\n" -"PO-Revision-Date: 2016-01-12 08:13+0000\n" +"POT-Creation-Date: 2017-05-20 10:59+0200\n" +"PO-Revision-Date: 2017-09-16 22:37+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ msgstr "" #: ../lib/Tails/RunningSystem.pm:159 msgid "Error" -msgstr "" +msgstr "Памылка" #: ../lib/Tails/RunningSystem.pm:161 msgid ""

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 16 Sep '17

16 Sep '17

commit ac5d7d9185fad6c5523d3e24caed57b60b597a47 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 16 22:46:40 2017 +0000 Update translations for tails-misc --- be.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/be.po b/be.po index d359b3922..c073e3f2a 100644 --- a/be.po +++ b/be.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-09-14 13:15+0000\n" +"PO-Revision-Date: 2017-09-16 22:37+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n" "MIME-Version: 1.0\n" @@ -171,7 +171,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:25 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28 msgid "Error" -msgstr "" +msgstr "Памылка" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:45 msgid ""

1 0

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

16 Sep '17

commit 07ab7a669cef6d17496772774be1283d4416de05 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 16 22:46:17 2017 +0000 Update translations for tor-launcher-properties --- be/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/torlauncher.properties b/be/torlauncher.properties index 44c1e75ba..a1926d603 100644 --- a/be/torlauncher.properties +++ b/be/torlauncher.properties @@ -34,7 +34,7 @@ torlauncher.connect=Злучэнне torlauncher.restart_tor=Restart Tor torlauncher.quit=Выхад torlauncher.quit_win=Выйсце -torlauncher.done=Done +torlauncher.done=Зроблена torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 16 Sep '17

16 Sep '17

commit 34310049726345985d9645fe13d190b3e3599eb1 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 16 22:45:51 2017 +0000 Update translations for tails-persistence-setup --- be/be.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/be/be.po b/be/be.po index 9580f53a5..f23e81827 100644 --- a/be/be.po +++ b/be/be.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-09-09 13:35+0000\n" +"PO-Revision-Date: 2017-09-16 22:37+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n" "MIME-Version: 1.0\n" @@ -128,7 +128,7 @@ msgstr "" #: ../lib/Tails/Persistence/Setup.pm:312 ../lib/Tails/Persistence/Setup.pm:459 msgid "Error" -msgstr "" +msgstr "Памылка" #: ../lib/Tails/Persistence/Setup.pm:344 #, perl-format

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 16 Sep '17

16 Sep '17

commit 47d557db68703bf2092a534af612b6f12a667ad5 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 16 22:45:32 2017 +0000 Update translations for https_everywhere --- be/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/ssl-observatory.dtd b/be/ssl-observatory.dtd index 840d08c56..2c7b1b3be 100644 --- a/be/ssl-observatory.dtd +++ b/be/ssl-observatory.dtd @@ -50,7 +50,7 @@ intrusive corporate network:"> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip "This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong."> -<!ENTITY ssl-observatory.prefs.done "Done"> +<!ENTITY ssl-observatory.prefs.done "Зроблена"> <!ENTITY ssl-observatory.prefs.explanation "HTTPS Everywhere can use EFF's SSL Observatory. This does two things: (1)

1 0

[nyx/master] Reduce graph panel cpu usage
by atagar＠torproject.org 16 Sep '17

16 Sep '17

commit c02be3ee32b4d8cba8a9f4eee5cc97b0fd27bdef Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 16 13:36:01 2017 -0700 Reduce graph panel cpu usage Our graph panel updates and redraws itself every second, making it a non-trivial load on cpu. Two actions in particular account for most of it... * Cloning stats on every redraw. This constantly consumes 0.3% cpu on my relay. Being lock-free is nice, but in this case a lock really makes sense. * Performing a flurry of addstr calls for each cell in the graph. Doing a single vline call for each column instead drops cpu by another 0.4%. On my relay this drops cpu usage of the graph panel from 1% to 0.4% (60% less)... * 0.3% cpu usage when only the header panel is rendered * 1.3% cpu usage when the graph panel was rendered too * 0.7% cpu usage when the graph panel was rendered with these changes --- nyx/curses.py | 14 ++++++++++---- nyx/panel/graph.py | 39 ++++++++++++++++++++------------------- test/panel/graph.py | 4 ++-- web/changelog/index.html | 1 + 4 files changed, 33 insertions(+), 25 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index cb47bb6..0caf8f4 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -902,17 +902,23 @@ class _Subwindow(object): return x - def hline(self, x, y, length, *attr): + def hline(self, x, y, length, *attr, **kwargs): + char = kwargs.get('char', curses.ACS_HLINE) + char = ord(char) if isinstance(char, str) else char + if self.width > x and self.height > y: try: - self._curses_subwindow.hline(max(0, y), max(0, x), curses.ACS_HLINE | curses_attr(*attr), min(length, self.width - x)) + self._curses_subwindow.hline(max(0, y), max(0, x), char | curses_attr(*attr), min(length, self.width - x)) except: pass - def vline(self, x, y, length, *attr): + def vline(self, x, y, length, *attr, **kwargs): + char = kwargs.get('char', curses.ACS_VLINE) + char = ord(char) if isinstance(char, str) else char + if self.width > x and self.height > y: try: - self._curses_subwindow.vline(max(0, y), max(0, x), curses.ACS_VLINE | curses_attr(*attr), min(length, self.height - y)) + self._curses_subwindow.vline(max(0, y), max(0, x), char | curses_attr(*attr), min(length, self.height - y)) except: pass diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index cec0a71..e385fe6 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -16,6 +16,7 @@ Downloaded (0.0 B/sec): Uploaded (0.0 B/sec): import copy import functools +import threading import time import nyx.curses @@ -425,6 +426,7 @@ class GraphPanel(nyx.panel.Panel): GraphStat.SYSTEM_RESOURCES: ResourceStats(), } + self._stats_lock = threading.RLock() self._stats_paused = None if CONFIG['show_connections']: @@ -559,18 +561,18 @@ class GraphPanel(nyx.panel.Panel): stat = self._stats_paused[self._displayed_stat] accounting_stats = self._accounting_stats_paused - stat = type(stat)(stat) # clone the GraphCategory - subgraph_height = self._graph_height + 2 # graph rows + header + x-axis label - subgraph_width = min(subwindow.width // 2, CONFIG['max_graph_width']) - interval, bounds_type = self._update_interval, self._bounds_type + with self._stats_lock: + subgraph_height = self._graph_height + 2 # graph rows + header + x-axis label + subgraph_width = min(subwindow.width // 2, CONFIG['max_graph_width']) + interval, bounds_type = self._update_interval, self._bounds_type - subwindow.addstr(0, 0, stat.title(subwindow.width), HIGHLIGHT) + subwindow.addstr(0, 0, stat.title(subwindow.width), HIGHLIGHT) - _draw_subgraph(subwindow, stat.primary, 0, subgraph_width, subgraph_height, bounds_type, interval, PRIMARY_COLOR) - _draw_subgraph(subwindow, stat.secondary, subgraph_width, subgraph_width, subgraph_height, bounds_type, interval, SECONDARY_COLOR) + _draw_subgraph(subwindow, stat.primary, 0, subgraph_width, subgraph_height, bounds_type, interval, PRIMARY_COLOR) + _draw_subgraph(subwindow, stat.secondary, subgraph_width, subgraph_width, subgraph_height, bounds_type, interval, SECONDARY_COLOR) - if stat.stat_type() == GraphStat.BANDWIDTH and accounting_stats: - _draw_accounting_stats(subwindow, DEFAULT_CONTENT_HEIGHT + subgraph_height - 2, accounting_stats) + if stat.stat_type() == GraphStat.BANDWIDTH and accounting_stats: + _draw_accounting_stats(subwindow, DEFAULT_CONTENT_HEIGHT + subgraph_height - 2, accounting_stats) def _update_accounting(self, event): if not CONFIG['show_accounting']: @@ -587,15 +589,16 @@ class GraphPanel(nyx.panel.Panel): nyx_interface().redraw() def _update_stats(self, event): - for stat in self._stats.values(): - stat.bandwidth_event(event) + with self._stats_lock: + for stat in self._stats.values(): + stat.bandwidth_event(event) - if self._displayed_stat: - param = self._stats[self._displayed_stat] - update_rate = INTERVAL_SECONDS[self._update_interval] + if self._displayed_stat: + param = self._stats[self._displayed_stat] + update_rate = INTERVAL_SECONDS[self._update_interval] - if param.primary.tick % update_rate == 0: - self.redraw() + if param.primary.tick % update_rate == 0: + self.redraw() def _draw_subgraph(subwindow, data, x, width, height, bounds_type, interval, color, fill_char = ' '): @@ -622,9 +625,7 @@ def _draw_subgraph(subwindow, data, x, width, height, bounds_type, interval, col for col in range(columns): column_count = int(data.values[interval][col]) - min_bound column_height = int(min(height - 2, (height - 2) * column_count / (max(1, max_bound) - min_bound))) - - for row in range(column_height): - subwindow.addstr(x + col + axis_offset + 1, height - 1 - row, fill_char, color, HIGHLIGHT) + subwindow.vline(x + col + axis_offset + 1, height - column_height, column_height, color, HIGHLIGHT, char = fill_char) def _x_axis_labels(interval, columns): diff --git a/test/panel/graph.py b/test/panel/graph.py index 99139e4..513a757 100644 --- a/test/panel/graph.py +++ b/test/panel/graph.py @@ -26,12 +26,12 @@ Download: EXPECTED_ACCOUNTING = """ Accounting (awake) Time to reset: 01:02 - 4.7 KB / 105.2 KB 2.0 KB / 9.2 KB + 4.7 KB / 105.3 KB 2.0 KB / 9.3 KB """.strip() EXPECTED_GRAPH = """ Download: -6 KB * +7 KB * * 3 KB ** * * **** diff --git a/web/changelog/index.html b/web/changelog/index.html index 7977afd..686ec0e 100644 --- a/web/changelog/index.html +++ b/web/changelog/index.html @@ -68,6 +68,7 @@ <ul> <li>Graph prepopulation no longer requires shifting to 15 minute intervals</li> <li>Graphing bandwidth as bytes by default, rather than bits</li> + <li>Reduced cpu usage of rendering this panel by 60%</li> </ul> </li>

1 0