[tor-commits] [tor/master] Start 0.2.9.2-alpha changelog, fix some lintchanges issues

[nickm at torproject.org]

commit f009e1b32c2937dc2af16949c41943de1df594ce
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 23 10:13:13 2016 -0400

    Start 0.2.9.2-alpha changelog, fix some lintchanges issues
---
 ChangeLog                | 17 ++++++++++++++++-
 changes/bug13953         |  2 +-
 changes/bug19743         |  2 +-
 changes/bug19903         |  4 ----
 changes/bug19947         |  4 ----
 changes/bug8625          |  6 ++++--
 changes/geoip-august2016 |  4 ----
 7 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 68573b3..e49984e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,19 @@
-Changes in version 0.2.9.2-alpha - 2016-0?-??
+Changes in version 0.2.9.2-alpha - 2016-08-2?
+  Tor 0.2.9.2-alpha XXXX BLURB HERE.
+
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the August 2 2016 Maxmind GeoLite2
+      Country database.
+
+  o Minor bugfixes (compilation, also in 0.2.8.7):
+    - Remove an inappropriate "inline" in tortls.c that was causing
+      warnings on older versions of GCC. Fixes bug 19903; bugfix on
+      0.2.8.1-alpha.
+
+  o Minor bugfixes (fallback directories, also in 0.2.8.7):
+    - Avoid logging a NULL string pointer when loading fallback
+      directory information. Fixes bug 19947; bugfix on 0.2.4.7-alpha
+      and 0.2.8.1-alpha. Report and patch by "rubiate".
 
 
 Changes in version 0.2.9.1-alpha - 2016-08-08
diff --git a/changes/bug13953 b/changes/bug13953
index 42b013f..db25b28 100644
--- a/changes/bug13953
+++ b/changes/bug13953
@@ -1,3 +1,3 @@
-  o Minor bugfixes (config):
+  o Minor features (config):
     - Warn users when descriptor and port addresses are inconsistent.
       Mitigates bug 13953; patch by teor.
diff --git a/changes/bug19743 b/changes/bug19743
index 69d21af..8395a4b 100644
--- a/changes/bug19743
+++ b/changes/bug19743
@@ -1,4 +1,4 @@
   o Documentation:
     - Correct the IPv6 syntax in our documentation for the
-      VirtualAddrNetworkIPv6 torrc option. Fixes bug 19743.
+      VirtualAddrNetworkIPv6 torrc option. Closes ticket 19743.
 
diff --git a/changes/bug19903 b/changes/bug19903
deleted file mode 100644
index 33aa878..0000000
--- a/changes/bug19903
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (compilation):
-    - Remove an inappropriate "inline" in tortls.c that was causing warnings
-      on older versions of GCC. Fixes bug 19903; 0.2.8.1-alpha.
-
diff --git a/changes/bug19947 b/changes/bug19947
deleted file mode 100644
index b9dce8b..0000000
--- a/changes/bug19947
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes (fallback directories):
-    - Avoid logging a NULL string pointer when loading fallback directory information.
-      Fixes bug 19947; bugfix on 0.2.4.7-alpha and 0.2.8.1-alpha.
-      Report and patch by "rubiate".
diff --git a/changes/bug8625 b/changes/bug8625
index 90bb3c6..b0a5196 100644
--- a/changes/bug8625
+++ b/changes/bug8625
@@ -1,4 +1,6 @@
-  o Bugfixes:
+   o Major bugfixes (directory downloads):
     - Avoid resetting download status for consensuses hourly, and add a
       SimulateDirDownloadFailures config option to test behavior when all
-      downloads from directory servers fail.  Fixes bug 8625.
+      downloads from directory servers fail.  Fixes bug 8625; bugfix on
+      0.2.0.9-alpha.
+
diff --git a/changes/geoip-august2016 b/changes/geoip-august2016
deleted file mode 100644
index 370ab64..0000000
--- a/changes/geoip-august2016
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-    - Update geoip and geoip6 to the August 2 2016 Maxmind GeoLite2
-      Country database.
-