From 748c5eae2fd5d897c94c48771161c259941a7488 Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Tue, 24 Mar 2020 17:29:34 +0000
Subject: [PATCH 1/1] Bump and prep 1.34.1

Change-Id: Ib9a2c9426f25c3af54e021a775c99dd9e6baa0b1
---
 RELEASE-NOTES-1.34   | 7 ++++++-
 includes/Defines.php | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 1313ac2e17..3597088498 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -2,7 +2,7 @@
 
 == MediaWiki 1.34.1 ==
 
-THIS IS NOT A RELEASE YET
+This is a security and maintenance release of the MediaWiki 1.34 branch.
 
 === Changes since MediaWiki 1.34.0 ===
 * (T211450) User: better error message when getActorId fails.
@@ -18,6 +18,11 @@ THIS IS NOT A RELEASE YET
 * Add check for page existence to view.php maintenance script.
 * (T245149) Fix fetching login token from action=query&meta=tokens on private
   wikis.
+* (T236509) SECURITY: Fix HTML escaping in UserGroupMembership::getLink().
+* (T232932) SECURITY: User content can redirect the logout button to different
+  URL.
+* (T246602) SECURITY: jquery.makeCollapsible allows applying event handler to
+  any CSS selector.
 
 == MediaWiki 1.34.0 ==
 
diff --git a/includes/Defines.php b/includes/Defines.php
index 7ea5102fe7..80996267be 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -34,9 +34,9 @@ use Wikimedia\Rdbms\IDatabase;
  *
  * This replaces the the $wgVersion global found in earlier versions.
  *
- * @since 1.35
+ * @since 1.34.1
  */
-define( 'MW_VERSION', '1.34.0' );
+define( 'MW_VERSION', '1.34.1' );
 
 # Obsolete aliases
 
-- 
2.20.1