From b9964bd9329313ab934a7e075f05fb9494b0e117 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 2 Dec 2018 17:32:57 +0100
Subject: [PATCH] Bump version to 2.5.3

---
 CHANGELOG.md            | 10 ++++++++++
 lib/mastodon/version.rb |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75a51fc7c6e..f9e5df199bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 2.5.3
+
+- Fix already queued deliveries still trying to reach inboxes marked as unavailable (#9358)
+- Fix ffmpeg processing sometimes stalling due to overfilled stdout buffer (#9368)
+- Fix failures caused by commonly-used JSON-LD contexts being unavailable (#9412)
+- Fix yarn dependencies not installing due to yanked event-stream package (#9401)
+- Fix TLS handshake timeout not being enforced (#9381)
+- Fix HTTP connection timeout of 10s not being enforced (#9329)
+- Fix multiple remote account deletions being able to deadlock the database (#9292)
+
 ## 2.5.2
 
 - Fix XSS vulnerability (#8959)
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index a49e7f102f6..515155c585c 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      2
+      3
     end
 
     def pre
-- 
GitLab