From d3c23b079a193ba8e820f51ec00740bf63b8d73f Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 18 Feb 2020 09:01:56 -0500
Subject: [PATCH] lintChanges: Tolerate variants that sortChanges knows how to
 clean up.

---
 scripts/maint/lintChanges.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/maint/lintChanges.py b/scripts/maint/lintChanges.py
index 88a865a572c..2d8b2c6f0db 100755
--- a/scripts/maint/lintChanges.py
+++ b/scripts/maint/lintChanges.py
@@ -25,7 +25,12 @@
     "Code simplification and refactoring",
     "Removed features",
     "Deprecated features",
-    "Directory authority changes"])
+    "Directory authority changes",
+
+    # These aren't preferred, but sortChanges knows how to clean them up.
+    "Code simplifications and refactoring",
+    "Code simplification and refactorings",
+    "Code simplifications and refactorings"])
 
 NEEDS_SUBCATEGORIES = set([
     "Minor bugfix",