commit dd3a8b0b94fb7118cd27a0452502127567fd67e8 Author: n8fr8 nathan@guardianproject.info Date: Wed Jun 5 15:05:34 2019 -0400

improve how bridge lines are configured --- .../src/main/java/org/torproject/android/service/TorService.java | 6 ++++-- .../main/java/org/torproject/android/service/util/CustomShell.java | 1 - 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 9eced17b..f4785a0f 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -1597,8 +1597,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon

//check if any PT bridges are needed if (obfsBridges) { - extraLines.append("ClientTransportPlugin obfs3 exec " + fileObfsclient.getCanonicalPath()).append('\n'); - extraLines.append("ClientTransportPlugin obfs4 exec " + fileObfsclient.getCanonicalPath()).append('\n'); + extraLines.append("ClientTransportPlugin obfs3 exec ") + .append(fileObfsclient.getCanonicalPath()).append('\n'); + extraLines.append("ClientTransportPlugin obfs4 exec ") + .append(fileObfsclient.getCanonicalPath()).append('\n'); }

if (meekBridges) { diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java b/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java index f5d4c921..889e8b4d 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/CustomShell.java @@ -32,7 +32,6 @@ public class CustomShell extends Shell { //Process process = runWithEnv(command, env); ProcessBuilder builder = new ProcessBuilder();

- if (env != null && (!env.isEmpty())) builder.environment().putAll(env);