Fix merge issues

psiphon/server/api.go

@@ -361,7 +361,7 @@ func handshakeAPIRequestHandler(
 			return nil, errors.TraceNew("invalid client IP")
 		}
 
-		encodedServerList = support.discovery.DiscoverServers(clientIP)
+		encodedServerList = support.discovery.DiscoverServers(IP)
 	}
 
 	// When the client indicates that it used an out-of-date server entry for

psiphon/server/server_test.go

@@ -417,7 +417,6 @@ func TestHotReloadWithTactics(t *testing.T) {
 	runServer(t,
 		&runServerConfig{
 			tunnelProtocol:       "UNFRONTED-MEEK-OSSH",
-			enableSSHAPIRequests: true,
 			doHotReload:          true,
 			requireAuthorization: true,
 			doTunneledWebRequest: true,