commit ca65d08a0333864c1360a4f71b52088d6145f332 Merge: a479cc9a b5b4c9bc Author: n8fr8 <nathan@guardianproject.info> Date: Fri Nov 15 11:13:37 2019 -0500 Merge branch 'master' of github.com:guardianproject/orbot .../torproject/android/control/EventHandler.java | 2 +- .../android/control/TorControlConnection.java | 58 ++-- .../torproject/android/service/OrbotConstants.java | 4 +- .../org/torproject/android/service/TorService.java | 334 ++++++++++----------- .../android/service/TorServiceConstants.java | 53 ++-- 5 files changed, 218 insertions(+), 233 deletions(-)