From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 18 Feb 2020 14:01:56 +0000 (-0500)
Subject: lintChanges: Tolerate variants that sortChanges knows how to clean up.
X-Git-Tag: tor-0.4.5.0-alpha-dev~184
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3c23b079a193ba8e820f51ec00740bf63b8d73f;p=thirdparty%2Ftor.git

lintChanges: Tolerate variants that sortChanges knows how to clean up.
---

diff --git a/scripts/maint/lintChanges.py b/scripts/maint/lintChanges.py
index 88a865a572..2d8b2c6f0d 100755
--- a/scripts/maint/lintChanges.py
+++ b/scripts/maint/lintChanges.py
@@ -25,7 +25,12 @@ KNOWN_GROUPS = set([
     "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",