Merge pull request 'Fix deadlock when reset occurs during cool-off period' (#17) from fix-deadlock into master

Reviewed-on: #17

tor/torProvider.go

@@ -212,11 +212,12 @@ func (tp *torProvider) Restart() {
 	log.Debugf("launching restart...")
 
 	tp.lock.Lock()
+	defer tp.lock.Unlock()
 	log.Debugf("checking last restart time")
 	if time.Now().Sub(tp.lastRestartTime) < restartCooldown {
 		return
 	}
-	tp.lock.Unlock()
+
 
 	go tp.restart()
 }

tor/torProvider_test.go

@@ -40,5 +40,12 @@ func TestTorProvider(t *testing.T) {
 		t.Logf("progress: %v", progress)
 	}
 
+	// Should skip without blocking...
+	acn.Restart()
+	acn.Restart()
+	acn.Restart()
+
+
+
 	acn.Close()
 }