Merge branch 'release-13-18-0' into 'main'v13.18.0

Release v13.18.0

See merge request gitlab-org/gitlab-shell!465

2 files changed, 7 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 4db1077..27bf34a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+v13.18.0
+
+- Fix thread-safety issues in gitlab-shell !463
+- gitlab-sshd: Support the PROXY protocol !461
+- sshd: Recover from per-session and per-connection panics !464
+
 v13.17.0
 
 - Fix gitlab-shell panic when log file not writable !453
diff --git a/VERSION b/VERSION
index 15ede84..ce0b279 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.17.0
+13.18.0