Fix warnings from lintChanges

11 files changed, 21 insertions, 20 deletions

diff --git a/changes/16679_16685_etc b/changes/16679_16685_etc
index 8284614278..46f3e33f55 100644
--- a/changes/16679_16685_etc
+++ b/changes/16679_16685_etc
@@ -1,4 +1,3 @@
-
   o Major features (relay, Ed25519):
     - Significant improvements to the usability of relay-side Ed25519
       key management. Log messages are better, and the code can
diff --git a/changes/bug14917 b/changes/bug14917
index 92a985ca7b..f26f7c2371 100644
--- a/changes/bug14917
+++ b/changes/bug14917
@@ -1,5 +1,6 @@
-  o Major bugfix
+  o Major features (security, hidden services):
     - For an hidden service, it is now prohibited to use one single
       EntryNodes to avoid a very easy guard discovery attack. For more
       details, see the ticket description here:
-      https://trac.torproject.org/projects/tor/ticket/14917. Fixes #14917.
+      https://trac.torproject.org/projects/tor/ticket/14917. Fixes ticket 14917.
+
diff --git a/changes/bug15963 b/changes/bug15963
index 8c903d2d34..5d109fe1a0 100644
--- a/changes/bug15963
+++ b/changes/bug15963
@@ -1,4 +1,4 @@
-  o Hidden service directory enhancement
-    - Relays need to have the Fast flag to ge the HSDir flag. As this is
+  o Minor features (Hidden service directory)
+    - Relays need to have the Fast flag to get the HSDir flag. As this is
       being written, we'll go from 2745 HSDirs down to 2342, a ~14% drop.
-      Fixes #15983.
+      Fixes ticket 15963.
diff --git a/changes/bug16274 b/changes/bug16274
index 4eec571761..6c415e87e3 100644
--- a/changes/bug16274
+++ b/changes/bug16274
@@ -1,5 +1,5 @@
   o Minor bugfix (open file limit):
     - Fix set_max_file_descriptors() to set by default the max open file
       limit to the current limit in case setrlimit() fails so we at least
-      have a usable value; Fixes #16274; bugfix on tor-0.2.0.10-alpha~71;
+      have a usable value; Fixes bug 16274; bugfix on tor-0.2.0.10-alpha.
       Patch by dgoulet.
diff --git a/changes/bug16389 b/changes/bug16389
index b7eb35034a..c9b10e528f 100644
--- a/changes/bug16389
+++ b/changes/bug16389
@@ -1,4 +1,4 @@
-  o Hidden Service Enhancement
+  o Minor features (hidden service)
     Client now uses an introduction point failure cache to know when to
     fetch or keep a descriptor in their cache.
 
@@ -10,3 +10,4 @@
     discard the descriptor and fetch a new one.
 
     See rendcache.c for a detailed explanation of the cache's behavior.
+    Closes ticket 16389.
\ No newline at end of file
diff --git a/changes/bug16697 b/changes/bug16697
index ae6cf2b83e..eb65a8843b 100644
--- a/changes/bug16697
+++ b/changes/bug16697
@@ -1,10 +1,10 @@
-  o Minor bugfixes
+  o Minor bugfixes (control port):
     - Control port was using set_max_file_descriptors() with a limit set to
       0 to get the max value. A recent fix made this use case return an
       error and introduced dead code in that function. This triggered a
       warning that our limit (ConnLimit) was invalid but in reality it was
       not.
-      
+
       Now, to the control port uses a specific getter function to query the
       value and set_max_file_descriptors() should never be used again for
-      that purpose. Fixes #16697; bugfix on 0.2.7.2-alpha.
+      that purpose. Fixes bug 16697; bugfix on 0.2.7.2-alpha.
diff --git a/changes/bug16913 b/changes/bug16913
index 464140b538..b07a782f12 100644
--- a/changes/bug16913
+++ b/changes/bug16913
@@ -1,4 +1,4 @@
   o Minor bugfixes:
     - Fix an usage message of tor-resolve(1) so that it no longer lists
-      the removed -F option. Resolves ticket #16913; bugfix on Tor
+      the removed -F option. Fixes bug 16913; bugfix on Tor
       0.2.2.28-beta.
diff --git a/changes/bug16924 b/changes/bug16924
index a1bc96e54d..2d8b372260 100644
--- a/changes/bug16924
+++ b/changes/bug16924
@@ -2,5 +2,5 @@
     - When calling channel_free_list(), avoid calling smartlist_remove()
       while inside a FOREACH loop. This partially reverts commit
       17356fe7fd96af where the correct SMARTLIST_DEL_CURRENT was
-      removed.  Fixes bug 16929; bugfix on 0.2.4.4-alpha.
+      removed.  Fixes bug 16924; bugfix on 0.2.4.4-alpha.
 
diff --git a/changes/bug16965 b/changes/bug16965
index 841d7235b0..13af1372b3 100644
--- a/changes/bug16965
+++ b/changes/bug16965
@@ -1,4 +1,4 @@
   o Minor bugfixes (linux seccomp2 sandbox):
     - Allow routers with ed25519 keys to run correctly under the seccomp2
-      sandbox. Fixes bug 16964; bugfix on 0.2.7.2-alpha.
+      sandbox. Fixes bug 16965; bugfix on 0.2.7.2-alpha.
 
diff --git a/changes/feature14175-chutney-performance b/changes/feature14175-chutney-performance
index ba3a6fee4d..1dd03f5ee1 100644
--- a/changes/feature14175-chutney-performance
+++ b/changes/feature14175-chutney-performance
@@ -1,9 +1,9 @@
   o Major enhancements (performance testing):
     - Add chutney performance testing support to src/test/test-network.sh
       The following arguments change how chutney verifies the network:
-      --bytes n             sends n bytes per test connection (10 KBytes)
-      --connections n       makes n test connections per client (1)
-      --hs-multi-client 1   makes each client connect to each HS (0)
+      "--bytes n" sends n bytes per test connection;
+      "--connections n" makes n test connections per client; and
+      "--hs-multi-client 1" makes each client connect to each HS.
       Requires the corresponding chutney performance testing changes.
-      Note: using --connections 7 or greater on a HS will trigger #15937.
-      Patch by "teor".
+      Note: using --connections 7 or greater on a HS will trigger issue 15937.
+      Patch by "teor". Closes ticket 14175.
diff --git a/changes/ticket15254-hs-stats-default b/changes/ticket15254-hs-stats-default
index 14913ea604..e447c24b31 100644
--- a/changes/ticket15254-hs-stats-default
+++ b/changes/ticket15254-hs-stats-default
@@ -1,4 +1,4 @@
   o Hidden Service Statistics
     - Turn on hidden service statistics collection by setting the torrc
       option HiddenServiceStatistics to "1" by default. Closes ticket
-      #15254.
+      15254.