Merge branch 'release-0.9.3' into develop

2 files changed, 17 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index d879089d..98eebcdb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,18 @@
+0.9.3
+Bugs:
+- If VPN connection fails, blocking VPN is turned off
+- Don't try to log out if nothing is logged in.
+- Give better user feedback to some problems
+- Switching orientation doesn't hide any useful message
+- Blocking VPN is more consistently removed if an error happens
+- Typo: you is not logged in -> you *are* not logged in
+- Cleaner log messages to logcat
+
+Features:
+- Show the user status progress and info in its own place
+- Remember riseup's users that this is a different service
+- Advice users to be cautious when surfing the web after disconnecting the VPN
+
 0.9.2
 Bugs:
 - Sign Up dialog works correctly
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e11b57ef..cc31de43 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="se.leap.bitmaskclient"
-    android:versionCode="116"
-    android:versionName="0.9.2" >
+    android:versionCode="120"
+    android:versionName="0.9.3" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />