From 9cb11162cf42f61ce8c6482a04d2c2d13c51a716 Mon Sep 17 00:00:00 2001
From: erinn <erinn.atwater@uwaterloo.ca>
Date: Mon, 26 Nov 2018 13:57:28 -0800
Subject: [PATCH] initial commit

---
 main.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/main.go b/main.go
index 319166c..840e4e8 100644
--- a/main.go
+++ b/main.go
@@ -20,6 +20,7 @@ import (
 	"bounce/go/cwtchthings"
 	"bounce/go/gothings"
 	"bounce/go/gobjects"
+	"git.openprivacy.ca/openprivacy/libricochet-go/connectivity"
 )
 
 func init() {
@@ -103,12 +104,13 @@ func loadCwtchData(gcd *gothings.GrandCentralDispatcher) {
 	*/
 	os.MkdirAll(the.CwtchDir, 0700)
 
-	the.CwtchApp, err = libapp.NewApp(the.CwtchDir, "tor")
+	mn, err := connectivity.StartTor(the.CwtchDir, "")
 	if err != nil {
-		//TODO no more fatalfs
-		log.Fatalf("couldn't create cwtch app: %v", err)
+		log.Printf("[!!!] Could not start Tor: %v", err)
 	}
 
+	the.CwtchApp = libapp.NewApp(mn, the.CwtchDir)
+
 	err = the.CwtchApp.LoadProfiles("be gay do crime")
 	if err != nil {
 		//TODO no more fatalfs