richard pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits: acbcf5cf by Pier Angelo Vendrame at 2023-09-12T20:20:34+00:00 Bug 40941: Remove Snowflake arguments from Android

On desktop we removed the Snowflake parameters that are passed to the binary a long while ago, but they remained on Android. However, they are not needed, and need to stay outdated, so with this commit we remove them also from Android.

- - - - -

3 changed files:

- projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch - projects/tor-onion-proxy-library/0001-Bug-40800-Add-WebTunnel-support.patch - projects/tor-onion-proxy-library/0001-Bug-41361-Add-conjure-support.patch

Changes:

===================================== projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch ===================================== @@ -71,7 +71,7 @@ index 2405097..bcb6a37 100644 - buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(clientPath).append('\n'); + public TorConfigBuilder transportPlugin(String obfsPath, String snowPath) { + buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n'); -+ buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.torproject.net.global.prod.fastly.net/ -front cdn.sstatic.net -ice stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478\n"); ++ buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append('\n'); return this; }

===================================== projects/tor-onion-proxy-library/0001-Bug-40800-Add-WebTunnel-support.patch ===================================== @@ -63,7 +63,7 @@ index b87993d..5e6d6c5 100644 - public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath) { + public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath, String webtunnelPath) { buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n'); - buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.torproject.net.global.prod.fastly.net/ -front cdn.sstatic.net -ice stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478\n"); + buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append('\n'); buffer.append("ClientTransportPlugin conjure exec ").append(conjurePath).append(" -registerURL https://registration.refraction.network/api%5Cn"); + buffer.append("ClientTransportPlugin webtunnel exec ").append(webtunnelPath).append('\n'); return this;

===================================== projects/tor-onion-proxy-library/0001-Bug-41361-Add-conjure-support.patch ===================================== @@ -70,7 +70,7 @@ index cc10783..c7e20c0 100644 - public TorConfigBuilder transportPlugin(String obfsPath, String snowPath) { + public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath) { buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n'); - buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.torproject.net.global.prod.fastly.net/ -front cdn.sstatic.net -ice stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478\n"); + buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append('\n'); + buffer.append("ClientTransportPlugin conjure exec ").append(conjurePath).append(" -registerURL https://registration.refraction.network/api%5Cn"); return this; }

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/ac...