Merge branch 'tornetwork' of dan/libricochet-go into master
This commit is contained in:
commit
8db3c09fce
|
@ -220,7 +220,7 @@ func StartTor(appDirectory string, bundledTorPath string) (ACN, error) {
|
||||||
|
|
||||||
// if not, try running system tor
|
// if not, try running system tor
|
||||||
if checkCmdlineTorVersion("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 {
|
if err == nil {
|
||||||
tp.t = t
|
tp.t = t
|
||||||
go tp.monitorRestart()
|
go tp.monitorRestart()
|
||||||
|
@ -232,7 +232,7 @@ func StartTor(appDirectory string, bundledTorPath string) (ACN, error) {
|
||||||
// try running bundledTor
|
// try running bundledTor
|
||||||
if bundledTorPath != "" && checkCmdlineTorVersion(bundledTorPath) {
|
if bundledTorPath != "" && checkCmdlineTorVersion(bundledTorPath) {
|
||||||
log.Debugln("using bundled tor '" + 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 {
|
if err != nil {
|
||||||
log.Debugf("Error running bundled tor: %v\n", err)
|
log.Debugf("Error running bundled tor: %v\n", err)
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue