[tor-commits] [sandboxed-tor-browser/master] fixup! Bug #20798: Try harder to clean up failed tor processes.

yawning at torproject.org yawning at torproject.org
Sun Nov 27 13:37:42 UTC 2016


commit b342afcd1a7bdf398c8a546b2525f9ef5bacea1a
Author: Yawning Angel <yawning at schwanenlied.me>
Date:   Sun Nov 27 13:36:39 2016 +0000

    fixup! Bug #20798: Try harder to clean up failed tor processes.
    
    Remove redundant cleanup.
---
 src/cmd/sandboxed-tor-browser/internal/ui/ui.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/cmd/sandboxed-tor-browser/internal/ui/ui.go b/src/cmd/sandboxed-tor-browser/internal/ui/ui.go
index e7316f9..b25e397 100644
--- a/src/cmd/sandboxed-tor-browser/internal/ui/ui.go
+++ b/src/cmd/sandboxed-tor-browser/internal/ui/ui.go
@@ -289,8 +289,6 @@ func (c *Common) launchTor(async *Async, onlySystem bool) (dialFunc, error) {
 		async.UpdateProgress("Waiting on Tor bootstrap.")
 		c.tor = tor.NewSandboxedTor(c.Cfg, cmd)
 		if err = c.tor.DoBootstrap(c.Cfg, async); err != nil {
-			c.tor.Shutdown()
-			c.tor = nil
 			async.Err = err
 			return nil, err
 		}



More information about the tor-commits mailing list