[tor-commits] [orbot/master] Merge branch 'master' of git://git.torproject.org/n8fr8/orbot

[n8fr8@xxxxxxxxxxxxxx]

commit 34ce45398f7a97daf59722a95a295a7798ebdec8
Merge: 3d3de96 e86e1d9
Author: Sathyanarayanan Gunasekaran <gsathya.ceg@xxxxxxxxx>
Date:   Mon Jul 25 21:57:58 2011 -0400

    Merge branch 'master' of git://git.torproject.org/n8fr8/orbot
    
    Conflicts:
    	AUTHORS
    	AndroidManifest.xml

 AndroidManifest.xml                                |   12 +-
 BUILD                                              |    8 +-
 CHANGELOG                                          |    9 +
 WALKTHROUGH                                        |   90 ++
 res/drawable/icon_firefox.png                      |  Bin 0 -> 9233 bytes
 res/drawable/icon_orweb.png                        |  Bin 8783 -> 0 bytes
 res/drawable/icon_otrchat.png                      |  Bin 4610 -> 0 bytes
 res/drawable/proxymob.png                          |  Bin 0 -> 11265 bytes
 res/drawable/warning.png                           |  Bin 0 -> 2922 bytes
 res/layout/layout_apps_item.xml                    |    3 +-
 res/layout/layout_main.xml                         |   22 +-
 res/layout/layout_wizard_permissions.xml           |   55 +
 res/layout/layout_wizard_root.xml                  |   64 +-
 res/layout/layout_wizard_tips.xml                  |   56 +-
 res/layout/scrollingtext_buttons_view.xml          |   68 ++
 res/raw/tor                                        |  Bin 3188430 -> 0 bytes
 res/raw/toraa                                      |  Bin 0 -> 1048576 bytes
 res/raw/torab                                      |  Bin 0 -> 1048576 bytes
 res/raw/torac                                      |  Bin 0 -> 1048576 bytes
 res/raw/torad                                      |  Bin 0 -> 194605 bytes
 res/raw/torrc                                      |    3 +
 res/values-ar/strings.xml                          |    1 -
 res/values-ca/strings.xml                          |    1 -
 res/values-de/strings.xml                          |    1 -
 res/values-es/strings.xml                          |    1 -
 res/values-fa/strings.xml                          |    1 -
 res/values-mk/strings.xml                          |    1 -
 res/values-nb/strings.xml                          |    1 -
 res/values-nl/strings.xml                          |    1 -
 res/values-pl/strings.xml                          |    1 -
 res/values-pt/strings.xml                          |    1 -
 res/values-ru/strings.xml                          |    1 -
 res/values-sv/strings.xml                          |    1 -
 res/values-zh/strings.xml                          |    1 -
 res/values/strings.xml                             |   40 +-
 res/values/theme.xml                               |    9 +
 res/xml/preferences.xml                            |   26 +-
 .../torproject/android/ConfigureTransProxy.java    |  183 ++++
 src/org/torproject/android/LotsaText.java          |  133 +++
 src/org/torproject/android/Orbot.java              |  878 +++++++++--------
 src/org/torproject/android/Permissions.java        |  229 +++++
 .../torproject/android/SettingsPreferences.java    |   14 +-
 src/org/torproject/android/TipsAndTricks.java      |  139 +++
 src/org/torproject/android/WizardActivity.java     |   71 --
 src/org/torproject/android/WizardHelper.java       |   10 +-
 .../android/boot/OnbootBroadcastReceiver.java      |   37 -
 src/org/torproject/android/service/Api.java        | 1058 --------------------
 .../android/service/IptablesManager.java           | 1058 ++++++++++++++++++++
 .../android/service/TorBinaryInstaller.java        |  154 +---
 src/org/torproject/android/service/TorService.java |  100 +-
 .../android/service/TorServiceUtils.java           |   37 +-
 .../torproject/android/service/TorTransProxy.java  |   43 +-
 52 files changed, 2797 insertions(+), 1825 deletions(-)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits