From 904e80b75f136ad8fd168e98297f1bdbb4f99044 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubertc@matrix.org>
Date: Wed, 15 Sep 2021 19:10:48 -0400
Subject: [PATCH] release 3.2.5

---
 CHANGELOG.rst                                         | 11 +++++++++++
 CMakeLists.txt                                        |  2 +-
 OLMKit.podspec                                        |  2 +-
 Package.swift                                         |  2 +-
 .../src/main/java/org/matrix/olm/OlmManager.java      |  2 +-
 common.mk                                             |  2 +-
 javascript/package.json                               |  2 +-
 python/olm/__version__.py                             |  2 +-
 8 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f4e62f6..61bc36a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,14 @@
+Changes in `3.2.5 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.5>`_
+=========================================================================
+
+This release includes the following changes since 3.2.4:
+
+* Add functions for getting error codes rather than error strings.  Thanks to
+  Nicolas Werner for the suggestion.
+* Only export olm symbols.  Thanks to Mohammed Sadiq for the suggestion.
+* Improve error handling in unpickle functions.
+* Add support for fallback keys to the Objective-C and Android bindings.
+
 Changes in `3.2.4 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.4>`_
 =========================================================================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b377737..6addd06 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.4)
 
-project(olm VERSION 3.2.4 LANGUAGES CXX C)
+project(olm VERSION 3.2.5 LANGUAGES CXX C)
 
 option(OLM_TESTS "Build tests" ON)
 option(BUILD_SHARED_LIBS "Build as a shared library" ON)
diff --git a/OLMKit.podspec b/OLMKit.podspec
index cecbe78..39431a9 100644
--- a/OLMKit.podspec
+++ b/OLMKit.podspec
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
   # The libolm version
   MAJOR = 3
   MINOR = 2
-  PATCH = 4
+  PATCH = 5
 
   s.name         = "OLMKit"
   s.version      = "#{MAJOR}.#{MINOR}.#{PATCH}"
diff --git a/Package.swift b/Package.swift
index d1e1d90..f85a8df 100644
--- a/Package.swift
+++ b/Package.swift
@@ -2,7 +2,7 @@
 
 import PackageDescription
 
-let major = 3, minor = 2, patch = 4
+let major = 3, minor = 2, patch = 5
 
 let package = Package(
     name: "Olm",
diff --git a/android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
index f8135e7..b9ab802 100644
--- a/android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
+++ b/android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
@@ -46,7 +46,7 @@ public class OlmManager {
      * @return the library version
      */
     public String getVersion() {
-        return "3.2.4";
+        return "3.2.5";
     }
 
     /**
diff --git a/common.mk b/common.mk
index 1b0a33a..d6848ef 100644
--- a/common.mk
+++ b/common.mk
@@ -1,4 +1,4 @@
 
 MAJOR := 3
 MINOR := 2
-PATCH := 4
+PATCH := 5
diff --git a/javascript/package.json b/javascript/package.json
index ba2eca6..3a7dc9c 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@matrix-org/olm",
-  "version": "3.2.4",
+  "version": "3.2.5",
   "description": "An implementation of the Double Ratchet cryptographic ratchet",
   "main": "olm.js",
   "files": [
diff --git a/python/olm/__version__.py b/python/olm/__version__.py
index 95b875c..c135e97 100644
--- a/python/olm/__version__.py
+++ b/python/olm/__version__.py
@@ -2,7 +2,7 @@ __title__ = "python-olm"
 __description__ = ("python CFFI bindings for the olm "
                    "cryptographic ratchet library")
 __url__ = "https://github.com/poljar/python-olm"
-__version__ = "3.2.4"
+__version__ = "3.2.5"
 __author__ = "Damir Jelić"
 __author_email__ = "poljar@termina.org.uk"
 __license__ = "Apache 2.0"