From 851c02659a5c15896aa8d292e38e82c2169fa80a Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Wed, 9 Dec 2020 14:13:02 +0000
Subject: [PATCH] Version 0.3.3

---
 CHANGES.md           | 15 +++++++++++++++
 dendrite-config.yaml | 20 ++++++++++----------
 internal/version.go  |  2 +-
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index f463f29f..fbdd3b29 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## Dendrite 0.3.3 (2020-12-09)
+
+### Features
+
+* Federation sender should now use considerably less CPU cycles and RAM when sending events into large rooms
+* The roomserver now uses considerably less CPU cycles by not calculating event IDs so often
+* Experimental support for [MSC2836](https://github.com/matrix-org/matrix-doc/pull/2836) (threading) has been merged
+* Dendrite will no longer hold federation HTTP connections open unnecessarily, which should help to reduce ambient CPU/RAM usage and hold fewer long-term file descriptors
+
+### Fixes
+
+* A bug in the latest event updater has been fixed, which should prevent the roomserver from losing forward extremities in some rare cases
+* A panic has been fixed when federation is disabled (contributed by [kraem](https://github.com/kraem))
+* The response format of the `/joined_members` endpoint has been fixed (contributed by [alexkursell](https://github.com/alexkursell))
+
 ## Dendrite 0.3.2 (2020-12-02)
 
 ### Features
diff --git a/dendrite-config.yaml b/dendrite-config.yaml
index ccdb3243..a6bf63af 100644
--- a/dendrite-config.yaml
+++ b/dendrite-config.yaml
@@ -89,7 +89,7 @@ global:
     # Naffka database options. Not required when using Kafka.
     naffka_database:
       connection_string: file:naffka.db
-      max_open_conns: 100
+      max_open_conns: 10
       max_idle_conns: 2
       conn_max_lifetime: -1
 
@@ -110,7 +110,7 @@ app_service_api:
     connect: http://localhost:7777
   database:
     connection_string: file:appservice.db
-    max_open_conns: 100
+    max_open_conns: 10
     max_idle_conns: 2
     conn_max_lifetime: -1
 
@@ -185,7 +185,7 @@ federation_sender:
     connect: http://localhost:7775
   database:
     connection_string: file:federationsender.db
-    max_open_conns: 100
+    max_open_conns: 10
     max_idle_conns: 2
     conn_max_lifetime: -1
 
@@ -211,7 +211,7 @@ key_server:
     connect: http://localhost:7779
   database:
     connection_string: file:keyserver.db
-    max_open_conns: 100
+    max_open_conns: 10
     max_idle_conns: 2
     conn_max_lifetime: -1
 
@@ -224,7 +224,7 @@ media_api:
     listen: http://[::]:8074
   database:
     connection_string: file:mediaapi.db
-    max_open_conns: 100
+    max_open_conns: 10
     max_idle_conns: 2
     conn_max_lifetime: -1
 
@@ -260,7 +260,7 @@ room_server:
     connect: http://localhost:7770
   database:
     connection_string: file:roomserver.db
-    max_open_conns: 100
+    max_open_conns: 10
     max_idle_conns: 2
     conn_max_lifetime: -1
 
@@ -271,7 +271,7 @@ signing_key_server:
     connect: http://localhost:7780
   database:
     connection_string: file:signingkeyserver.db
-    max_open_conns: 100
+    max_open_conns: 10
     max_idle_conns: 2
     conn_max_lifetime: -1
 
@@ -300,7 +300,7 @@ sync_api:
     listen: http://[::]:8073
   database:
     connection_string: file:syncapi.db
-    max_open_conns: 100
+    max_open_conns: 10
     max_idle_conns: 2
     conn_max_lifetime: -1
 
@@ -316,12 +316,12 @@ user_api:
     connect: http://localhost:7781
   account_database:
     connection_string: file:userapi_accounts.db
-    max_open_conns: 100
+    max_open_conns: 10
     max_idle_conns: 2
     conn_max_lifetime: -1
   device_database:
     connection_string: file:userapi_devices.db
-    max_open_conns: 100
+    max_open_conns: 10
     max_idle_conns: 2
     conn_max_lifetime: -1
 
diff --git a/internal/version.go b/internal/version.go
index bc54163c..4dd43283 100644
--- a/internal/version.go
+++ b/internal/version.go
@@ -17,7 +17,7 @@ var build string
 const (
 	VersionMajor = 0
 	VersionMinor = 3
-	VersionPatch = 2
+	VersionPatch = 3
 	VersionTag   = "" // example: "rc1"
 )