From b66c77a1fc7bb43fa07ee0371df07ac3364214bb Mon Sep 17 00:00:00 2001
From: Francisco <fg@frang.io>
Date: Tue, 20 Jun 2023 13:06:56 -0300
Subject: [PATCH] Merge branch 'release-v4.9' into master (#4373)

---
 .changeset/shy-crews-teach.md                | 5 -----
 CHANGELOG.md                                 | 4 ++++
 contracts/package.json                       | 2 +-
 contracts/utils/cryptography/MerkleProof.sol | 2 +-
 package-lock.json                            | 4 ++--
 package.json                                 | 2 +-
 6 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 .changeset/shy-crews-teach.md

diff --git a/.changeset/shy-crews-teach.md b/.changeset/shy-crews-teach.md
deleted file mode 100644
index 8ab929bf88d..00000000000
--- a/.changeset/shy-crews-teach.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': patch
----
-
-`MerkleProof`: Fix a bug in `processMultiProof` and `processMultiProofCalldata` that allows proving arbitrary leaves if the tree contains a node with value 0 at depth 1.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index abbb1b347c2..bbe7502e628 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,6 +59,10 @@ function supportsInterface(bytes4 interfaceId) public view virtual override retu
 }
 ```
 
+## 4.9.2 (2023-06-16)
+
+- `MerkleProof`: Fix a bug in `processMultiProof` and `processMultiProofCalldata` that allows proving arbitrary leaves if the tree contains a node with value 0 at depth 1.
+
 ## 4.9.1 (2023-06-07)
 
 - `Governor`: Add a mechanism to restrict the address of the proposer using a suffix in the description.
diff --git a/contracts/package.json b/contracts/package.json
index 4711a6b3f56..df141192d3d 100644
--- a/contracts/package.json
+++ b/contracts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@openzeppelin/contracts",
   "description": "Secure Smart Contract library for Solidity",
-  "version": "4.9.1",
+  "version": "4.9.2",
   "files": [
     "**/*.sol",
     "/build/contracts/*.json",
diff --git a/contracts/utils/cryptography/MerkleProof.sol b/contracts/utils/cryptography/MerkleProof.sol
index 39826d8c692..94586ff7b3f 100644
--- a/contracts/utils/cryptography/MerkleProof.sol
+++ b/contracts/utils/cryptography/MerkleProof.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts (last updated v4.9.0) (utils/cryptography/MerkleProof.sol)
+// OpenZeppelin Contracts (last updated v4.9.2) (utils/cryptography/MerkleProof.sol)
 
 pragma solidity ^0.8.19;
 
diff --git a/package-lock.json b/package-lock.json
index edf1e9284e6..d4cb52694fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "openzeppelin-solidity",
-  "version": "4.9.0",
+  "version": "4.9.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "openzeppelin-solidity",
-      "version": "4.9.0",
+      "version": "4.9.2",
       "license": "MIT",
       "devDependencies": {
         "@changesets/changelog-github": "^0.4.8",
diff --git a/package.json b/package.json
index c441541337a..37e8f871012 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "openzeppelin-solidity",
   "description": "Secure Smart Contract library for Solidity",
-  "version": "4.9.1",
+  "version": "4.9.2",
   "files": [
     "/contracts/**/*.sol",
     "/build/contracts/*.json",