commit 64ed05eb5a2a8990a301102c48ab72777131e1ca Merge: 7cf3732 4574c95 Author: Nathan Freitas <nathan@freitas.net> Date: Mon Nov 14 03:25:27 2011 -0500 Merge branch 'fixwizard' AUTHORS | 2 +- GSoC.txt | 45 ++++++++++++++++++++ src/org/torproject/android/Orbot.java | 4 +- src/org/torproject/android/TorConstants.java | 2 +- src/org/torproject/android/service/TorService.java | 7 ++- .../android/wizard/ConfigureTransProxy.java | 14 ++++++- src/org/torproject/android/wizard/LotsaText.java | 13 +++++- src/org/torproject/android/wizard/Permissions.java | 12 +++++ .../torproject/android/wizard/TipsAndTricks.java | 13 +++++- 9 files changed, 103 insertions(+), 9 deletions(-)