From 719c63ee33a88b239e96efead8da14cf985ca9aa Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Wed, 1 Nov 2017 22:55:41 +0100
Subject: [PATCH] set version name to 0.9.7RC1

---
 CHANGELOG                        | 16 ++++++++++++++++
 app/src/main/AndroidManifest.xml |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index aa1aef661..ef9a118ab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,19 @@
+0.9.7 - the maintenance release
+Bugs:
+- fixes failing login on Android 7.0 and Android 7.1 (Android Nougat)
+- switching between different providers was buggy - bitmask selected
+  the nearest gateway of all providers ever chosen, now the nearest
+  gateway of the current provider is selected
+
+Features:
+- updated ics-openvpn code, incl. openvpn and openssl
+- show vpn data throughput and button to disconnect vpn in notification bar
+- support for Android O
+- enforce TLSv1.2 on all devices
+- bitmask honors the default protocol order (udp/tcp) specified by
+  the provider
+- removes redundant cancellation confirmation dialog - one is sufficient
+
 0.9.4 June 16th, 2015 - the "fabbutton" release
 Bugs:
 - Show the log window only when a real error happened, since some
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d751d9f02..f935dd181 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="128"
-    android:versionName="0.9.6Beta" >
+    android:versionCode="129"
+    android:versionName="0.9.7RC1" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-- 
GitLab