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

cretz · Jan 17, 2019 · 452e22d · 452e22d
2 parents 7266940 + 62912bf
commit 452e22d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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)
 	}