Merge branch 'master' into staging-client

Psiphon-Labs · Jul 8, 2019 · 1693611 · 1693611
2 parents aa2f829 + 758bd66
commit 1693611
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/psiphon/common/tapdance/tapdance_disabled.go b/psiphon/common/tapdance/tapdance_disabled.go
@@ -47,6 +47,6 @@ func Listen(_ string) (*Listener, error) {
 }
 
 // Dial establishes a new Tapdance session to a Tapdance station.
-func Dial(_ context.Context, _ string, _ common.NetDialer, _ string) (net.Conn, error) {
+func Dial(_ context.Context, _ bool, _ string, _ common.NetDialer, _ string) (net.Conn, error) {
 	return nil, common.ContextError(disabledError)
 }