Nathan Freitas f255420782 Merge branch 'kensan/obfsbridge-prefs' into obfs ... Conflicts: src/org/torproject/android/service/TorService.java		2012-02-12 13:05:19 -05:00
..
service	Merge branch 'kensan/obfsbridge-prefs' into obfs	2012-02-12 13:05:19 -05:00
settings	updated way for checking for ROOT	2012-02-11 22:41:25 -05:00
wizard	cleaned up override settings	2012-01-25 20:06:25 -05:00
HiddenServiceManager.java	big checkin for 0.0.8-beta-280710a build with new start wizard, improved ctrlport handling, and root config	2010-07-28 04:43:58 +00:00
OnBootReceiver.java	fixed onboot handling and updated transproxy	2011-05-10 02:08:16 +00:00
Orbot.java	cleaned up locale, set default to EN	2012-02-12 12:29:30 -05:00
OrbotApp.java	cleaned up locale, set default to EN	2012-02-12 12:29:30 -05:00
TorConstants.java	Add constants related to obfuscated bridges	2012-02-12 13:28:32 +01:00
Utils.java	alpha-1.0.3 RC1: cleaned up unnecessary log output; improved iptables handling for transproxy	2010-09-09 20:39:52 +00:00