Merge branch 'openssl' of https://github.com/PurpleI2P/i2pd

ChangeLog

@@ -1,6 +1,14 @@
 # for this file format description,
 # see https://github.com/olivierlacan/keep-a-changelog
 
+## [2.32.1] - 2020-06-02
+### Added
+- Read explicit peers in tunnels config
+### Fixed
+- Generation of tags for detached sessions
+- Non-updating LeaseSet1
+- Start when deprecated websocket options present in i2pd.conf
+
 ## [2.32.0] - 2020-05-25
 ### Added
 - Multiple encryption types for local destinations

Win32/installer.iss

@@ -1,5 +1,5 @@
 #define I2Pd_AppName "i2pd"
-#define I2Pd_ver "2.32.0"
+#define I2Pd_ver "2.32.1"
 #define I2Pd_Publisher "PurpleI2P"
 
 [Setup]

android/build.gradle

@@ -30,8 +30,8 @@ android {
         applicationId "org.purplei2p.i2pd"
         targetSdkVersion 29
         minSdkVersion 14
-        versionCode 2320
-        versionName "2.32.0"
+        versionCode 2321
+        versionName "2.32.1"
         setProperty("archivesBaseName", archivesBaseName + "-" + versionName)
         ndk {
             abiFilters 'armeabi-v7a'

appveyor.yml

@@ -1,4 +1,4 @@
-version: 2.32.0.{build}
+version: 2.32.1.{build}
 pull_requests:
   do_not_increment_build_number: true
 branches:

contrib/rpm/i2pd-git.spec

@@ -1,7 +1,7 @@
 %define git_hash %(git rev-parse HEAD | cut -c -7)
 
 Name:          i2pd-git
-Version:       2.32.0
+Version:       2.32.1
 Release:       git%{git_hash}%{?dist}
 Summary:       I2P router written in C++
 Conflicts:     i2pd
@@ -124,6 +124,9 @@ getent passwd i2pd >/dev/null || \
 
 
 %changelog
+* Tue Jun 02 2020 r4sas <r4sas@i2pmail.org> - 2.32.1
+- update to 2.32.1
+
 * Mon May 25 2020 r4sas <r4sas@i2pmail.org> - 2.32.0
 - update to 2.32.0
 - updated systemd service file (#1394)

contrib/rpm/i2pd.spec

@@ -1,6 +1,6 @@
 Name:          i2pd
-Version:       2.32.0
-Release:       2%{?dist}
+Version:       2.32.1
+Release:       1%{?dist}
 Summary:       I2P router written in C++
 Conflicts:     i2pd-git
 
@@ -122,6 +122,9 @@ getent passwd i2pd >/dev/null || \
 
 
 %changelog
+* Tue Jun 02 2020 r4sas <r4sas@i2pmail.org> - 2.32.1
+- update to 2.32.1
+
 * Mon May 25 2020 r4sas <r4sas@i2pmail.org> - 2.32.0
 - update to 2.32.0
 - updated systemd service file (#1394)

debian/changelog

@@ -1,3 +1,9 @@
+i2pd (2.32.1-1) unstable; urgency=high
+
+  * updated to version 2.32.1
+
+ -- r4sas <r4sas@i2pmail.org>  Tue, 02 Jun 2020 16:30:00 +0000
+
 i2pd (2.32.0-1) unstable; urgency=high
 
   * updated to version 2.32.0/0.9.46

libi2pd/version.h

@@ -17,7 +17,7 @@
 
 #define I2PD_VERSION_MAJOR 2
 #define I2PD_VERSION_MINOR 32
-#define I2PD_VERSION_MICRO 0
+#define I2PD_VERSION_MICRO 1
 #define I2PD_VERSION_PATCH 0
 #define I2PD_VERSION MAKE_VERSION(I2PD_VERSION_MAJOR, I2PD_VERSION_MINOR, I2PD_VERSION_MICRO)
 #define VERSION I2PD_VERSION

qt/i2pd_qt/data/website.i2pd.i2pd.appdata.xml

@@ -35,6 +35,7 @@
   <translation type="qt" />
 
   <releases>
+    <release version="2.32.1" date="2020-06-02" />
     <release version="2.32.0" date="2020-05-25" />
     <release version="2.31.0" date="2020-04-10" />
     <release version="2.30.0" date="2020-02-25" />