[tor-commits] [tor/master] Fix remaining (non-false-positive) lintchanges complaints

[nickm at torproject.org]

commit 222534d35414d185bc5c417d7a46569cc7cf7a84
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 16 10:32:00 2017 -0400

    Fix remaining (non-false-positive) lintchanges complaints
---
 changes/bug19699 | 2 +-
 changes/bug20341 | 2 +-
 changes/bug20913 | 6 +++---
 changes/bug21121 | 2 +-
 changes/bug21155 | 4 ++--
 changes/bug21715 | 2 +-
 changes/bug22042 | 4 +++-
 changes/bug22270 | 2 +-
 8 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/changes/bug19699 b/changes/bug19699
index 8bfe662..10ba57f 100644
--- a/changes/bug19699
+++ b/changes/bug19699
@@ -2,4 +2,4 @@
     - Make test-network.sh always call chutney's test-network.sh.
       Previously, this only worked on systems which had bash installed, due to
       some bash-specific code in the script.
-      Fixes bug 19699; follow-up to 21581.
+      Fixes bug 19699; bugfix on 0.3.0.4-rc. Follow-up to ticket 21581.
diff --git a/changes/bug20341 b/changes/bug20341
index 399ee50..419240c 100644
--- a/changes/bug20341
+++ b/changes/bug20341
@@ -1,3 +1,3 @@
   o Documentation:
     - Document key=value pluggable transport arguments for Bridge lines in
-      torrc.  Fixes bug 20341; feature first appeared in 0.2.5.1-alpha.
+      torrc.  Fixes bug 20341; bugfix on 0.2.5.1-alpha.
diff --git a/changes/bug20913 b/changes/bug20913
index 5086edc..df7f106 100644
--- a/changes/bug20913
+++ b/changes/bug20913
@@ -1,9 +1,9 @@
   o Minor bugfixes (fallbacks):
     - Make sure fallback directory mirrors have the same address, port, and
       relay identity key for at least 30 days before they are selected.
-      Fixes 20913, bugfix on 0.2.8.1-alpha.
+      Fixes bug 20913; bugfix on 0.2.8.1-alpha.
     - Decrease the guard flag average required to be a fallback. This allows
       us to keep relays that have their guard flag removed when they restart.
-      Fixes 20913, bugfix on 0.2.8.1-alpha.
+      Fixes bug 20913; bugfix on 0.2.8.1-alpha.
     - Decrease the minimum number of fallbacks to 100.
-      Fixes 20913, bugfix on 0.2.8.1-alpha.
+      Fixes bug 20913; bugfix on 0.2.8.1-alpha.
diff --git a/changes/bug21121 b/changes/bug21121
index b74332c..96b9730 100644
--- a/changes/bug21121
+++ b/changes/bug21121
@@ -1,3 +1,3 @@
-  o Minor enhancements (fallbacks):
+  o Minor features (fallback directories):
     - Update the fallback directory mirror whitelist and blacklist based on
       operator emails. Closes task 21121.
diff --git a/changes/bug21155 b/changes/bug21155
index 33c0cd1..67e4a64 100644
--- a/changes/bug21155
+++ b/changes/bug21155
@@ -1,5 +1,5 @@
-  o Minor bugfixes (hidden service, logging):
+  o Minor features (hidden service, logging):
     - Warn user if multiple entries in  EntryNodes and at least one
       HiddenService are used together. Pinning EntryNodes along with an hidden
       service can be possibly harmful for instance see ticket 14917 or 21155.
-      Fixes bug 21155.
+      Closes ticket 21155.
diff --git a/changes/bug21715 b/changes/bug21715
index f8b5ae2..54ad1ad 100644
--- a/changes/bug21715
+++ b/changes/bug21715
@@ -2,4 +2,4 @@
     - Default of NumEntryGuards is 1 if the consensus parameter
       guard-n-primary-guards-to-use isn't set. Default of NumDirectoryGuards
       is 3 if the consensus parameter guard-n-primary-dir-guards-to-use isn't
-      set. Fixes bug 21715.
+      set. Fixes bug 21715; bugfix on 0.3.0.1-alpha.
diff --git a/changes/bug22042 b/changes/bug22042
index c1188df..dccf83d 100644
--- a/changes/bug22042
+++ b/changes/bug22042
@@ -2,4 +2,6 @@
     - Trigger HS descriptor events on the control port when the client is
       unable to pick a suitable hidden service directory. This can happen if
       they are all in the ExcludeNodes list or they all have been queried
-      inside the allowed 15 minutes. Fixes bug 22042.
+      inside the allowed 15 minutes. Fixes bug 22042; bugfix on
+      0.2.5.2-alpha.
+
diff --git a/changes/bug22270 b/changes/bug22270
index 9130838..6b58446 100644
--- a/changes/bug22270
+++ b/changes/bug22270
@@ -1,4 +1,4 @@
   o Minor bugfixes (fallback directory mirrors):
     - Make the usage example in updateFallbackDirs.py actually work.
       (And explain what it does.)
-      Fixes bug 22270 in 0.3.0.3-alpha.
+      Fixes bug 22270; bugfix on 0.3.0.3-alpha.