Merge branch 'master' of https://github.com/cretz/bine

cretz · cretz · commit 452e22de4fef · 2019-01-17T10:47:21.000-06:00
diff --git a/process/embedded/tor-0.3.5/process.go b/process/embedded/tor-0.3.5/process.go
@@ -25,7 +25,7 @@ import (
 #cgo LDFLAGS: -L${SRCDIR}/../../../../tor-static/xz/dist/lib -llzma
 #cgo LDFLAGS: -L${SRCDIR}/../../../../tor-static/zlib/dist/lib -lz
 #cgo LDFLAGS: -L${SRCDIR}/../../../../tor-static/openssl/dist/lib -lssl -lcrypto
-#cgo windows LDFLAGS: -lws2_32 -lcrypt32 -lgdi32 -liphlpapi
+#cgo windows LDFLAGS: -lws2_32 -lcrypt32 -lgdi32 -liphlpapi -Wl,-Bstatic -lpthread
 #cgo !windows LDFLAGS: -lm
 
 #include <stdlib.h>
diff --git a/tor/tor.go b/tor/tor.go
@@ -161,7 +161,7 @@ func Start(ctx context.Context, conf *StartConf) (*Tor, error) {
 		}
 		tor.Debugf("Created temp data directory at: %v", tor.DataDir)
 		tor.DeleteDataDirOnClose = !conf.RetainTempDataDir
-	} else if err := os.MkdirAll(tor.DataDir, 0600); err != nil {
+	} else if err := os.MkdirAll(tor.DataDir, 0700); err != nil {
 		return nil, fmt.Errorf("Unable to create data dir: %v", err)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ func Start(ctx context.Context, conf StartConf) (Tor, error) {`
`161`	`161`	`}`
`162`	`162`	`tor.Debugf("Created temp data directory at: %v", tor.DataDir)`
`163`	`163`	`tor.DeleteDataDirOnClose = !conf.RetainTempDataDir`
`164`		`- } else if err := os.MkdirAll(tor.DataDir, 0600); err != nil {`
	`164`	`+ } else if err := os.MkdirAll(tor.DataDir, 0700); err != nil {`
`165`	`165`	`return nil, fmt.Errorf("Unable to create data dir: %v", err)`
`166`	`166`	`}`
`167`	`167`