Merge the rest of the changes into the 0.2.9.2-alpha changelog

11 files changed, 72 insertions, 66 deletions

diff --git a/ChangeLog b/ChangeLog
index e49984e018..3f20d0aef5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,20 +1,90 @@
 Changes in version 0.2.9.2-alpha - 2016-08-2?
   Tor 0.2.9.2-alpha XXXX BLURB HERE.
 
+  o Major features (user interface):
+    - Tor now supports the ability to declare options deprecated, so
+      that we can recommend that people stop using them. Previously,
+      this was done in an ad-hoc way. Closes ticket 19820.
+
+  o Major bugfixes (directory downloads):
+    - Avoid resetting download status for consensuses hourly, since we
+      already have another, smarter retry mechanism. Fixes bug 8625;
+      bugfix on 0.2.0.9-alpha.
+
+  o Minor features (config):
+    - Warn users when descriptor and port addresses are inconsistent.
+      Mitigates bug 13953; patch by teor.
+
   o Minor features (geoip):
     - Update geoip and geoip6 to the August 2 2016 Maxmind GeoLite2
       Country database.
 
+  o Minor features (user interface):
+    - There is a new --list-deprecated-options command-line option to
+      list all of the deprecated options. Implemented as part of
+      ticket 19820.
+
+  o Minor bugfixes (code style):
+    - Fix an integer signedness conversion issue in the case conversion
+      tables. Fixes bug 19168; bugfix on 0.2.1.11-alpha.
+
+  o Minor bugfixes (compilation):
+    - Build correctly on versions of libevent2 without support for
+      evutil_secure_rng_add_bytes(). Fixes bug 19904; bugfix
+      on 0.2.5.4-alpha.
+    - Fix a compilation warning on GCC versions before 4.6. Our
+      ENABLE_GCC_WARNING macro used the word "warning" as an argument,
+      when it is also required as an argument to the compiler pragma.
+      Fixes bug 19901; bugfix on 0.2.9.1-alpha.
+
   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.
+      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".
 
+  o Minor bugfixes (logging):
+    - Log a more accurate message when we fail to dump a microdescriptor.
+      Fixes bug 17758; bugfix on 0.2.2.8-alpha. Patch from Daniel Pinto.
+
+  o Minor bugfixes (memory leak):
+    - Fix a series of slow memory leaks related to parsing torrc files
+      and options. Fixes bug 19466; bugfix on 0.2.1.6-alpha.
+
+  o Deprecated features:
+    - A number of DNS-cache-related sub-options for client ports are now
+      deprecated for security reasons, and may be removed in a future
+      version of Tor. (We believe that client-side DNS cacheing is a bad
+      idea for anonymity, and you should not turn it on.) The options
+      are: CacheDNS, CacheIPv4DNS, CacheIPv6DNS, UseDNSCache,
+      UseIPv4Cache, and UseIPv6Cache.
+    - A number of options are deprecated for security reasons, and may
+      be removed in a future version of Tor. The options are:
+      AllowDotExit, AllowInvalidNodes, AllowSingleHopCircuits,
+      AllowSingleHopExits, ClientDNSRejectInternalAddresses,
+      CloseHSClientCircuitsImmediatelyOnTimeout,
+      CloseHSServiceRendCircuitsImmediatelyOnTimeout,
+      ExcludeSingleHopRelays, FastFirstHopPK, TLSECGroup,
+      UseNTorHandshake, and WarnUnsafeSocks.
+    - The *ListenAddress options are now deprecated as unnecessary: the
+      corresponding *Port options should be used instead. These options
+      may someday be removed. The affected options are:
+      ControlListenAddress, DNSListenAddress, DirListenAddress,
+      NATDListenAddress, ORListenAddress, SocksListenAddress,
+      and TransListenAddress.
+
+  o Documentation:
+    - Correct the IPv6 syntax in our documentation for the
+      VirtualAddrNetworkIPv6 torrc option. Closes ticket 19743.
+
+  o Removed code:
+    - We no longer include the (dead, deprecated) bufferevent code in
+      Tor. Closes ticket 19450. Based on a patch from U+039b.
+
 
 Changes in version 0.2.9.1-alpha - 2016-08-08
   Tor 0.2.9.1-alpha is the first alpha release in the 0.2.9 development
diff --git a/changes/19450 b/changes/19450
deleted file mode 100644
index 8e36a5aec7..0000000000
--- a/changes/19450
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Removed code:
-    - We no longer include the (dead, deprecated) bufferevent code in
-      Tor. Closes ticket 19450. Based on a patch from U+039b.
diff --git a/changes/bug13953 b/changes/bug13953
deleted file mode 100644
index db25b2879d..0000000000
--- a/changes/bug13953
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (config):
-    - Warn users when descriptor and port addresses are inconsistent.
-      Mitigates bug 13953; patch by teor.
diff --git a/changes/bug17758 b/changes/bug17758
deleted file mode 100644
index cd72d6863f..0000000000
--- a/changes/bug17758
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (logging):
-    - Log a more accurate message when we fail to dump a microdescriptor.
-      Fixes bug 17758; bugfix on 0.2.2.8-alpha. Patch from Daniel Pinto.
diff --git a/changes/bug19168 b/changes/bug19168
deleted file mode 100644
index 1fc1b3a74d..0000000000
--- a/changes/bug19168
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (code style):
-    - Fix an integer signedness conversion issue in the case conversion
-      tables. Fixes bug 19168; bugfix on 0.2.1.11-alpha.
diff --git a/changes/bug19466 b/changes/bug19466
deleted file mode 100644
index d0c2ada579..0000000000
--- a/changes/bug19466
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (memory leak):
-    - Fix a series of slow memory leaks related to parsing torrc files
-      and options. Fixes bug 19466; bugfix on 0.2.1.6-alpha.
diff --git a/changes/bug19743 b/changes/bug19743
deleted file mode 100644
index 8395a4b39e..0000000000
--- a/changes/bug19743
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Documentation:
-    - Correct the IPv6 syntax in our documentation for the
-      VirtualAddrNetworkIPv6 torrc option. Closes ticket 19743.
-
diff --git a/changes/bug19901 b/changes/bug19901
deleted file mode 100644
index 97bca0635f..0000000000
--- a/changes/bug19901
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (compilation):
-v   - Fix a compilation warning on GCC versions before 4.6.  Our
-      ENABLE_GCC_WARNING macro used the word "warning" as an
-      argument, when it is also required as an argument to the
-      compiler pragma. Fixes bug 19901; bugfix on 0.2.9.1-alpha.
diff --git a/changes/bug19904 b/changes/bug19904
deleted file mode 100644
index 217d82df5e..0000000000
--- a/changes/bug19904
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (compilation):
-    - Build correctly on versions of libevent2 without support
-      for evutil_secure_rng_add_bytes(). Fixes bug 19904;
-      bugfix on 0.2.5.4-alpha.
diff --git a/changes/bug8625 b/changes/bug8625
deleted file mode 100644
index e398d07379..0000000000
--- a/changes/bug8625
+++ /dev/null
@@ -1,5 +0,0 @@
-   o Major bugfixes (directory downloads):
-    - Avoid resetting download status for consensuses hourly, since we
-      already have another, smarter retry mechanism.  Fixes bug 8625; bugfix on
-      0.2.0.9-alpha.
-
diff --git a/changes/deprecation b/changes/deprecation
deleted file mode 100644
index 03a537a0b2..0000000000
--- a/changes/deprecation
+++ /dev/null
@@ -1,31 +0,0 @@
-  o Major features (user interface):
-    - Tor now supports the ability to declare options deprecated, so that
-      we can recommend that people stop using them. Previously, this was
-      done in an ad-hoc way.
-      Closes ticket 19820.
-
-  o Minor features (user interface):
-    - There is a new --list-deprecated-options command-line option to list
-      all of the deprecated options. Implemented as part of ticket 19820.
-
-  o Deprecated features:
-    - A number of options are deprecated for security reasons, and may be
-      removed in a future version of Tor. The options are: AllowDotExit,
-      AllowInvalidNodes, AllowSingleHopCircuits, AllowSingleHopExits,
-      ClientDNSRejectInternalAddresses,
-      CloseHSClientCircuitsImmediatelyOnTimeout,
-      CloseHSServiceRendCircuitsImmediatelyOnTimeout, ExcludeSingleHopRelays,
-      FastFirstHopPK, TLSECGroup, UseNTorHandshake, and WarnUnsafeSocks.
-
-    - A number of DNS-cache-related sub-options for client ports are now
-      deprecated for security reasons, and may be removed in a future version
-      of Tor. (We believe that client-side DNS cacheing is a bad idea for
-      anonymity, and you should not turn it on.) The options are: CacheDNS,
-      CacheIPv4DNS, CacheIPv6DNS, UseDNSCache, UseIPv4Cache, and
-      UseIPv6Cache.
-
-    - The *ListenAddress options are now deprecated as unnecessary: the
-      corresponding *Port options should be used instead. These options may
-      someday be removed.  The affected options are: ControlListenAddress,
-      DNSListenAddress, DirListenAddress, NATDListenAddress, ORListenAddress,
-      SocksListenAddress, and TransListenAddress.