[tor-commits] [orbot/master] v11 stable update

[n8fr8 at torproject.org]

commit 2d9e6c04b6e0d19831b32925f7b43ab1191ca9f2
Author: n8fr8 <nathan at freitas.net>
Date:   Wed Nov 7 01:30:16 2012 +0530

    v11 stable update
---
 AndroidManifest.xml |    4 ++--
 CHANGELOG           |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c527198..0fa75da 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.torproject.android" 
-      android:versionName="0.2.3.23-rc-1.0.11-RC5-test2" 
-      android:versionCode="51"
+      android:versionName="0.2.3.23-rc-1.0.11-RC6" 
+      android:versionCode="52"
         android:installLocation="auto"
       >
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/CHANGELOG b/CHANGELOG
index 15fa59a..d7ada10 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,8 @@
 NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/
 
 1.0.11
-- Tor updated to 0.2.4.4-alpha
+- Tor updated to 0.2.3.23-RC
+- ActionBarSherlock updated to latest release
 - libevent2 on 2.2.1-alpha
 - added data up/down speed and totals display
 - added new "Log" SlideDrawer log display