[tbb-commits] [tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28051 - Use our Orbot for proxying our connections

[gk at torproject.org]

commit 2ffe1e523e67c62a5bc160cfa8d09030cbdf5267
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Wed Nov 14 17:39:03 2018 +0000

    Bug 28051 - Use our Orbot for proxying our connections
---
 mobile/android/app/000-tor-browser-android.js                         | 3 ---
 .../geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js
index c329fcdee5f7..e7e337276acb 100644
--- a/mobile/android/app/000-tor-browser-android.js
+++ b/mobile/android/app/000-tor-browser-android.js
@@ -54,9 +54,6 @@ pref("media.realtime_decoder.enabled", false);
 pref("general.useragent.updates.enabled", false);
 pref("general.useragent.updates.url", "");
 
-// Override this because Orbot uses 9050 as the default
-pref("network.proxy.socks_port", 9050);
-
 // Do not allow the user to install extensions from web
 pref("xpinstall.enabled", false);
 pref("extensions.enabledScopes", 1);
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
index f05716fe1d09..41c2c7e705a1 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
@@ -30,8 +30,8 @@ import java.util.List;
 
 public class ProxySelector {
     private static final String TOR_PROXY_ADDRESS = "127.0.0.1";
-    private static final int TOR_SOCKS_PROXY_PORT = 9050;
-    private static final int TOR_HTTP_PROXY_PORT = 8118;
+    private static final int TOR_SOCKS_PROXY_PORT = 9150;
+    private static final int TOR_HTTP_PROXY_PORT = 8218;
 
     public static URLConnection openConnectionWithProxy(URI uri) throws IOException {
         java.net.ProxySelector ps = java.net.ProxySelector.getDefault();