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

[metrics-web/master] Update news.json to version 129 of doc/MetricsTimeline.
by karsten＠torproject.org 14 Sep '17

14 Sep '17

commit d32530047b29f16406b05fe3f439c2f7b546d173 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Sep 14 11:16:43 2017 +0200 Update news.json to version 129 of doc/MetricsTimeline. --- website/src/main/resources/etc/news.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/src/main/resources/etc/news.json b/website/src/main/resources/etc/news.json index bfa3819..d28816d 100644 --- a/website/src/main/resources/etc/news.json +++ b/website/src/main/resources/etc/news.json @@ -1580,7 +1580,8 @@ ], "description": "Short-lived, simultaneous spike in direct users in Egypt and Turkey. Bridge users not affected.", "links": [ - "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-07-0…">relay graph</a>" + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-07-0…">eg graph</a>", + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-07-0…">tr graph</a>" ], "unknown": true }

1 0

[atlas/master] Ticket #15508:
by irl＠torproject.org 14 Sep '17

14 Sep '17

commit 4af60ea0f94061ab42f8abe295453072c680503b Author: Mark Henderson <mhenderson(a)stackoverflow.com> Date: Mon Aug 28 08:12:19 2017 -0400 Ticket #15508: - Sorts bandwidth nicely - Sorts IP addresses nicely - Adds a file for custom sorting filters `dataTables.Sorting.js` - In `js/views/search/do.js` defines custom sorting options --- js/libs/datatables/dataTables.Sorting.js | 122 +++++++++++++++++++++++++++++++ js/main.js | 1 + js/views/search/do.js | 24 +++++- 3 files changed, 143 insertions(+), 4 deletions(-) diff --git a/js/libs/datatables/dataTables.Sorting.js b/js/libs/datatables/dataTables.Sorting.js new file mode 100644 index 0000000..ba77fdd --- /dev/null +++ b/js/libs/datatables/dataTables.Sorting.js @@ -0,0 +1,122 @@ +var loadSortingExtensions = function(){ + /** + * Atlas renders speed as MiB/s, KiB/sec, etc - which as a string does + * not sort nicely at all. This sorting plugin fixes that by converting + * the speeds back into a raw Bytes value, and then sorting. It is based + * on two different versions of the datatabes file-size sorting plugin - + * https://datatables.net/plug-ins/sorting/file-size - the latest edition + * that has superior matching, and a very old version from 2011 that works + * with the version of datatables that Atlas runs on. + * @name File size + * @author mhenderson + */ + + var getBytesFromString = function(xstring,ystring){ + var xmatches = xstring.match( /(\d+(?:\.\d+)?)\s*([a-z]+)/i ); + var ymatches = ystring.match( /(\d+(?:\.\d+)?)\s*([a-z]+)/i ); + var multipliers = { + b: 1, + bytes: 1, + kb: 1000, + kib: 1024, + mb: 1000000, + mib: 1048576, + gb: 1000000000, + gib: 1073741824, + tb: 1000000000000, + tib: 1099511627776, + pb: 1000000000000000, + pib: 1125899906842624 + }; + + var x = xmatches[1]; + if (xmatches){ + x = x * multipliers[xmatches[2].toLowerCase()]; + } + var y = ymatches[1]; + if (ymatches) { + y = y * multipliers[ymatches[2].toLowerCase()]; + } + + return [x,y] + } + + jQuery.extend( jQuery.fn.dataTableExt.oSort, { + "file-size-asc": function ( a, b ) { + var raw = getBytesFromString(a,b) + var x = raw[0] + var y = raw[1] + return ((x < y) ? -1 : ((x > y) ? 1 : 0)); + }, + + "file-size-desc": function ( a, b ) { + var raw = getBytesFromString(a,b) + var x = raw[0] + var y = raw[1] + return ((x < y) ? 1 : ((x > y) ? -1 : 0)); + } + } ); + + /** + * Sorts a column containing IP addresses in typical dot notation. This can + * be most useful when using DataTables for a networking application, and + * reporting information containing IP address. Also has a matching type + * detection plug-in for automatic type detection. + * @name IP addresses + * @author Brad Wasson + */ + + jQuery.extend( jQuery.fn.dataTableExt.oSort, { + "ip-address-asc": function ( a, b ) { + var m = a.split("."), x = ""; + var n = b.split("."), y = ""; + for(var i = 0; i < m.length; i++) { + var item = m[i]; + if(item.length == 1) { + x += "00" + item; + } else if(item.length == 2) { + x += "0" + item; + } else { + x += item; + } + } + for(var i = 0; i < n.length; i++) { + var item = n[i]; + if(item.length == 1) { + y += "00" + item; + } else if(item.length == 2) { + y += "0" + item; + } else { + y += item; + } + } + return ((x < y) ? -1 : ((x > y) ? 1 : 0)); + }, + + "ip-address-desc": function ( a, b ) { + var m = a.split("."), x = ""; + var n = b.split("."), y = ""; + for(var i = 0; i < m.length; i++) { + var item = m[i]; + if(item.length == 1) { + x += "00" + item; + } else if (item.length == 2) { + x += "0" + item; + } else { + x += item; + } + } + for(var i = 0; i < n.length; i++) { + var item = n[i]; + if(item.length == 1) { + y += "00" + item; + } else if (item.length == 2) { + y += "0" + item; + } else { + y += item; + } + } + return ((x < y) ? 1 : ((x > y) ? -1 : 0)); + } + } ); +} \ No newline at end of file diff --git a/js/main.js b/js/main.js index bd91484..8c49798 100644 --- a/js/main.js +++ b/js/main.js @@ -10,6 +10,7 @@ require.config({ text: 'libs/require/text', datatables: 'libs/datatables/jquery.dataTables.min', datatablest: 'libs/datatables/dataTables.TorStatus', + datatablessort: 'libs/datatables/dataTables.Sorting', tooltip: 'libs/bootstrap/bootstrap-tooltip', typeahead: 'libs/bootstrap/bootstrap-typeahead', collapse: 'libs/bootstrap/bootstrap-collapse', diff --git a/js/views/search/do.js b/js/views/search/do.js index 74f38f0..eb3d2aa 100644 --- a/js/views/search/do.js +++ b/js/views/search/do.js @@ -6,6 +6,7 @@ define([ 'collections/results', 'text!templates/search/do.html', 'datatables', + 'datatablessort', 'tooltip', 'helpers', 'collapse', @@ -115,12 +116,27 @@ define([ document.title = "Atlas"; this.filtering(); var asInitVals = new Array(); - var compiledTemplate = _.template(doSearchTemplate, {relays: this.relays, countries: CountryCodes, error: this.error}); + var compiledTemplate = _.template(doSearchTemplate, {relays: this.relays, countries: CountryCodes, error: this.error}); this.el.html(compiledTemplate); - var fp = this; - // This creates the table using DataTables + var fp = this; + loadSortingExtensions(); + // This creates the table using DataTables var oTable = $('#torstatus_results').dataTable({ - // Save the state of the tables + //Define column specific options + "aoColumns": [ + null, //Status + null, //Nickname + { "sType": "file-size" }, //Bandwidth + null, //Uptime + null, //Country + { "sType": "ip-address" }, //IP Address + null, //Flags + null, //Properties + null, //ORPort + null, //DirPort + null //Type + ], + // Save the state of the tables "sDom": "<'row'<'span6'l><'span6 hide'f>r>t<'row'<'span6'i><'span6'p>>", "bStateSave": false, "aaSorting": [],

1 0

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

14 Sep '17

commit e517d381af0d31ebfcd30cc1d62fa43938a9e9f8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 14 08:48:45 2017 +0000 Update translations for tor-messenger-prefsdtd --- be/prefs.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/prefs.dtd b/be/prefs.dtd index 2ae9c9c59..f87500c9e 100644 --- a/be/prefs.dtd +++ b/be/prefs.dtd @@ -15,7 +15,7 @@ <!ENTITY prefs.generate "Generate"> <!ENTITY prefs.coniksConnection "Connection"> <!ENTITY prefs.coniksServerAddress "Server Address"> -<!ENTITY prefs.coniksServerPort "Port"> +<!ENTITY prefs.coniksServerPort "Порт"> <!ENTITY prefs.coniksAccountPolicy "Account Policy"> <!ENTITY prefs.coniksPoliciesForAccount "Policies for account:"> <!ENTITY prefs.coniksPrivateLookups "Private lookups">

1 0

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

14 Sep '17

commit 449e26bd4ff1086aa586b74679a15e060d3b5711 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 14 05:47:14 2017 +0000 Update translations for tails-iuk --- be.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/be.po b/be.po index c307a2965..285555e24 100644 --- a/be.po +++ b/be.po @@ -8,8 +8,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-05-25 16:55+0200\n" -"PO-Revision-Date: 2016-05-26 08:49+0000\n" +"POT-Creation-Date: 2017-04-18 12:13+0200\n" +"PO-Revision-Date: 2017-09-14 05:28+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" @@ -202,7 +202,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:614 msgid "Restart now" -msgstr "" +msgstr "Перазапусціць зараз" #: ../lib/Tails/IUK/Frontend.pm:615 msgid "Restart later"

1 0

[tor/master] fix a copy-pasta issue from long ago
by arma＠torproject.org 14 Sep '17

14 Sep '17

commit 3247518f22833e507db40a8356b1e69044079ff0 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 13 22:28:06 2017 -0400 fix a copy-pasta issue from long ago --- src/or/router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/router.c b/src/or/router.c index 2bc7a875f..d2d3d12f5 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -3607,7 +3607,7 @@ routerstatus_describe(const routerstatus_t *rs) return routerstatus_get_description(buf, rs); } -/** Return a human-readable description of the extend_info_t <b>ri</b>. +/** Return a human-readable description of the extend_info_t <b>ei</b>. * * This function is not thread-safe. Each call to this function invalidates * previous values returned by this function.

1 0

[nyx/master] Bandwidth graph title units could disappear
by atagar＠torproject.org 14 Sep '17

14 Sep '17

commit e22bfbcf86abe129bb64a8e83c602ef70d7700b4 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 13 18:08:50 2017 -0700 Bandwidth graph title units could disappear Truncation of '.0' from values had a bug where it made units disappear... Bandwidth (limit: 5/s, burst: 1/s, measured: 10.3 KB/s): --- nyx/panel/graph.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index db0ec53..cec0a71 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -332,8 +332,8 @@ class BandwidthStats(GraphCategory): # if both are using rounded values then strip off the '.0' decimal if '.0' in bw_rate_label and '.0' in bw_burst_label: - bw_rate_label = bw_rate_label.split('.', 1)[0] - bw_burst_label = bw_burst_label.split('.', 1)[0] + bw_rate_label = bw_rate_label.replace('.0', '') + bw_burst_label = bw_burst_label.replace('.0', '') stats.append('limit: %s/s' % bw_rate_label) stats.append('burst: %s/s' % bw_burst_label)

1 0

[nyx/master] Round graph panel size values
by atagar＠torproject.org 14 Sep '17

14 Sep '17

commit ffe10c64586dfdf025077148324b744fe315a597 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 13 18:06:17 2017 -0700 Round graph panel size values --- nyx/panel/graph.py | 2 +- nyx/tracker.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index e7114cb..db0ec53 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -708,4 +708,4 @@ def _size_label(byte_count, decimal = 1): or bytes. """ - return str_tools.size_label(byte_count, decimal, is_bytes = not CONFIG['show_bits']) + return str_tools.size_label(byte_count, decimal, is_bytes = not CONFIG['show_bits'], round = True) diff --git a/nyx/tracker.py b/nyx/tracker.py index 8630529..5d0d1fd 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -821,7 +821,7 @@ class ConsensusTracker(object): controller = tor_controller() if cache_age < 3600: - stem.util.log.info('Cached is only %i seconds old, no need to refresh it.' % cache_age) + stem.util.log.info('Cache is only %s old, no need to refresh it.' % str_tools.time_label(cache_age, is_long = True)) else: start_time = time.time() ns_response = controller.get_info('ns/all', None)

1 0

[stem/master] Add a 'round' argument to str_tools.size_label()
by atagar＠torproject.org 14 Sep '17

14 Sep '17

commit 0b1a0f947329d2b1a6272135800067ad07754071 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 13 18:04:13 2017 -0700 Add a 'round' argument to str_tools.size_label() Nyx is rounding down where I'd rather if it didn't. Adding an argument so we can customize this. --- docs/change_log.rst | 1 + stem/util/str_tools.py | 21 ++++++++++++++------- test/unit/util/str_tools.py | 5 +++++ 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 1bf01c5d..dafdb471 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -80,6 +80,7 @@ The following are only available within Stem's `git repository * Support connection resolution on OpenBSD using fstat (:trac:`13807`) * Added timeout argument to :func:`~stem.util.system.call` * Added cwd argument to :func:`~stem.util.system.call` + * Added round argument to :func:`~stem.util.str_tools.size_label` * Added :class:`~stem.util.test_tools.TimedTestRunner` and :func:`~stem.util.test_tools.test_runtimes` * Supporing pid arguments in :func:`~stem.util.system.is_running` * Normalized :func:`~stem.util.term.format` to return unicode diff --git a/stem/util/str_tools.py b/stem/util/str_tools.py index 696e6321..14f8a7cf 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -299,7 +299,7 @@ def crop(msg, size, min_word_length = 4, min_crop = 0, ending = Ending.ELLIPSE, return (return_msg, remainder) if get_remainder else return_msg -def size_label(byte_count, decimal = 0, is_long = False, is_bytes = True): +def size_label(byte_count, decimal = 0, is_long = False, is_bytes = True, round = False): """ Converts a number of bytes into a human readable label in its most significant units. For instance, 7500 bytes would return "7 KB". If the @@ -318,18 +318,22 @@ def size_label(byte_count, decimal = 0, is_long = False, is_bytes = True): >>> size_label(1050, 3, True) '1.025 Kilobytes' + .. versionchanged:: 1.6.0 + Added round argument. + :param int byte_count: number of bytes to be converted :param int decimal: number of decimal digits to be included :param bool is_long: expands units label :param bool is_bytes: provides units in bytes if **True**, bits otherwise + :param bool round: rounds normally if **True**, otherwise rounds down :returns: **str** with human readable representation of the size """ if is_bytes: - return _get_label(SIZE_UNITS_BYTES, byte_count, decimal, is_long) + return _get_label(SIZE_UNITS_BYTES, byte_count, decimal, is_long, round) else: - return _get_label(SIZE_UNITS_BITS, byte_count, decimal, is_long) + return _get_label(SIZE_UNITS_BITS, byte_count, decimal, is_long, round) def time_label(seconds, decimal = 0, is_long = False): @@ -542,7 +546,7 @@ def _parse_iso_timestamp(entry): return timestamp + datetime.timedelta(microseconds = int(microseconds)) -def _get_label(units, count, decimal, is_long): +def _get_label(units, count, decimal, is_long, round = False): """ Provides label corresponding to units of the highest significance in the provided set. This rounds down (ie, integer truncation after visible units). @@ -552,6 +556,7 @@ def _get_label(units, count, decimal, is_long): :param int count: number of base units being converted :param int decimal: decimal precision of label :param bool is_long: uses the long label if **True**, short label otherwise + :param bool round: rounds normally if **True**, otherwise rounds down """ # formatted string for the requested number of digits @@ -566,10 +571,12 @@ def _get_label(units, count, decimal, is_long): for count_per_unit, short_label, long_label in units: if count >= count_per_unit: - # Rounding down with a '%f' is a little clunky. Reducing the count so - # it'll divide evenly as the rounded down value. + if not round: + # Rounding down with a '%f' is a little clunky. Reducing the count so + # it'll divide evenly as the rounded down value. + + count -= count % (count_per_unit / (10 ** decimal)) - count -= count % (count_per_unit / (10 ** decimal)) count_label = label_format % (count / count_per_unit) if is_long: diff --git a/test/unit/util/str_tools.py b/test/unit/util/str_tools.py index 1576c06d..979f0896 100644 --- a/test/unit/util/str_tools.py +++ b/test/unit/util/str_tools.py @@ -67,6 +67,11 @@ class TestStrTools(unittest.TestCase): self.assertEqual('1.02 KB', str_tools.size_label(1050, 2)) self.assertEqual('1.025 Kilobytes', str_tools.size_label(1050, 3, True)) + self.assertEqual('1 KB', str_tools.size_label(1050, 0, round = True)) + self.assertEqual('1.0 KB', str_tools.size_label(1050, 1, round = True)) + self.assertEqual('1.03 KB', str_tools.size_label(1050, 2, round = True)) + self.assertEqual('1.025 KB', str_tools.size_label(1050, 3, round = True)) + self.assertEqual('0 B', str_tools.size_label(0)) self.assertEqual('0 Bytes', str_tools.size_label(0, is_long = True)) self.assertEqual('0.00 B', str_tools.size_label(0, 2))

1 0

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

14 Sep '17

commit 5a9088798fb43c78f6609220548906f8dceb3e99 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 14 00:47:41 2017 +0000 Update translations for tails-perl5lib_completed --- ms_MY.po | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/ms_MY.po b/ms_MY.po index ce8d1a9e6..2b25eb263 100644 --- a/ms_MY.po +++ b/ms_MY.po @@ -4,22 +4,33 @@ # # Translators: # danial abd talib <muhammaddanialabdtalib(a)gmail.com>, 2014 +# Razman Ramly <vgamezboy(a)gmail.com>, 2017 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-06-24 11:37+0200\n" -"PO-Revision-Date: 2014-12-28 13:30+0000\n" -"Last-Translator: danial abd talib <muhammaddanialabdtalib(a)gmail.com>\n" -"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/torproject/language/ms_MY/)\n" +"POT-Creation-Date: 2017-05-20 10:59+0200\n" +"PO-Revision-Date: 2017-09-14 00:27+0000\n" +"Last-Translator: Razman Ramly <vgamezboy(a)gmail.com>\n" +"Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ms_MY\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../lib/Tails/RunningSystem.pm:153 +#: ../lib/Tails/RunningSystem.pm:159 +msgid "Error" +msgstr "Ralat" + +#: ../lib/Tails/RunningSystem.pm:161 msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" -msgstr "ekor alat yang digunakan tidak dapat dijumpai. Ini berkemungkinan disebabkan oleh pilihan 'toram' digunakan" +msgstr "Peranti Tails sedang berjalan darinya tidak dapat dijumpai. Ini berkemungkinan anda menggunakan pilihan 'toram'?" + +#: ../lib/Tails/RunningSystem.pm:192 +msgid "" +"The drive Tails is running from cannot be found. Maybe you used the `toram' " +"option?" +msgstr "Pemacu Tails sedang berjalan darinya tidak dapat dijumpai. Ini berkemungkinan anda menggunakan pilihan 'toram'?"

1 0

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

14 Sep '17

commit 7361b71009edc02a75f092603e37d1d09671f72c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 14 00:47:36 2017 +0000 Update translations for tails-perl5lib --- ms_MY.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ms_MY.po b/ms_MY.po index 4cb0b6c9b..2b25eb263 100644 --- a/ms_MY.po +++ b/ms_MY.po @@ -4,13 +4,14 @@ # # Translators: # danial abd talib <muhammaddanialabdtalib(a)gmail.com>, 2014 +# Razman Ramly <vgamezboy(a)gmail.com>, 2017 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-25 16:59+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2017-05-20 10:59+0200\n" +"PO-Revision-Date: 2017-09-14 00:27+0000\n" +"Last-Translator: Razman Ramly <vgamezboy(a)gmail.com>\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,10 +27,10 @@ msgstr "Ralat" msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" -msgstr "ekor alat yang digunakan tidak dapat dijumpai. Ini berkemungkinan disebabkan oleh pilihan 'toram' digunakan" +msgstr "Peranti Tails sedang berjalan darinya tidak dapat dijumpai. Ini berkemungkinan anda menggunakan pilihan 'toram'?" #: ../lib/Tails/RunningSystem.pm:192 msgid "" "The drive Tails is running from cannot be found. Maybe you used the `toram' " "option?" -msgstr "" +msgstr "Pemacu Tails sedang berjalan darinya tidak dapat dijumpai. Ini berkemungkinan anda menggunakan pilihan 'toram'?"

1 0