[tor-commits] [sandboxed-tor-browser/master] fixup! Bug 21184: Do a better job of killing/cleaning up bwrap children.

[yawning at torproject.org]

commit c7b559f6b7f216ed968ff703773688c826c14cd7
Author: Yawning Angel <yawning at schwanenlied.me>
Date:   Tue Jan 10 08:07:48 2017 +0000

    fixup! Bug 21184: Do a better job of killing/cleaning up bwrap children.
---
 src/cmd/sandboxed-tor-browser/internal/tor/tor.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cmd/sandboxed-tor-browser/internal/tor/tor.go b/src/cmd/sandboxed-tor-browser/internal/tor/tor.go
index 69d9307..ffdf369 100644
--- a/src/cmd/sandboxed-tor-browser/internal/tor/tor.go
+++ b/src/cmd/sandboxed-tor-browser/internal/tor/tor.go
@@ -245,8 +245,9 @@ func (t *Tor) launchSurrogates(cfg *config.Config) error {
 }
 
 func (t *Tor) eventReader() {
+	ctrl := t.ctrl
 	for {
-		resp, err := t.ctrl.NextEvent()
+		resp, err := ctrl.NextEvent()
 		if err != nil {
 			break
 		}