[tor-commits] [orbot/master] moving versioning to 1.0.8

[n8fr8 at torproject.org]

commit a7320ea477198e7132c71156a626c66e03784124
Author: Nathan Freitas <nathan at freitas.net>
Date:   Sun Apr 8 23:25:35 2012 -0400

    moving versioning to 1.0.8
---
 AndroidManifest.xml |    2 +-
 CHANGELOG           |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2a806d2..8790d7f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?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.11-alpha-1.0.7.3-ALPHA-2" 
+      android:versionName="0.2.3.11-alpha-1.0.8-RC1" 
       android:versionCode="37"
         android:installLocation="auto"
       >
diff --git a/CHANGELOG b/CHANGELOG
index 95bd499..d3997ad 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,11 +1,9 @@
 NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/
 
-1.0.7.3
+1.0.8 (includes 1.0.7.3 and 1.0.7.2)
 - fixed tor control port cookie file path lookup related to #5305 
 - updated strings
 - adding in manual locale selection
-
-1.0.7.2
 - added obfsproxy binary to res/raw and binary installation process
 - added new preferences to support obfsproxy bridge configuration
 - upgraded tor binary to 0.2.3.11-alpha