[tor-commits] [orbot/master] Merge branch 'tethering'

Fri Oct 28 15:28:27 UTC 2011

commit 6a4388de28ed62fd9ff4525c4164f38a53e55f60
Merge: 73b6a06 8dffdba
Author: Nathan Freitas <nathan at freitas.net>
Date:   Sun Jul 24 14:31:02 2011 -0400

    Merge branch 'tethering'

 AndroidManifest.xml                                |    2 +-
 CHANGELOG                                          |    3 +
 res/raw/torrc                                      |    3 +
 res/values/strings.xml                             |    4 +
 res/xml/preferences.xml                            |    7 +
 src/org/torproject/android/Orbot.java              | 1303 +++++++++++---------
 .../android/boot/OnbootBroadcastReceiver.java      |   37 -
 src/org/torproject/android/service/TorService.java |   15 +-
 .../torproject/android/service/TorTransProxy.java  |   43 +-
 9 files changed, 755 insertions(+), 662 deletions(-)