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

[sandboxed-tor-browser/master] Bump the version to 0.0.16-dev.
by yawning＠torproject.org 30 Oct '17

30 Oct '17

commit 980ba5a624635e3b7d1a0ebd6887eaeee436c96f Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Mon Oct 30 07:56:01 2017 +0000 Bump the version to 0.0.16-dev. --- ChangeLog | 2 ++ data/version | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d5b3dc4..1471ea2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +Changes in version 0.0.16 - UNRELEASED: + Changes in version 0.0.15 - 2017-10-30: * Bug 23915: 7.0.7 and later fails to work without `SECCOMP_FILTER_FLAG_TSYNC`. * Bug 23166: Add Felix's obfs4 bridges to the built-in bridges. diff --git a/data/version b/data/version index ceddfb2..e0c3e76 100644 --- a/data/version +++ b/data/version @@ -1 +1 @@ -0.0.15 +0.0.16-dev

1 0

[sandboxed-tor-browser/master] Bug 23943: obfs4proxy crashes on certain systems.
by yawning＠torproject.org 30 Oct '17

30 Oct '17

commit d857177869edce5037c1d213b4dfbb0882c073dd Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Sun Oct 22 12:59:49 2017 +0000 Bug 23943: obfs4proxy crashes on certain systems. Depending on something that's system specific (recent Ewwbuntu, Arch, but not F26), obfs4proxy calls mmap slightly differently, and dies because the call is getting `ENOSYS`ed by seccomp. --- ChangeLog | 1 + data/tor-obfs4-amd64.seccomp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 23afbf8..05d1cea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ Changes in version 0.0.15 - UNRELEASED: * Bug 23915: 7.0.7 and later fails to work without `SECCOMP_FILTER_FLAG_TSYNC`. + * Bug 23943: obfs4proxy crashes on certain systems. Changes in version 0.0.14 - 2017-09-29: * Bug 8706: Fully disable the .recently-used.xbel. diff --git a/data/tor-obfs4-amd64.seccomp b/data/tor-obfs4-amd64.seccomp index b7ac52d..d48c8af 100644 --- a/data/tor-obfs4-amd64.seccomp +++ b/data/tor-obfs4-amd64.seccomp @@ -54,5 +54,5 @@ epoll_create1: arg0 == EPOLL_CLOEXEC futex: arg1 == FUTEX_WAIT_BITSET_PRIVATE|FUTEX_CLOCK_REALTIME || arg1 == FUTEX_WAKE_PRIVATE || arg1 == FUTEX_WAIT_PRIVATE || arg1 == FUTEX_WAKE || arg1 == FUTEX_WAIT mprotect: arg2 == PROT_READ || arg2 == PROT_NONE || arg2 == PROT_READ|PROT_WRITE -mmap: (arg2 == PROT_READ && arg3 == MAP_PRIVATE) || (arg2 == PROT_NONE && arg3 == MAP_PRIVATE|MAP_ANONYMOUS|MAP_NORESERVE) || (arg2 == PROT_READ|PROT_WRITE && arg3 == MAP_PRIVATE|MAP_ANONYMOUS) || (arg2 == PROT_READ|PROT_WRITE && arg3 == MAP_PRIVATE|MAP_ANONYMOUS|MAP_STACK) || (arg2 == PROT_READ|PROT_WRITE && arg3 == MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE) || (arg2 == PROT_READ|PROT_WRITE && arg3 == MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS) || (arg2 == PROT_READ|PROT_EXEC && arg3 == MAP_PRIVATE|MAP_DENYWRITE) || (arg2 == PROT_READ|PROT_WRITE && arg3 == MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_NORESERVE) || (arg2 == PROT_NONE && arg3 == MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_NORESERVE) || (arg2 == PROT_NONE && arg3 == MAP_PRIVATE|MAP_ANONYMOUS) || (arg2 == PROT_NONE && arg3 == MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS) +mmap: (arg2 == PROT_READ && arg3 == MAP_PRIVATE) || (arg2 == PROT_NONE && arg3 == MAP_PRIVATE|MAP_ANONYMOUS|MAP_NORESERVE) || (arg2 == PROT_READ|PROT_WRITE && arg3 == MAP_PRIVATE|MAP_ANONYMOUS) || (arg2 == PROT_READ|PROT_WRITE && arg3 == MAP_PRIVATE|MAP_ANONYMOUS|MAP_STACK) || (arg2 == PROT_READ|PROT_WRITE && arg3 == MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE) || (arg2 == PROT_READ|PROT_WRITE && arg3 == MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS) || (arg2 == PROT_READ|PROT_EXEC && arg3 == MAP_PRIVATE|MAP_DENYWRITE) || (arg2 == PROT_READ|PROT_WRITE && arg3 == MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_NORESERVE) || (arg2 == PROT_NONE && arg3 == MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_NORESERVE) || (arg2 == PROT_NONE && arg3 == MAP_PRIVATE|MAP_ANONYMOUS) || (arg2 == PROT_NONE && arg3 == MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS) || (arg2 == PROT_NONE && arg3 == MAP_PRIVATE|MAP_ANONYMOUS|MAP_STACK) setsockopt: (arg1 == SOL_SOCKET && (arg2 == SO_REUSEADDR || arg2 == SO_SNDBUF || arg2 == SO_RCVBUF || arg2 == SO_BROADCAST)) || (arg1 == SOL_TCP && arg2 == TCP_NODELAY) || (arg1 == SOL_IPV6 && arg2 == IPV6_V6ONLY)

1 0

[sandboxed-tor-browser/master] Merge branch 'bug23943'
by yawning＠torproject.org 30 Oct '17

30 Oct '17

commit fd0e6b2e702c59a92acc862d742b77470afecd06 Merge: 9ae4b65 d857177 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Mon Oct 30 07:51:02 2017 +0000 Merge branch 'bug23943' ChangeLog | 1 + data/tor-obfs4-amd64.seccomp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --cc ChangeLog index 412c05c,05d1cea..6d9071f --- a/ChangeLog +++ b/ChangeLog @@@ -1,7 -1,6 +1,8 @@@ Changes in version 0.0.15 - UNRELEASED: * Bug 23915: 7.0.7 and later fails to work without `SECCOMP_FILTER_FLAG_TSYNC`. + * Bug 23166: Add Felix's obfs4 bridges to the built-in bridges. + * Bug 23943: obfs4proxy crashes on certain systems. + * Disable the 2017 donation campaign banner. Changes in version 0.0.14 - 2017-09-29: * Bug 8706: Fully disable the .recently-used.xbel.

1 0

[sandboxed-tor-browser/master] Disable the 2017 donation campaign banner.
by yawning＠torproject.org 30 Oct '17

30 Oct '17

commit c57e2f3a42068bc11e635e087cead98c8fb281e2 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Oct 25 19:35:45 2017 +0000 Disable the 2017 donation campaign banner. --- ChangeLog | 1 + data/installer/mozilla.cfg | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 23afbf8..33214bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ Changes in version 0.0.15 - UNRELEASED: * Bug 23915: 7.0.7 and later fails to work without `SECCOMP_FILTER_FLAG_TSYNC`. + * Disable the 2017 donation campaign banner. Changes in version 0.0.14 - 2017-09-29: * Bug 8706: Fully disable the .recently-used.xbel. diff --git a/data/installer/mozilla.cfg b/data/installer/mozilla.cfg index 0def436..fc62618 100644 --- a/data/installer/mozilla.cfg +++ b/data/installer/mozilla.cfg @@ -56,3 +56,6 @@ lockPref("browser.download.forbid_open_with", true); // by default, because I'm writing this for me, and my workflow is what // matters. defaultPref("middlemouse.contentLoadURL", true); + +// Disable the 2017 donation campaign banner. +pref("extensions.torbutton.donation_banner2017.shown_count", 50);

1 0

[sandboxed-tor-browser/master] Bug 23166: Add Felix's obfs4 bridges to the built-in bridges.
by yawning＠torproject.org 30 Oct '17

30 Oct '17

commit 9ae4b6539df222d13159510bd17d2385e3669aac Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Mon Oct 30 07:49:28 2017 +0000 Bug 23166: Add Felix's obfs4 bridges to the built-in bridges. https://gitweb.torproject.org/builders/tor-browser-build.git/commit/project… --- ChangeLog | 1 + data/bridges.json | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 33214bc..412c05c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ Changes in version 0.0.15 - UNRELEASED: * Bug 23915: 7.0.7 and later fails to work without `SECCOMP_FILTER_FLAG_TSYNC`. + * Bug 23166: Add Felix's obfs4 bridges to the built-in bridges. * Disable the 2017 donation campaign banner. Changes in version 0.0.14 - 2017-09-29: diff --git a/data/bridges.json b/data/bridges.json index fa73eed..e0b59e1 100644 --- a/data/bridges.json +++ b/data/bridges.json @@ -32,6 +32,8 @@ "obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1", - "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0" + "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0", + "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0", + "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0" ] }

1 0

[stem/master] Limit number of events buffered by interpreter
by atagar＠torproject.org 30 Oct '17

30 Oct '17

commit 66243c4110d9116e6dfabdb0d8694fe1f04e6227 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 29 23:56:48 2017 -0700 Limit number of events buffered by interpreter Sweet jesus that was a pita to track down. Nyx has a memory leak, holding onto events tor emits indefinitely. Spent all day headscratching and finally found it. Our control interpreter intercepts events and enqueues them without bound. Finally caught thanks to the gc module... to_ignore = [ locals(), globals(), gc.garbage ] log.warn("refs: %s" % [inspect.getframeinfo(r) for r in gc.get_referrers(event_message) if r not in to_ignore]) ... which gave... 06:44:50 [NYX_WARNING] refs: [Traceback(filename='/home/ubuntu/nyx/stem/interpreter/commands.py', lineno=135, function='handle_event_wrapper', code_context=[' handle_event_real(event_message)\n'], index=0), Traceback(filename='/home/ubuntu/nyx/stem/control.py', lineno=3812, function='_handle_event', code_context=[' log.warn("refs: %s" % [inspect.getframeinfo(r) for r in gc.get_referrers(event_message) if r not in to_ignore])\n'], index=0), Traceback(filename='/home/ubuntu/nyx/stem/control.py', lineno=975, function='_event_loop', code_context=[' self._handle_event(event_message)\n'], index=0)] [998 duplicates hidden] --- stem/interpreter/commands.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/stem/interpreter/commands.py b/stem/interpreter/commands.py index 45f2e2ca..d47cccdd 100644 --- a/stem/interpreter/commands.py +++ b/stem/interpreter/commands.py @@ -26,6 +26,8 @@ try: except ImportError: from io import StringIO +MAX_EVENTS = 100 + def _get_fingerprint(arg, controller): """ @@ -133,7 +135,10 @@ class ControlInterpreter(code.InteractiveConsole): def handle_event_wrapper(event_message): handle_event_real(event_message) - self._received_events.append(event_message) + self._received_events.insert(0, event_message) + + if len(self._received_events) > MAX_EVENTS: + self._received_events.pop() self._controller._handle_event = handle_event_wrapper

1 0

[nyx/master] Alias ERR for ERROR and WARN for WARNING
by atagar＠torproject.org 30 Oct '17

30 Oct '17

commit e0a813df6ca3e92acce77a14fc94acd66fb9f323 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 29 20:57:23 2017 -0700 Alias ERR for ERROR and WARN for WARNING Fixing a couple easy to make gotchas in our --log argument. It's especially confusing becuase nyx expected 'NYX_WARNING' whereas it displayed 'NYX_WARN'. --- nyx/panel/log.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nyx/panel/log.py b/nyx/panel/log.py index c29f21e..94788a7 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -43,6 +43,16 @@ CONFIG = conf.config_dict('nyx', { 'write_logs_to': '', }, conf_handler) +# Users may understanably mix up 'WARN/WARNING' and 'ERR/ERROR' in their --log +# argument or config, so fixing those. + +EVENT_ALIASES = { + 'WARNING': 'WARN', + 'ERROR': 'ERR', + 'NYX_WARN': 'NYX_WARNING', + 'NYX_ERR': 'NYX_ERROR', +} + UPDATE_RATE = 0.7 # The height of the drawn content is estimated based on the last time we redrew @@ -70,6 +80,12 @@ class LogPanel(nyx.panel.DaemonPanel): nyx.panel.DaemonPanel.__init__(self, UPDATE_RATE) logged_events = CONFIG['logged_events'].split(',') + + for alias, actual_event in EVENT_ALIASES.items(): + if alias in logged_events: + logged_events.remove(alias) + logged_events.append(actual_event) + tor_events = tor_controller().get_info('events/names', '').split() invalid_events = list(filter(lambda event: not event.startswith('NYX_') and event not in tor_events, logged_events))

1 0

[nyx/master] Connection details usually not visible
by atagar＠torproject.org 30 Oct '17

30 Oct '17

commit f6cbc8d66430028d6ff1050db4499d1e2af90ab6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 29 21:21:56 2017 -0700 Connection details usually not visible The 'width' attribute already takes into account the initial 'x' offset, but in the conditional we didn't account for that causing connection details to just about never be shown. --- nyx/panel/connection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index fc586b6..15a2638 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -709,7 +709,7 @@ def _draw_line_details(subwindow, x, y, line, width, attr): comp = ['%-40s' % (line.fingerprint if line.fingerprint else 'UNKNOWN'), ' ' + (line.nickname if line.nickname else 'UNKNOWN')] for entry in comp: - if width >= x + len(entry): + if width >= len(entry): x = subwindow.addstr(x, y, entry, *attr) else: return

1 0

[stem/master] Cache string representation of messages
by atagar＠torproject.org 30 Oct '17

30 Oct '17

commit d69567629fb59df07237b7e0412ea6d310b0bcb1 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 29 22:56:19 2017 -0700 Cache string representation of messages Controller messages frequently reference their string representation, and it's silly to reconstruct it each time. --- stem/response/__init__.py | 6 +++++- stem/util/log.py | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/stem/response/__init__.py b/stem/response/__init__.py index e0de0f5c..362b8931 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -169,6 +169,7 @@ class ControlMessage(object): self._parsed_content = parsed_content self._raw_content = raw_content + self._str = None def is_ok(self): """ @@ -245,7 +246,10 @@ class ControlMessage(object): formatting. """ - return '\n'.join(list(self)) + if self._str is None: + self._str = '\n'.join(list(self)) + + return self._str def __iter__(self): """ diff --git a/stem/util/log.py b/stem/util/log.py index 88b533e6..d2a6e5be 100644 --- a/stem/util/log.py +++ b/stem/util/log.py @@ -219,8 +219,8 @@ class LogBuffer(logging.Handler): Basic log handler that listens for stem events and stores them so they can be read later. Log entries are cleared as they are read. - .. versionchanged:: 1.4.0 - Added the yield_records argument. + .. versionchanged:: 1.4.0 + Added the yield_records argument. """ def __init__(self, runlevel, yield_records = False):

1 0

[tor/master] fix confusion in man page
by arma＠torproject.org 30 Oct '17

30 Oct '17

commit d56b4e598b241fee3448090631731aa434eb64d6 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Oct 30 00:18:40 2017 -0400 fix confusion in man page (I was going to fix "along" to "along with" which was pretty clearly the original intent, but then I realized that it would be confusing whether it's only bad when you use several of them in conjunction, or what. So hopefully this fix is clearer.) --- doc/tor.1.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index e76efddcd..0ee9982e0 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1215,8 +1215,8 @@ The following options are useful only for clients (that is, if nodes via this connection. **UseIPv4Cache**;; Tells the client to use any cached IPv4 DNS answers we have when making - requests via this connection. (NOTE: This option, along UseIPv6Cache - and UseDNSCache, can harm your anonymity, and probably + requests via this connection. (NOTE: This option, or UseIPv6Cache + or UseDNSCache, can harm your anonymity, and probably won't help performance as much as you might expect. Use with care!) **UseIPv6Cache**;; Tells the client to use any cached IPv6 DNS answers we have when making

1 0