commit 3f4b76a17193a9d7c58eeb5401f87061bd92c3a4 Merge: d02c5ea 7d243af Author: Jordan jordannh@sent.com Date: Wed Aug 13 21:31:12 2014 -0700

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

AndroidManifest.xml | 4 ++-- CHANGELOG | 2 ++ external/jtorctl | 2 +- src/org/torproject/android/service/TorService.java | 5 ++++- 4 files changed, 9 insertions(+), 4 deletions(-)