From 444f654e23de0772036c0e29c8e5745e48a8970c Mon Sep 17 00:00:00 2001
From: Pierre Sassoulas <pierre.sassoulas@gmail.com>
Date: Sun, 25 Jul 2021 20:15:11 +0200
Subject: [PATCH] Bump pylint to 2.9.6, update changelog

---
 ChangeLog                    | 12 +++++++++---
 pylint/__pkginfo__.py        |  2 +-
 pylint/checkers/variables.py |  2 +-
 tbump.toml                   |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 778e863939..10c9a48db2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 Pylint's ChangeLog
 ------------------
 
+..
+  Put bug fixes that should not wait for a new minor version here
+
 What's New in Pylint 2.10.0?
 ============================
 Release date: TBA
@@ -10,13 +13,16 @@ Release date: TBA
   Put new features here and also in 'doc/whatsnew/2.10.rst'
 
 
+
 What's New in Pylint 2.9.6?
 ===========================
-Release date: TBA
+Release date: 2021-07-28
 
-..
-  Put bug fixes that should not wait for a new minor version here
 
+* Fix a false positive ``undefined-variable`` when variable name in decoration
+  matches function argument
+
+  Closes #3791
 
 
 What's New in Pylint 2.9.5?
diff --git a/pylint/__pkginfo__.py b/pylint/__pkginfo__.py
index 16f3040255..5ae4844285 100644
--- a/pylint/__pkginfo__.py
+++ b/pylint/__pkginfo__.py
@@ -2,7 +2,7 @@
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
 from typing import Tuple
 
-__version__ = "2.9.6-dev0"
+__version__ = "2.9.6"
 
 
 def get_numversion_from_version(v: str) -> Tuple:
diff --git a/pylint/checkers/variables.py b/pylint/checkers/variables.py
index 564a9e88a0..1dcdd8fc46 100644
--- a/pylint/checkers/variables.py
+++ b/pylint/checkers/variables.py
@@ -39,12 +39,12 @@
 # Copyright (c) 2020 Andrew Simmons <a.simmons@deakin.edu.au>
 # Copyright (c) 2020 Anthony Sottile <asottile@umich.edu>
 # Copyright (c) 2020 Ashley Whetter <ashleyw@activestate.com>
+# Copyright (c) 2021 Marcin Kurczewski <rr-@sakuya.pl>
 # Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
 # Copyright (c) 2021 Sergei Lebedev <185856+superbobry@users.noreply.github.com>
 # Copyright (c) 2021 Lorena B <46202743+lorena-b@users.noreply.github.com>
 # Copyright (c) 2021 haasea <44787650+haasea@users.noreply.github.com>
 # Copyright (c) 2021 Alexander Kapshuna <kapsh@kap.sh>
-# Copyright (c) 2021 Marcin Kurczewski <rr-@sakuya.pl>
 
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
diff --git a/tbump.toml b/tbump.toml
index d1de0ecf93..0f780ff4d9 100644
--- a/tbump.toml
+++ b/tbump.toml
@@ -1,7 +1,7 @@
 github_url = "https://github.com/PyCQA/pylint"
 
 [version]
-current = "2.9.6-dev0"
+current = "2.9.6"
 regex = '''
 ^(?P<major>0|[1-9]\d*)
 \.