Resolve issues in changes files

diff --git a/changes/bug13936 b/changes/bug13936
index 75dc9cd437b497bb753f97d30e23c9ec347a5fac..fffbe6837cc45bda39c942e607113cd22a4a5155 100644 (file)
--- a/changes/bug13936
+++ b/changes/bug13936
@@ -3,4 +3,5 @@
       when a rendezvous circuit is opened because circuit_has_opened() jobs
       is to call a specialized function depending on the circuit purpose.
       Furthermore, a controller event will be triggered here where the
-      former did not.
+      former did not. Fixes bug 13936; bugfix on 0.1.1.5-alpha.
+

diff --git a/changes/bug13942 b/changes/bug13942
index f9e4504a485bfb837c315cb22c168ccfa944fa2a..41efe607291a1b3375b3d93b70f65ac620fe156f 100644 (file)
--- a/changes/bug13942
+++ b/changes/bug13942
@@ -1,5 +1,6 @@
   o Minor bugfixes (hidden services):
     - Pre-check directory permissions for new hidden-services to avoid
       at least one case of "Bug: Acting on config options left us in a
-      broken state. Dying." Fixes bug 13942.
+      broken state. Dying." Fixes bug 13942; bugfix on 0.0.6pre1.
+
 

diff --git a/changes/bug14001-clang-warning b/changes/bug14001-clang-warning
index b932af6ab7e5b255257b4babf56c56de39345421..c93a153854093395682f571fcbae4d0fdabcdbe1 100644 (file)
--- a/changes/bug14001-clang-warning
+++ b/changes/bug14001-clang-warning
@@ -3,4 +3,4 @@
       always be non-NULL. clang recognises this and complains.
       Disable the tautologous and redundant check to silence
       this warning.
-      Fixes bug 14001.
+      Fixes bug 14001; bugfix on 0.2.1.2-alpha.

diff --git a/changes/bug14002-osx-transproxy-ipfw-pf b/changes/bug14002-osx-transproxy-ipfw-pf
index a08bbdcbff3415f2951e3da67d48c94c76ee9b7c..8b939979d6c4dc6d65db4bc91e3b7215f095b1ae 100644 (file)
--- a/changes/bug14002-osx-transproxy-ipfw-pf
+++ b/changes/bug14002-osx-transproxy-ipfw-pf
@@ -1,4 +1,4 @@
-  o Minor bugfixes:
+  o Minor features:
     - OS X uses ipfw (FreeBSD) or pf (OpenBSD). Update the transparent
       proxy option checks to allow for both ipfw and pf on OS X.
-      Fixes bug 14002.
+      Closes ticket 14002.

diff --git a/changes/bug7803 b/changes/bug7803
index 7a2bba70dbe3d1b6c9fb790036b123a2400fc3b7..ee38a884dfd8e64559524d253eba9d8e62bf9d35 100644 (file)
--- a/changes/bug7803
+++ b/changes/bug7803
@@ -2,4 +2,4 @@
     - Tor clients no longer support connecting to hidden services running on
       Tor 0.2.2.x and earlier; the Support022HiddenServices option has been
       removed.  (There shouldn't be any hidden services running these
-      versions on the network.)
+      versions on the network.)  Closes ticket 7803.

diff --git a/changes/spurious-clang-warnings b/changes/spurious-clang-warnings
index d0399204760d3ecc51864cb38a52bdabe57a6513..3ee54027f8a1616c440a6ec610b6b1aba06baea9 100644 (file)
--- a/changes/spurious-clang-warnings
+++ b/changes/spurious-clang-warnings
@@ -1,10 +1,8 @@
   o Minor bugfixes:
     - Silence clang warnings under --enable-expensive-hardening, including:
-        + implicit truncation of 64 bit values to 32 bit;
-        + const char assignment to self;
-        + tautological compare; and
-        + additional parentheses around equality tests. (gcc uses these to
-          silence assignment, so clang warns when they're present in an
-          equality test. But we need to use extra parentheses in macros to
-          isolate them from other code).
-      Fixes bug 13577.
+      implicit truncation of 64 bit values to 32 bit;
+      const char assignment to self;
+      tautological compare; and
+      additional parentheses around equality tests.
+      Fixes bug 13577; bugfix on 0.2.5.4-alpha.
+

diff --git a/changes/ticket-11291 b/changes/ticket-11291
index 4c19f3cd0e6ad23a213b17070b4b8249f1de92ac..400bae8e3181678fc2f98753c3e44adb18ff9b2e 100644 (file)
--- a/changes/ticket-11291
+++ b/changes/ticket-11291
@@ -2,3 +2,4 @@
     - New HiddenServiceDirGroupReadable option to cause hidden service
       directories and hostname files to be created group-readable.
       Patch from "anon", David Stainton, and "meejah".
+      Closes ticket 11291.

diff --git a/scripts/maint/lintChanges.py b/scripts/maint/lintChanges.py
index 43f2f21685b5d33d12aff0cd27574e934d3d3cc1..2e5729586038fbb89eff48dd8d1dabce61868a5e 100755 (executable)
--- a/scripts/maint/lintChanges.py
+++ b/scripts/maint/lintChanges.py
@@ -32,11 +32,14 @@ def lintfile(fname):
 
     if isBug and not re.search(r'(\d+)', contents):
         warn("bugfix does not mention a number")
-    elif isBug and not re.search(r'Fixes bug (\d+)', contents):
+    elif isBug and not re.search(r'Fixes ([a-z ]*)bug (\d+)', contents):
         warn("bugfix does not say 'Fixes bug XXX'")
 
-    if re.search(r'[bB]ug (\d+)', contents) and not re.search(r'Bugfix on ', contents):
-        warn("bugfix does not say 'bugfix on X.Y.Z'")
+    if re.search(r'[bB]ug (\d+)', contents):
+        if not re.search(r'[Bb]ugfix on ', contents):
+            warn("bugfix does not say 'bugfix on X.Y.Z'")
+        elif not re.search('[fF]ixes ([a-z ]*)bug (\d+); bugfix on ', contents):
+            warn("bugfix incant is not semicoloned")
 
 
 if __name__=='__main__':