From 71ac0286b1dd43491de669da30762f2a715d3078 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Thu, 23 Aug 2018 10:24:44 -0400
Subject: [PATCH] 2.20.0

---
 ChangeLog                   | 11 +++++++++++
 Win32/installer.iss         |  2 +-
 android/AndroidManifest.xml |  2 +-
 android/build.gradle        |  2 +-
 contrib/rpm/i2pd.spec       |  3 +++
 debian/changelog            |  6 ++++++
 libi2pd/version.h           |  4 ++--
 7 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 59a19a3c..d8ab87de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,17 @@
 # for this file format description,
 # see https://github.com/olivierlacan/keep-a-changelog
 
+## [2.20.0] - 2018-08-23
+### Added
+- Full implementation of NTCP2
+- Assets for android
+### Changed
+- armeabi-v7a and x86 in one apk for android
+- NTCP2 is enabled by default
+- Show lease's expiration time in readable format in the web console
+### Fixed
+- Correct names for transports in the web console 
+
 ## [2.19.0] - 2018-06-26
 ### Added
 - ECIES support for RouterInfo
diff --git a/Win32/installer.iss b/Win32/installer.iss
index c4e1fffd..e340c65f 100644
--- a/Win32/installer.iss
+++ b/Win32/installer.iss
@@ -1,5 +1,5 @@
 #define I2Pd_AppName "i2pd"
-#define I2Pd_ver "2.19.0"
+#define I2Pd_ver "2.20.0"
 #define I2Pd_Publisher "PurpleI2P"
 
 [Setup]
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 705cce4e..9a2cffd5 100755
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -3,7 +3,7 @@
     package="org.purplei2p.i2pd"
     android:installLocation="auto"
     android:versionCode="1"
-    android:versionName="2.19.0">
+    android:versionName="2.20.0">
 
     <uses-sdk
         android:minSdkVersion="14"
diff --git a/android/build.gradle b/android/build.gradle
index 2a8ad6f4..8be30645 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -25,7 +25,7 @@ android {
         targetSdkVersion 28
         minSdkVersion 14
         versionCode 1
-        versionName "2.19.0"
+        versionName "2.20.0"
         ndk {
             abiFilters 'armeabi-v7a'
             abiFilters 'x86'
diff --git a/contrib/rpm/i2pd.spec b/contrib/rpm/i2pd.spec
index db480d35..1a20e483 100644
--- a/contrib/rpm/i2pd.spec
+++ b/contrib/rpm/i2pd.spec
@@ -96,6 +96,9 @@ getent passwd i2pd >/dev/null || \
 
 
 %changelog
+* Thu Aug 23 2018 orignal <i2porignal@yandex.ru> - 2.20.0
+- update to 2.20.0
+
 * Tue Jun 26 2018 orignal <i2porignal@yandex.ru> - 2.19.0
 - update to 2.19.0
 
diff --git a/debian/changelog b/debian/changelog
index 74c366d1..9d721eb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+i2pd (2.20.0-1) unstable; urgency=medium
+
+  * updated to version 2.20.0/0.9.36
+
+ -- orignal <orignal@i2pmail.org>  Thu, 23 Aug 2018 16:00:00 +0000
+
 i2pd (2.19.0-1) unstable; urgency=medium
 
   * updated to version 2.19.0/0.9.35
diff --git a/libi2pd/version.h b/libi2pd/version.h
index 129035ad..7c015e84 100644
--- a/libi2pd/version.h
+++ b/libi2pd/version.h
@@ -7,7 +7,7 @@
 #define MAKE_VERSION(a,b,c) STRINGIZE(a) "." STRINGIZE(b) "." STRINGIZE(c)
 
 #define I2PD_VERSION_MAJOR 2
-#define I2PD_VERSION_MINOR 19
+#define I2PD_VERSION_MINOR 20
 #define I2PD_VERSION_MICRO 0
 #define I2PD_VERSION_PATCH 0
 #define I2PD_VERSION MAKE_VERSION(I2PD_VERSION_MAJOR, I2PD_VERSION_MINOR, I2PD_VERSION_MICRO)
@@ -21,7 +21,7 @@
 
 #define I2P_VERSION_MAJOR 0
 #define I2P_VERSION_MINOR 9
-#define I2P_VERSION_MICRO 35
+#define I2P_VERSION_MICRO 36
 #define I2P_VERSION_PATCH 0
 #define I2P_VERSION MAKE_VERSION(I2P_VERSION_MAJOR, I2P_VERSION_MINOR, I2P_VERSION_MICRO)