Fix warnings from lintChanges.py

6 files changed, 21 insertions, 16 deletions

diff --git a/changes/19122 b/changes/19122
index cface80679..80f38a6a94 100644
--- a/changes/19122
+++ b/changes/19122
@@ -1,3 +1,4 @@
   o Minor bugfixes (documentation):
-    - man page incorrectly states the User option takes a UID when it really
-      takes a username. Fixes bug 19122.
+    - Fix manual for the User option: it takes a username, not a UID.
+      Fixes bug 19122; bugfix on 0.0.2pre16 (the first version to have
+      a manpage!).
diff --git a/changes/19977 b/changes/19977
index 0ca1af1cea..0e55fbd567 100644
--- a/changes/19977
+++ b/changes/19977
@@ -1,6 +1,6 @@
-  o Minor bugfixes (unit test)
+  o Minor bugfixes (unit tests):
     - Fix shared random unit test that was failing on big endian architecture
       due to internal representation of a integer copied to a buffer. The test
       is changed to take a full 32 bytes of data and use the output of a
       python script that make the COMMIT and REVEAL calculation according to
-      the spec.  Fixes #19977; bugfix on tor-0.2.9.1-alpha.
+      the spec.  Fixes bug 19977; bugfix on tor-0.2.9.1-alpha.
diff --git a/changes/bug19677 b/changes/bug19677
index e8ba3dd61a..2c84b7e0c5 100644
--- a/changes/bug19677
+++ b/changes/bug19677
@@ -1,6 +1,6 @@
-  o Minor bug fixes (option parsing):
+  o Minor bugfixes (option parsing):
     - Count unix sockets when counting client listeners (SOCKS, Trans,
       NATD, and DNS). This has no user-visible behaviour changes: these
       options are set once, and never read.
-      Required for correct behaviour in ticket #17178.
-      Fixes bug #19677, patch by teor.
+      Required for correct behaviour in ticket 17178.
+      Fixes bug 19677; bugfix on 0.2.6.3-alpha.  Patch by teor.
diff --git a/changes/bug19767 b/changes/bug19767
index f0a010be0c..a5349228f5 100644
--- a/changes/bug19767
+++ b/changes/bug19767
@@ -1,4 +1,6 @@
   o Minor bugfixes (compilation):
     - Always include orconfig.h before including any other C headers.
       Sometimes, it includes macros that affect the behavior of the
-      standard headers. Closes bug 19767.
+      standard headers. Fixes bug 19767; bugfix on 0.2.9.1-alpha (the first
+      version to use AC_USE_SYSTEM_EXTENSIONS).
+
diff --git a/changes/feature17178 b/changes/feature17178
index 172097cd62..d6a8e8d8d3 100644
--- a/changes/feature17178
+++ b/changes/feature17178
@@ -8,23 +8,23 @@
       This is compatible with the existing hidden service implementation, and
       works on the current tor network without any changes to older relays or
       clients.
-      Implements proposal #260, completes ticket #17178. Patch by teor & asn.
+      Implements proposal 260, completes ticket 17178. Patch by teor and asn.
   o Minor features (Tor2web):
     - Make Tor2web clients respect ReachableAddresses.
       This feature was inadvertently enabled in 0.2.8.6, then removed
-      by bugfix #19973 on 0.2.8.7.
-      Implements feature #20034. Patch by teor.
+      by bugfix 19973 on 0.2.8.7.
+      Implements feature 20034. Patch by teor.
   o Minor bug fixes (Tor2web):
     - Prevent Tor2web clients running hidden services, these services are
       not anonymous due to the one-hop client paths.
-      Fixes bug #19678. Patch by teor.
+      Fixes bug 19678. Patch by teor.
   o Minor bug fixes (circuits):
     - Use CircuitBuildTimeout whenever LearnCircuitBuildTimeout is disabled.
-      Fixes bug #19678 in commit 5b0b51ca3 in 0.2.4.12-alpha. Patch by teor.
+      Fixes bug 19678; bugfix on commit 5b0b51ca3 in 0.2.4.12-alpha. Patch by teor.
   o Minor bug fixes (options):
     - Stop changing the configured value of UseEntryGuards on authorities
       and Tor2web clients.
-      Fixes bug #20074 in commits 51fc6799 in tor-0.1.1.16-rc and
+      Fixes bug 20074; bugfix on commits 51fc6799 in tor-0.1.1.16-rc and
       acda1735 in tor-0.2.4.3-alpha. Patch by teor.
     - Check the consistency of UseEntryGuards and EntryNodes more reliably.
-      Fixes bug #20074 in commit 686aaa5c in tor-0.2.4.12-alpha. Patch by teor.
+      Fixes bug 20074; bugfix on commit 686aaa5c in tor-0.2.4.12-alpha. Patch by teor.
diff --git a/changes/reject-tap b/changes/reject-tap
index 8e616de301..dad554f2b6 100644
--- a/changes/reject-tap
+++ b/changes/reject-tap
@@ -1,4 +1,4 @@
-  o Major bug fixes (circuit building):
+  o Major features (circuit building, security):
     - Tor authorities, relays, and clients only use ntor, except for
       rare cases in the hidden service protocol.
     - Authorities, relays and clients specifically check that each
@@ -10,6 +10,8 @@
       mirrors, or as introduction or rendezvous points.
     - Circuit-building code assumes that all hops can use ntor,
       except for rare hidden service protocol cases.
+
+  o Major bugfixes (circuit building):
     - Hidden service client to intro point and service to rendezvous point
       connections use the TAP key supplied by the protocol.
       Fixes bug 19163; bugfix on 0.2.4.18-rc.