commit 1229da66cbdae17a47b6ee771e25f5ab717869c4 Merge: a07333d 9879b53 Author: Jordan jordannh@sent.com Date: Mon Sep 1 19:27:17 2014 -0700

Merge branch 'master' of https://git.torproject.org/orbot

AndroidManifest.xml | 4 +- CHANGELOG | 27 ++ procfg.txt | 1 + res/menu/main.xml | 2 +- res/raw/torrc | 3 +- res/values/strings.xml | 3 + res/xml/preferences.xml | 5 + src/org/torproject/android/Orbot.java | 281 +++++++++----------- src/org/torproject/android/TorConstants.java | 6 - .../torproject/android/service/ITorService.aidl | 2 + src/org/torproject/android/service/TorService.java | 264 +++++++++++------- .../android/service/TorServiceConstants.java | 5 +- .../torproject/android/service/TorTransProxy.java | 65 +++-- .../android/settings/SettingsPreferences.java | 21 ++ 14 files changed, 402 insertions(+), 287 deletions(-)