openprivacy
/
libricochet-go
Archived
4
3
Fork 2
Code Issues 2 Pull Requests Releases 14 Wiki Activity

Merge branch 'tornetwork' of dan/libricochet-go into master

This commit is contained in:
Sarah Jamie Lewis 2019-02-14 19:50:29 +00:00 committed by Gogs
parent 9e4e042ffb fa12b3dcb9
commit 8db3c09fce
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
connectivity/torProvider.go
View File

@ -220,7 +220,7 @@ func StartTor(appDirectory string, bundledTorPath string) (ACN, error) {
// if not, try running system tor
if checkCmdlineTorVersion("tor") {
t, err := tor.Start(nil, &tor.StartConf{DataDir: dataDir, DebugWriter: nil})
t, err := tor.Start(nil, &tor.StartConf{EnableNetwork: true, DataDir: dataDir, DebugWriter: nil})
if err == nil {
tp.t = t
go tp.monitorRestart()
@ -232,7 +232,7 @@ func StartTor(appDirectory string, bundledTorPath string) (ACN, error) {
// try running bundledTor
if bundledTorPath != "" && checkCmdlineTorVersion(bundledTorPath) {
log.Debugln("using bundled tor '" + bundledTorPath + "'")
t, err := tor.Start(nil, &tor.StartConf{DataDir: dataDir, ExePath: bundledTorPath, DebugWriter: nil})
t, err := tor.Start(nil, &tor.StartConf{EnableNetwork: true, DataDir: dataDir, ExePath: bundledTorPath, DebugWriter: nil})
if err != nil {
log.Debugf("Error running bundled tor: %v\n", err)
}