[tor-commits] [orbot/master] Merge branch 'kensan/obfsbridge-prefs' into obfs

[n8fr8 at torproject.org]

commit f2554207829268dd389c8c76507229a864d19ffd
Merge: 48ea51f ab4f789
Author: Nathan Freitas <nathan at freitas.net>
Date:   Sun Feb 12 13:05:19 2012 -0500

    Merge branch 'kensan/obfsbridge-prefs' into obfs
    
    Conflicts:
    	src/org/torproject/android/service/TorService.java

 res/values/strings.xml                             |    2 ++
 res/xml/preferences.xml                            |   10 ++++++----
 src/org/torproject/android/TorConstants.java       |    1 +
 src/org/torproject/android/service/TorService.java |   18 ++++++++++++++----
 4 files changed, 23 insertions(+), 8 deletions(-)