commit ea556bb9e3b08dcf99dc1c607814c65ae9aaf781 Merge: d38e9e1a 57e3ee1b Author: n8fr8 nathan@guardianproject.info Date: Tue Jan 28 15:48:48 2020 -0500
Merge branch 'master' of gitlab.com:guardianproject/orbot
.../java/org/torproject/android/service/util/ExternalIPFetcher.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --cc orbotservice/src/main/java/org/torproject/android/service/util/ExternalIPFetcher.java index 080ed961,e9a9b575..698f02af --- a/orbotservice/src/main/java/org/torproject/android/service/util/ExternalIPFetcher.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/ExternalIPFetcher.java @@@ -2,8 -2,8 +2,9 @@@ package org.torproject.android.service.
import org.json.JSONArray; import org.json.JSONObject; +import org.torproject.android.service.OrbotService; import org.torproject.android.service.TorEventHandler; + import org.torproject.android.service.OrbotService;
import java.io.BufferedReader; import java.io.InputStream; @@@ -92,4 -92,4 +93,4 @@@ public class ExternalIPFetcher implemen }
--} ++}