closer to a changelog for the next alpha

6 files changed, 54 insertions, 68 deletions

diff --git a/ChangeLog b/ChangeLog
index d1bb44d6af..18505dd35b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,46 +1,66 @@
 Changes in version 0.2.3.6-alpha - 2011-10-??
   o Major features:
-    - Implement a new handshake protocol for authenticating Tors to
+    - Implement a new handshake protocol (v3) for authenticating Tors to
       each other over TLS. It should be more resistant to fingerprinting
       than previous protocols, and should require less TLS hacking for
-      future Tor implementations. Implements Proposal 185.
+      future Tor implementations. Implements proposal 185.
     - Allow variable-length padding cells to disguise the length of
-      Tor's TLS records. Implements part of Proposal 184.
+      Tor's TLS records. Implements part of proposal 184.
 
   o Major bugfixes (hidden services):
-    - Don't launch a useless circuit after failing to use one of a
-      hidden service's introduction points. Previously, we would
-      launch a new introduction circuit, but not set the hidden service
-      which that circuit was intended to connect to, so it would never
-      actually be used. A different piece of code would then create a
-      new introduction circuit correctly, so this bug was harmless until
-      it caused an assertion in the client-side part of the #3825 fix
-      to fail. Bug reported by katmagic and found by Sebastian Hahn.
-      Bugfix on 0.2.1.13-alpha; fixes bug 4212.
+    - Improve hidden service robustness: when an attempt to connect to
+      a hidden service ends, be willing to refetch its hidden service
+      descriptors from each of the HSDir relays responsible for them
+      immediately. Previously, we would not consider refetching the
+      service's descriptors from each HSDir for 15 minutes after the last
+      fetch, which was inconvenient if the hidden service was not running
+      during the first attempt. Bugfix on 0.2.0.18-alpha; fixes bug 3335.
     - When one of a hidden service's introduction points appears to be
       unreachable, stop trying it. Previously, we would keep trying
       to build circuits to the introduction point until we lost the
       descriptor, usually because the user gave up and restarted Tor.
       Partly fixes bug 3825.
-    - When an attempt to connect to a hidden service ends, consider
-      refetching its hidden service descriptors from each of the HSDir
-      relays responsible for them immediately. Previously, we would not
-      consider refetching the service's descriptors from each HSDir for
-      15 minutes after the last fetch; this behaviour was inconvenient
-      if the hidden service was not running during the first attempt,
-      for example. Bugfix on 0.2.0.18-alpha; fixes bug 3335.
+    - Don't launch a useless circuit after failing to use one of a
+      hidden service's introduction points. Previously, we would
+      launch a new introduction circuit, but not set the hidden service
+      which that circuit was intended to connect to, so it would never
+      actually be used. A different piece of code would then create a
+      new introduction circuit correctly. Bug reported by katmagic and
+      found by Sebastian Hahn. Bugfix on 0.2.1.13-alpha; fixes bug 4212.
 
   o Major bugfixes (other):
     - Don't update the AccountingSoftLimitHitAt state file entry whenever
       tor gets started. This prevents a wrong average bandwidth
       estimate, which would cause relays to always start a new accounting
       interval at the earliest possible moment. Fixes bug 2003; bugfix
-      on 0.2.2.7-alpha.  Reported by BryonEldridge, who also helped
+      on 0.2.2.7-alpha. Reported by BryonEldridge, who also helped
       immensely in tracking this bug down.
     - Fix a crash bug when changing node restrictions while a DNS lookup
       is in-progress. Fixes bug 4259; bugfix on 0.2.2.25-alpha. Bugfix
       by "Tey'".
 
+  o Minor bugfixes (on 0.2.2.x and earlier):
+    - When a hidden service turns an extra service-side introduction
+      circuit into a general-purpose circuit, free the rend_data and
+      intro_key fields first, so we won't leak memory if the circuit
+      is cannibalized for use as another service-side introduction
+      circuit. Bugfix on 0.2.1.7-alpha; fixes bug 4251.
+    - Rephrase the log message emitted if the TestSocks check is
+      successful. Patch from Fabian Keil; fixes bug 4094.
+    - Bridges now skip DNS self-tests, to act a little more stealthily.
+      Fixes bug 4201; bugfix on 0.2.0.3-alpha, which first introduced
+      bridges. Patch by "warms0x".
+    - Remove a confusing dollar sign from the example fingerprint in the
+      man page, and also make the example fingerprint a valid one. Fixes
+      bug 4309; bugfix on 0.2.1.3-alpha.
+    - Fix internal bug-checking logic that was supposed to catch
+      failures in digest generation so that it will fail more robustly
+      if we ask for a nonexistent algorithm. Found by Coverity Scan.
+      Bugfix on 0.2.2.1-alpha; fixes Coverity CID 479.
+    - Report any failure in init_keys() calls launched because our
+      IP address has changed. Spotted by Coverity Scan. Bugfix on
+      0.1.1.4-alpha; fixes CID 484.
+
   o Minor bugfixes (on 0.2.3.x):
     - Fix a bug in configure.in that kept it from building a configure
       script with autoconf versions earlier than 2.61. Fixes bug 2430;
@@ -49,37 +69,30 @@ Changes in version 0.2.3.6-alpha - 2011-10-??
       Internet if they have specified an RFC1918 address. Previously,
       we would warn if the user had specified any non-loopback
       address. Bugfix on 0.2.3.3-alpha. Fixes bug 4018; reported by Tas.
-
-  o Minor bugfixes (on 0.2.2.x and earlier):
-    - When one of a hidden service's introduction points times out,
-      consider trying it again during the next attempt to connect to
-      the HS. Previously, we would not try it again unless a newly
-      fetched descriptor contained it. Required by fixes for bugs
-      1297 and 3825.
-    - Rephrase the log message emitted if the TestSocks check is
-      successful. Patch from Fabian Keil; fixes bug 4094.
-    - Bridges now skip DNS self-tests, to act a little more stealthily.
-      Fixes bug 4201; bugfix on 0.2.0.3-alpha, which first introduced
-      bridges. Patch by "warms0x".
-    - When a hidden service turns an extra service-side introduction
-      circuit into a general-purpose circuit, free the rend_data and
-      intro_key fields first, so we won't leak memory if the circuit
-      is cannibalized for use as another service-side introduction
-      circuit. Bugfix on 0.2.1.7-alpha; fixes bug 4251.
+    - Fix memory leaks in the failing cases of the new SocksPort and
+      ControlPort code. Found by Coverity Scan. Bugfix on 0.2.3.3-alpha;
+      fixes coverity CIDs 485, 486, and 487.
 
   o Minor features:
+    - When a hidden service's introduction point times out, consider
+      trying it again during the next attempt to connect to the
+      HS. Previously, we would not try it again unless a newly fetched
+      descriptor contained it. Required by fixes for bugs 1297 and 3825.
     - The next version of Windows will be called Windows 8, and it has
       a major version of 6, minor version of 2. Correctly identify that
       version instead of calling it "Very recent version". Resolves
       ticket 4153; reported by funkstar.
-    - The bridge authority now writes statistics on how many bridge
+    - The Bridge Authority now writes statistics on how many bridge
       descriptors it gave out in total, and how many unique descriptors
-      it gave out. Implements ticket 4200.
+      it gave out. It also lists how often the most and least commonly
+      fetched descriptors were given out, as well as the median and
+      25th/75th percentile. Implements tickets 4200 and 4294.
     - Update to the October 4 2011 Maxmind GeoLite Country database.
 
   o Code simplifications and refactoring:
-    - Remove the ability to define TRACK_SERVED_TIME. The feature
-      wasn't used and is now outdated that microdescriptors are around.
+    - Remove some old code to remember statistics about which descriptors
+      we've served as a directory mirror. The feature wasn't used and
+      is outdated now that microdescriptors are around.
     - Rename Tor functions that turn strings into addresses, so that
       "parse" indicates that no hostname resolution occurs, and
       "lookup" indicates that hostname resolution may occur. This
diff --git a/changes/bug4309 b/changes/bug4309
deleted file mode 100644
index f4f910e7ff..0000000000
--- a/changes/bug4309
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Remove a confusing dollar sign from the example fingerprint in the
-      man page, and also make example fingerprint a valid one. Fixes bug
-      4309; bugfix on 0.2.1.3-alpha.
-
diff --git a/changes/cov479 b/changes/cov479
deleted file mode 100644
index afbaffc63b..0000000000
--- a/changes/cov479
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Fix internal bug-checking logic that was supposed to catch
-      failures in digest generation so that it will fail more robustly
-      if we ask for a nonexistent algorithm. Found by Coverity Scan.
-      Bugfix on 0.2.2.1-alpha; fixes Coverity CID 479.
diff --git a/changes/cov484 b/changes/cov484
deleted file mode 100644
index 33adbda18c..0000000000
--- a/changes/cov484
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Report any failure in init_keys() calls done because our IP address
-      has changed. Spotted by Coverity Scan. Bugfix on 0.1.1.4-alpha;
-      fixes CID 484.
diff --git a/changes/cov_485,486,487 b/changes/cov_485,486,487
deleted file mode 100644
index 648b010f5d..0000000000
--- a/changes/cov_485,486,487
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Fix memory leaks in the failing cases of the new SocksPort and
-      ControlPort code. Found by Coverity Scan. Bugfix on
-      0.2.3.3-alpha; fixes coverity CID 485, 486, and 487.
-
diff --git a/changes/ticket4294 b/changes/ticket4294
deleted file mode 100644
index 5041495542..0000000000
--- a/changes/ticket4294
+++ /dev/null
@@ -1,8 +0,0 @@
-(NOTE: THIS SHOULD REPLACE THE TICKET 4200 ENTRY IN THE CHANGELOG)
-  o Minor features:
-    - The Bridge Authority now writes statistics on how many bridge
-      descriptors it gave out in total, and how many unique descriptors it
-      gave out. It also lists how often the most and least commonly fetched
-      descriptors were given out, as well as the median and 25/75 percentile.
-      Implements tickets 4200 and 4294.
-