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

[tor-messenger-build/master] Update changelog
by sukhbir＠torproject.org 29 Aug '16

29 Aug '16

commit 9e23301abf65cc62f652990fa3509e19e38ba725 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Aug 28 23:27:35 2016 -0400 Update changelog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 511334b..8260ab2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ Tor Messenger 0.1.0b7 -- * GH 73: Show progress during verification in notification box (patch by Vu Quoc Huy) * Mac * Bug 13861: Profile directory stored in ~/Library/Application\ Support + * Bug 17460: Add graphics for OS X drag and drop to Applications Tor Messenger 0.1.0b6 -- April 06, 2016 * All Platforms

1 0

[tor-messenger-build/master] More linux-i686 fixin'
by arlo＠torproject.org 29 Aug '16

29 Aug '16

commit a26af78053453ab2165066f9c1b3966cf09d4fcb Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Aug 27 15:48:43 2016 -0700 More linux-i686 fixin' --- projects/instantbird/config | 31 ++++++++++++++++++++----------- projects/tor-messenger/config | 2 +- rbm.conf | 1 + 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 1223804..bef6465 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -9,23 +9,12 @@ var: deps: - build-essential - libmpc-dev - - libgconf2-dev - - autotools-dev - autoconf2.13 - python - zip - - libgtk2.0-dev - libidl-dev - - libxt-dev - - libxml2-dev - uuid-runtime - imagemagick - - mesa-common-dev - - libdbus-1-dev - - libdbus-glib-1-dev - - libasound2-dev - - libgstreamer-plugins-base0.10-dev - - libpulse-dev - ccache targets: windows-i686: @@ -37,6 +26,16 @@ targets: var: arch_deps: - yasm + - libgconf2-dev + - libgtk2.0-dev + - libxml2-dev + - mesa-common-dev + - libdbus-1-dev + - libdbus-glib-1-dev + - libasound2-dev + - libgstreamer-plugins-base0.10-dev + - libpulse-dev + - libxt-dev linux-i686: var: arch_deps: @@ -45,6 +44,16 @@ targets: - lib32z1-dev - lib32asound2-dev - yasm + - libgconf2-dev:i386 + - libgtk2.0-dev:i386 + - libxml2-dev:i386 + - mesa-common-dev:i386 + - libdbus-1-dev:i386 + - libdbus-glib-1-dev:i386 + - libasound2-dev:i386 + - libgstreamer-plugins-base0.10-dev:i386 + - libpulse-dev:i386 + - libxt-dev:i386 osx-x86_64: var: arch_deps: diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 19e98b6..dc0a28b 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -29,7 +29,7 @@ input_files: - project: docker-image remote_docker: 1 -distribution: Ubuntu-12.04 +distribution: Debian-7.11 var: filename_ext: 'tar.xz' deps: diff --git a/rbm.conf b/rbm.conf index 61a5f35..f2084c5 100644 --- a/rbm.conf +++ b/rbm.conf @@ -41,6 +41,7 @@ targets: osname: linux-i686 configure_opt: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32' compiler: gcc + pre_pkginst: dpkg --add-architecture i386 windows-i686: distribution: Ubuntu-14.10 arch: i686

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 28 Aug '16

28 Aug '16

commit f219aed5e744a8a2761176011a7cd0add8c51e63 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 28 20:18:09 2016 +0000 Update translations for tor-messenger-prefsdtd --- pl/prefs.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pl/prefs.dtd b/pl/prefs.dtd index acd32f5..a9b207e 100644 --- a/pl/prefs.dtd +++ b/pl/prefs.dtd @@ -13,10 +13,10 @@ <!ENTITY prefs.verifyNudge "Zawsze przypominaj, aby zweryfikować tożsamość kontaktu"> <!ENTITY prefs.emptyAccountList "Brak skonfigurowanych kont"> <!ENTITY prefs.generate "Generuj"> -<!ENTITY prefs.coniksConnection "Connection"> -<!ENTITY prefs.coniksServerAddress "Server Address"> +<!ENTITY prefs.coniksConnection "Połączenie"> +<!ENTITY prefs.coniksServerAddress "Adres serwera"> <!ENTITY prefs.coniksServerPort "Port"> -<!ENTITY prefs.coniksAccountPolicy "Account Policy"> +<!ENTITY prefs.coniksAccountPolicy "Polityka konta"> <!ENTITY prefs.coniksPoliciesForAccount "Policies for account:"> <!ENTITY prefs.coniksPrivateLookups "Private lookups"> <!ENTITY prefs.coniksSignedKeyChange "Signed key change"> \ No newline at end of file

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 28 Aug '16

28 Aug '16

commit ed43995a15398e47ff194f27f726363c3d00b554 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 28 20:15:28 2016 +0000 Update translations for https_everywhere_completed --- pl/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pl/https-everywhere.dtd b/pl/https-everywhere.dtd index 1cf1214..dedf9c0 100644 --- a/pl/https-everywhere.dtd +++ b/pl/https-everywhere.dtd @@ -20,7 +20,7 @@ <!ENTITY https-everywhere.menu.observatory "Ustawienia SSL Observatory"> <!ENTITY https-everywhere.menu.globalEnable "Włącz HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "Wyłącz HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.blockHttpRequests "Blokuj wszystkie próby połączenia HTTP"> +<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Blokuj wszystkie nieszyfrowane próby połączenia"> <!ENTITY https-everywhere.menu.showCounter "Pokaż Licznik"> <!ENTITY https-everywhere.menu.viewAllRules "Wyświetl wszystkie reguły">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 28 Aug '16

28 Aug '16

commit 6e809ab0008ba9382b025c4432a7c30f6aa379a8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 28 20:15:20 2016 +0000 Update translations for https_everywhere --- pl/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pl/https-everywhere.dtd b/pl/https-everywhere.dtd index 2e6d0c3..dedf9c0 100644 --- a/pl/https-everywhere.dtd +++ b/pl/https-everywhere.dtd @@ -20,7 +20,7 @@ <!ENTITY https-everywhere.menu.observatory "Ustawienia SSL Observatory"> <!ENTITY https-everywhere.menu.globalEnable "Włącz HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "Wyłącz HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Block all unencrypted requests"> +<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Blokuj wszystkie nieszyfrowane próby połączenia"> <!ENTITY https-everywhere.menu.showCounter "Pokaż Licznik"> <!ENTITY https-everywhere.menu.viewAllRules "Wyświetl wszystkie reguły">

1 0

[doctor/master] Disable notice that Tonga is a authority
by atagar＠torproject.org 28 Aug '16

28 Aug '16

commit 10193a86c3d39795fa1541f8990e8e0d62820e19 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 28 12:15:48 2016 -0700 Disable notice that Tonga is a authority Oops, tried to disable notices to Tonga but inadvertantly caused... NOTICE: The following authorities were not expected in the consensus: Tonga Disabling this part of the check until Tonga's gone. --- consensus_health_checker.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index a2859e9..7d7a354 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -603,8 +603,10 @@ def has_authority_flag(latest_consensus, consensuses, votes): if missing_authorities: issues.append(Issue(Runlevel.WARNING, 'MISSING_AUTHORITIES', authorities = ', '.join(missing_authorities), to = missing_authorities)) - if extra_authorities: - issues.append(Issue(Runlevel.NOTICE, 'EXTRA_AUTHORITIES', authorities = ', '.join(extra_authorities), to = extra_authorities)) + # TODO: Re-enable when Tonga is gone. + + #if extra_authorities: + # issues.append(Issue(Runlevel.NOTICE, 'EXTRA_AUTHORITIES', authorities = ', '.join(extra_authorities), to = extra_authorities)) return issues

1 0

[stem/master] Remove Tonga as a directory authority
by atagar＠torproject.org 28 Aug '16

28 Aug '16

commit 152fa89c33114619913d2be13e67adb4e55ce7ab Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 28 11:31:47 2016 -0700 Remove Tonga as a directory authority Lucky has asked for DocTor notifications to cease and this is the easiest way of doing so. Tonga will be replaced with Bitfroest soon as it's up... https://trac.torproject.org/projects/tor/ticket/19690#comment:7 --- stem/descriptor/remote.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index d16170c..f0c98f4 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -807,15 +807,6 @@ DIRECTORY_AUTHORITIES = { fingerprint = '7EA6EAD6FD83083C538F44038BBFA077587DD755', v3ident = 'E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58', ), - 'Tonga': DirectoryAuthority( - nickname = 'Tonga', - address = '82.94.251.203', - or_port = 443, - dir_port = 80, - is_bandwidth_authority = False, - fingerprint = '4A0CCD2DDC7995083D73F5D667100C8A5831F16D', - v3ident = None, # does not vote in the consensus - ), 'gabelmoo': DirectoryAuthority( nickname = 'gabelmoo', address = '131.188.40.189',

1 0

[nyx/master] Standardizing on unicode for curses.screenshot()
by atagar＠torproject.org 28 Aug '16

28 Aug '16

commit 14fed296185fb6e4c2e5cbf43707ef44fb0bba84 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 28 10:02:05 2016 -0700 Standardizing on unicode for curses.screenshot() Lowest hanging fruit for getting our tests python 3.x compatible, this reduces failures as follows... from: FAILED (failures=53, errors=15) to: FAILED (failures=3, errors=15) --- nyx/curses.py | 2 +- test/popups.py | 68 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index 27cfbfc..922729c 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -479,7 +479,7 @@ def screenshot(): for y in range(screen_size().height): lines.append(CURSES_SCREEN.instr(y, 0).rstrip()) - return '\n'.join(lines).rstrip() + return stem.util.str_tools._to_unicode(b'\n'.join(lines).rstrip()) def asci_to_curses(msg): diff --git a/test/popups.py b/test/popups.py index 02dc6a1..12ce3ef 100644 --- a/test/popups.py +++ b/test/popups.py @@ -161,6 +161,40 @@ Event Types:-------------------------------------------------------------------+ +------------------------------------------------------------------------------+ """.strip() +EXPECTED_DESCRIPTOR_WITHOUT_FINGERPRINT = """ +Consensus Descriptor:----------+ +| No consensus data available | ++------------------------------+ +""".strip() + +EXPECTED_DESCRIPTOR = """ +Consensus Descriptor (29787760145CD1A473552A2FC64C72A9A130820E):---------------+ +| 1 Consensus: | +| 2 | +| 3 r cyberphunk KXh3YBRc0aRzVSovxkxyqaEwgg4 VjdJThHuYj0jDY2tkkDJkCa8s1s | +| 2016-04-04 19:03:16 94.23.150.191 8080 0 | +| 4 s Fast Guard Running Stable Valid | +| 5 w Bandwidth=8410 | +| 6 p reject 1-65535 | +| 7 | +| 8 Server Descriptor: | +| 9 | +| 10 router cyberphunk 94.23.150.191 8080 0 0 | +| 11 platform Tor 0.2.4.27 on Linux | +| 12 protocols Link 1 2 Circuit 1 | +| 13 published 2016-04-04 19:03:16 | +| 14 fingerprint 2978 7760 145C D1A4 7355 2A2F C64C 72A9 A130 820E | +| 15 uptime 3899791 | +| 16 bandwidth 10240000 10444800 6482376 | +| 17 extra-info-digest 9DC532664DDFD238A4119D623D30F136A3B851BF | +| 18 reject *:* | +| 19 router-signature | +| 20 -----BEGIN SIGNATURE----- | +| 21 EUFm38gONCoDuY7ZWHyJtBKuvk6Xi1MPuKuecS5frP3fX0wiZSrOVcpX0X8J+4Hr | +| 22 Fb5i+yuMIAXeEn6UhtjqhhZBbY9PW9GdZOMTH8hJpG+evURyr+10PZq6UElg86rA | ++------------------------------------------------------------------------------+ +""".strip() + TORRC = """ ControlPort 9051 CookieAuthentication 1 @@ -208,40 +242,6 @@ NCGI042p6+7UgCVT1x3WcLnq3ScV//s1wXHrUXa7vi0= -----END SIGNATURE----- """.strip().split('\n') -EXPECTED_DESCRIPTOR_WITHOUT_FINGERPRINT = """ -Consensus Descriptor:----------+ -| No consensus data available | -+------------------------------+ -""".strip() - -EXPECTED_DESCRIPTOR = """ -Consensus Descriptor (29787760145CD1A473552A2FC64C72A9A130820E):---------------+ -| 1 Consensus: | -| 2 | -| 3 r cyberphunk KXh3YBRc0aRzVSovxkxyqaEwgg4 VjdJThHuYj0jDY2tkkDJkCa8s1s | -| 2016-04-04 19:03:16 94.23.150.191 8080 0 | -| 4 s Fast Guard Running Stable Valid | -| 5 w Bandwidth=8410 | -| 6 p reject 1-65535 | -| 7 | -| 8 Server Descriptor: | -| 9 | -| 10 router cyberphunk 94.23.150.191 8080 0 0 | -| 11 platform Tor 0.2.4.27 on Linux | -| 12 protocols Link 1 2 Circuit 1 | -| 13 published 2016-04-04 19:03:16 | -| 14 fingerprint 2978 7760 145C D1A4 7355 2A2F C64C 72A9 A130 820E | -| 15 uptime 3899791 | -| 16 bandwidth 10240000 10444800 6482376 | -| 17 extra-info-digest 9DC532664DDFD238A4119D623D30F136A3B851BF | -| 18 reject *:* | -| 19 router-signature | -| 20 -----BEGIN SIGNATURE----- | -| 21 EUFm38gONCoDuY7ZWHyJtBKuvk6Xi1MPuKuecS5frP3fX0wiZSrOVcpX0X8J+4Hr | -| 22 Fb5i+yuMIAXeEn6UhtjqhhZBbY9PW9GdZOMTH8hJpG+evURyr+10PZq6UElg86rA | -+------------------------------------------------------------------------------+ -""".strip() - class TestPopups(unittest.TestCase): @require_curses

1 0

[nyx/master] Float division in popups
by atagar＠torproject.org 28 Aug '16

28 Aug '16

commit 94428d5841c1a6bc79220846142b5253b49dab04 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 28 10:28:54 2016 -0700 Float division in popups Oops, there was more float division in our popups.py, causing assertion failures rather than errors. With this our tests now pass under python 3.x! --- nyx/popups.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nyx/popups.py b/nyx/popups.py index ecea237..ee4910c 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -67,7 +67,7 @@ def show_help(): subwindow.addstr(0, 0, 'Page %i Commands:' % (control.get_page() + 1), HIGHLIGHT) for i, option in enumerate(handlers): - if i / 2 >= subwindow.height - 2: + if i // 2 >= subwindow.height - 2: break # Entries are shown in the form '<key>: <description>[ (<selection>)]', @@ -76,7 +76,7 @@ def show_help(): # u: duplicate log entries (hidden) x = 2 if i % 2 == 0 else 41 - y = (i / 2) + 1 + y = (i // 2) + 1 x = subwindow.addstr(x, y, option.key, BOLD) x = subwindow.addstr(x, y, ': ' + option.description) @@ -150,7 +150,7 @@ def show_counts(title, counts, fill_char = ' '): sorted_counts = sorted(counts.items(), key = operator.itemgetter(1), reverse = True) for y, (k, v) in enumerate(sorted_counts): - label = '%s %s (%-2i%%)' % (k.ljust(key_width), str(v).rjust(val_width), v * 100 / value_total) + label = '%s %s (%-2i%%)' % (k.ljust(key_width), str(v).rjust(val_width), v * 100 // value_total) x = subwindow.addstr(2, y + 1, label, GREEN, BOLD) for j in range(graph_width * v // value_total): @@ -358,7 +358,7 @@ def select_sort_order(title, options, previous_order, option_colors): for i, option in enumerate(shown_options): attr = HIGHLIGHT if i == cursor_index else NORMAL - subwindow.addstr((i % 4) * 19 + 2, (i / 4) + 4, option, attr) + subwindow.addstr((i % 4) * 19 + 2, (i // 4) + 4, option, attr) with nyx.curses.CURSES_LOCK: while len(new_order) < len(previous_order): @@ -442,8 +442,8 @@ def select_event_types(initial_selection): subwindow._addch(79, 6, curses.ACS_RTEE) for i, event in enumerate(events): - x = subwindow.addstr((i % 3) * 25 + 1, i / 3 + 7, '[X]' if event in selected_events else '[ ]') - x = subwindow.addstr(x + 1, i / 3 + 7, event, HIGHLIGHT if selection == (i + 10) else NORMAL) + x = subwindow.addstr((i % 3) * 25 + 1, i // 3 + 7, '[X]' if event in selected_events else '[ ]') + x = subwindow.addstr(x + 1, i // 3 + 7, event, HIGHLIGHT if selection == (i + 10) else NORMAL) x = subwindow.width - 14

1 0

[nyx/master] filter() provides an iterater rather than a list
by atagar＠torproject.org 28 Aug '16

28 Aug '16

commit de061785bed2a92fff2f82e30ce73ef6050df09b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 28 10:19:06 2016 -0700 filter() provides an iterater rather than a list Standardizing most of our filter() calls to provide us a list... AttributeError: 'filter' object has no attribute 'append' --- nyx/curses.py | 2 +- nyx/panel/config.py | 2 +- nyx/panel/log.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index 922729c..d6176f9 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -511,7 +511,7 @@ def asci_to_curses(msg): continue elif attr in Color: # replace previous color with new one - combined_attr = filter(lambda attr: attr not in Color, combined_attr) + combined_attr = list(filter(lambda attr: attr not in Color, combined_attr)) combined_attr.append(attr) diff --git a/nyx/panel/config.py b/nyx/panel/config.py index 424586c..3a4a67b 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -294,7 +294,7 @@ class ConfigPanel(nyx.panel.Panel): break def _get_config_options(self): - return self._contents if self._show_all else filter(lambda entry: stem.manual.is_important(entry.name) or entry.is_set(), self._contents) + return self._contents if self._show_all else list(filter(lambda entry: stem.manual.is_important(entry.name) or entry.is_set(), self._contents)) def _draw_line(subwindow, x, y, entry, is_selected, value_width, description_width): diff --git a/nyx/panel/log.py b/nyx/panel/log.py index ec9e238..af793aa 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -72,7 +72,7 @@ class LogPanel(nyx.panel.DaemonPanel): logged_events = CONFIG['startup.events'].split(',') tor_events = tor_controller().get_info('events/names', '').split() - invalid_events = filter(lambda event: not event.startswith('NYX_') and event not in tor_events, logged_events) + invalid_events = list(filter(lambda event: not event.startswith('NYX_') and event not in tor_events, logged_events)) if invalid_events: logged_events = ['NOTICE', 'WARN', 'ERR', 'NYX_NOTICE', 'NYX_WARNING', 'NYX_ERROR'] @@ -270,8 +270,8 @@ class LogPanel(nyx.panel.DaemonPanel): show_duplicates = self._show_duplicates event_log = self._event_log_paused if nyx_controller.is_paused() else self._event_log - event_log = filter(lambda entry: event_filter.match(entry.display_message), event_log) - event_log = filter(lambda entry: not entry.is_duplicate or show_duplicates, event_log) + event_log = list(filter(lambda entry: event_filter.match(entry.display_message), event_log)) + event_log = list(filter(lambda entry: not entry.is_duplicate or show_duplicates, event_log)) is_scrollbar_visible = last_content_height > subwindow.height - 1

1 0