start folding in the 0.2.3.2-alpha changelog entries

32 files changed, 115 insertions, 151 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f9a545d84..4f40f175b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,118 @@
+Changes in version 0.2.3.2-alpha - 2011-07-18
+  o Major features:
+    - Clients can now use microdescriptors instead of regular descriptors
+      to build circuits. Microdescriptors are authority-generated and
+      authority-authenticated summaries of regular descriptors' contents,
+      designed to change very rarely (see proposal 158 for details). This
+      feature is designed to save bandwidth, especially for clients on
+      slow internet connections. It's off by default for now, since
+      nearly no caches support it, but it will be on-by-default for
+      clients in a future version. You can use the UseMicrodescriptors
+      option to turn it on.
+    - Tor clients using bridges can now be configured to use a separate
+      'transport' proxy for each bridge. This approach helps to resist
+      censorship by allowing bridges to use protocol obfuscation
+      plugins. It implements part of proposal 180. Implements ticket 2841.
+    - While we're trying to bootstrap, record how many TLS connections
+      fail in each state, and report which states saw the most failures
+      in response to any bootstrap failures. This feature may speed up
+      diagnosis of censorship events. Implements ticket 3116.
+
+  o Major bugfixes (on 0.2.3.1-alpha):
+    - When configuring a large set of nodes in EntryNodes (as with
+      'EntryNodes {cc}' or 'EntryNodes 1.1.1.1/16'), choose only a
+      random subset to be guards, and choose them in random
+      order. Fixes bug 2798.
+    - Fix a crash bug that could occur when setting a consensus in a
+      non-used consensus flavor without having a current consensus set.
+      Fixes bug 3361.
+    - Fix a bug where comparing an unknown address to a microdescriptor's
+      shortened exit policy would always seem to give a "rejected" result.
+      Fixes bug 3599.
+    - Using microdescriptors no longer prevents Tor from uploading and
+      downloading hidden service descriptors. Fixes bug 3601.
+
+  o Minor features:
+    - Allow nameservers with IPv6 address. Resolves bug 2574.
+    - Accept attempts to include a password authenticator in the
+      handshake, as supported by SOCKS5. This handles SOCKS clients that
+      don't know how to omit a password when authenticating. Resolves
+      bug 1666.
+    - When configuring a large set of nodes in EntryNodes, and there are
+      enough of them listed as Guard so that we don't need to consider
+      the non-guard entries, prefer the ones listed with the Guard flag.
+    - Check for and recover from inconsistency in the microdescriptor
+      cache. This will make it harder for us to accidentally free a
+      microdescriptor without removing it from the appropriate data
+      structures. Fixes issue 3135; issue noted by "wanoskarnet".
+    - Log SSL state transitions at log level DEBUG, log domain
+      HANDSHAKE. This can be useful for debugging censorship events.
+      Implements ticket 3264.
+    - Add port 6523 (Gobby) to LongLivedPorts. Patch by intrigeri;
+      implements ticket 3439.
+
+  o Minor bugfixes (on 0.2.3.1-alpha):
+    - Do not free all general-purpose regular descriptors just
+      because microdescriptor use is enabled. Fixes bug 3113.
+    - Correctly link libevent_openssl when --enable-static-libevent
+      is passed to configure. Fixes bug 3118.
+    - Bridges should not complain that they are unlisted in the consensus:
+      that's more or less the point of being a bridge. Fixes bug 3183.
+    - Report a SIGNAL event to controllers when acting on a delayed
+      SIGNAL NEWNYM command.  Previously, we would report a SIGNAL
+      event to the controller if we acted on a SIGNAL NEWNYM command
+      immediately, and otherwise not report a SIGNAL event for the
+      command at all. Fixes bug 3349.
+    - Fix a crash when handling the SIGNAL controller command or
+      reporting ERR-level status events with bufferevents enabled. Found
+      by Robert Ransom. Fixes bug 3367.
+    - Always ship the tor-fw-helper manpage in our release tarballs.
+      Fixes bug 3389. Reported by Stephen Walker.
+    - Fix a class of double-mark-for-close bugs when bufferevents
+      are enabled. Fixes bug 3403.
+    - Update tor-fw-helper to support libnatpmp-20110618; fixes 3434.
+    - Add SIGNAL to the list returned by the 'GETINFO events/names'
+      control-port command. Fixes part of bug 3465.
+    - Prevent using negative indices during unit test runs when read_all()
+      fails. Spotted by coverity.
+    - Fix a rare memory leak when checking the nodelist without it being
+      present. Found by coverity.
+    - Only try to download a microdescriptor-flavored consensus from
+      a directory cache that provides them.
+
+  o Minor bugfixes (on 0.2.2.x and earlier):
+    - Assert that hidden-service-related operations are not performed
+      using single-hop circuits. Previously, Tor would assert that
+      client-side streams are not attached to single-hop circuits,
+      but not that other sensitive operations on the client and service
+      side are not performed using single-hop circuits. Fixes bug 3332;
+      bugfix on 0.0.6.
+    - Don't publish a new relay descriptor when we reload our onion key,
+      unless the onion key has actually changed. Fixes bug 3263 and
+      resolves another cause of bug 1810. Bugfix on 0.1.1.11-alpha.
+    - Allow GETINFO fingerprint to return a fingerprint even when
+      we have not yet built a router descriptor. Fixes bug 3577;
+      bugfix on 0.2.0.1-alpha.
+    - Make 'tor --digests' list hashes of all Tor source files.
+      Bugfix on 0.2.2.4-alpha; fixes bug 3427.
+
+  o Code simplification and refactoring:
+    - Use tor_sscanf() in place of scanf() in more places through the
+      code. This makes us a little more locale-independent, and
+      should help shut up code-analysis tools that can't tell
+      a safe sscanf string from a dangerous one.
+    - Use tt_assert(), not tor_assert(), for checking for test failures.
+      This makes the unit tests more able to go on in the event that
+      one of them fails.
+    - Split connection_about_to_close() into separate functions for each
+      connection type.
+
+  o Build changes:
+    - On Windows, we now define the _WIN32_WINNT macros only if they
+      are not already defined. This lets the person building Tor decide,
+      if they want, to require a later version of Windows.
+
+
 Changes in version 0.2.2.30-rc - 2011-07-07
   Tor 0.2.2.30-rc is the first release candidate for the Tor 0.2.2.x
   series. It fixes a few smaller bugs, but generally appears stable.
diff --git a/changes/bug1666 b/changes/bug1666
deleted file mode 100644
index 9fd790d4e4..0000000000
--- a/changes/bug1666
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-    - Accept attempts to include a password authenticator in the handshake, as
-      supported by SOCKS5. This handles SOCKS clients that don't know how to
-      omit the password when authenticating. Resolves bug 1666.
diff --git a/changes/bug2574 b/changes/bug2574
deleted file mode 100644
index 5cf2daebfa..0000000000
--- a/changes/bug2574
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Allow nameservers with IPv6 address. Fixes bug 2574.
-
diff --git a/changes/bug2798 b/changes/bug2798
deleted file mode 100644
index 8fd2243b04..0000000000
--- a/changes/bug2798
+++ /dev/null
@@ -1,10 +0,0 @@
-  o Major bugfixes:
-    - When configuring a large set of nodes in EntryNodes (as with
-      'EntryNodes {cc}' or 'EntryNodes 1.1.1.1/16'), choose only a
-      random subset to be guards, and choose them in random
-      order. Bugfix on 0.2.3.1-alpha; fixes bug 2798.
-
-  o Minor features:
-    - When configuring a large set of nodes in EntryNodes, and there are
-      enough of them listed as Guard so that we don't need to consider
-      the non-guard entries, prefer the ones listed with the Guard flag.
diff --git a/changes/bug3113 b/changes/bug3113
deleted file mode 100644
index 7c3b5ce379..0000000000
--- a/changes/bug3113
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Do not free all general-purposes regular descriptors just
-      because microdescriptor use is enabled. Fixes bug 3113;
-      bugfix on 0.2.3.1-alpha.
diff --git a/changes/bug3118 b/changes/bug3118
deleted file mode 100644
index c702981730..0000000000
--- a/changes/bug3118
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Correctly link libevent_openssl when --enable-static-libevent
-      is passed to configure. Fixes bug 3118; bugfix on 0.2.3.1-alpha.
-
diff --git a/changes/bug3153 b/changes/bug3153
deleted file mode 100644
index 8754b3df3e..0000000000
--- a/changes/bug3153
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features:
-    - Check for and recover from inconsistency in the microdescriptor
-      cache.  This will make it harder for us to accidentally free a
-      microdescriptor without removing it from the appropriate data
-      structures.  Fixes issue 3135; issue noted by wanoskarnet.
diff --git a/changes/bug3183 b/changes/bug3183
deleted file mode 100644
index b1e594b8d1..0000000000
--- a/changes/bug3183
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Bridges should not complain that they are unlisted in the consensus:
-      that's more or less the point of being a bridge.  Bugfix on
-      0.2.3.1-alpha; fixes bug 3183.
-
diff --git a/changes/bug3263 b/changes/bug3263
deleted file mode 100644
index 43202c276f..0000000000
--- a/changes/bug3263
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Don't publish a new relay descriptor when we reload our onion key,
-      unless the onion key has actually changed. Fixes bug 3263 and
-      resolves another cause of bug 1810. Bugfix on 0.1.1.11-alpha.
diff --git a/changes/bug3264 b/changes/bug3264
deleted file mode 100644
index dcd0a842f6..0000000000
--- a/changes/bug3264
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-    - Log SSL state transitions at log level DEBUG, log domain
-      HANDSHAKE.  This can be useful for debugging censorship events.
-      Implements ticket 3264.
diff --git a/changes/bug3332 b/changes/bug3332
deleted file mode 100644
index 28ccbf41d7..0000000000
--- a/changes/bug3332
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Minor bugfixes:
-    - Assert that hidden-service-related operations are not performed
-      using single-hop circuits.  Previously, Tor would assert that
-      client-side streams are not attached to single-hop circuits, but
-      not that other sensitive operations on the client and service
-      side are not performed using single-hop circuits.  Fixes bug
-      3332; bugfix on 0.0.6.
-
-
diff --git a/changes/bug3349 b/changes/bug3349
deleted file mode 100644
index fe5836ae14..0000000000
--- a/changes/bug3349
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Minor bugfixes:
-    - Report a SIGNAL event to controllers when acting on a delayed
-      SIGNAL NEWNYM command.  Previously, we would report a SIGNAL
-      event to the controller if we acted on a SIGNAL NEWNYM command
-      immediately, and otherwise not report a SIGNAL event for the
-      command at all.  Bugfix on 0.2.3.1-alpha; fixes bug 3349.
-
-
-
diff --git a/changes/bug3361 b/changes/bug3361
deleted file mode 100644
index 06bd954a0a..0000000000
--- a/changes/bug3361
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes:
-    - Fix a crash bug that could occur when setting a consensus in a
-      non-used flavor without having a current consensus set. Fixes bug
-      3361; bugfix on 0.2.3.1-alpha.
diff --git a/changes/bug3367 b/changes/bug3367
deleted file mode 100644
index 8a697782bb..0000000000
--- a/changes/bug3367
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes
-    - Fix a crash when handling the SIGNAL controller command or
-      reporting ERR-level status events with bufferevents enabled. Found
-      by Robert Ransom. Fixes bug 3367; bugfix on 0.2.3.1-alpha.
diff --git a/changes/bug3389 b/changes/bug3389
deleted file mode 100644
index 2442f4f976..0000000000
--- a/changes/bug3389
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes:
-    - Always ship the tor-fw-helper manpage in our release tarballs. Bugfix
-      on 0.2.3.1-alpha; fixes bug 3389. Reported by Stephen Walker.
-
diff --git a/changes/bug3403 b/changes/bug3403
deleted file mode 100644
index 7d051d9f4f..0000000000
--- a/changes/bug3403
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Fix a class of double-mark-for-close bugs when bufferevents
-      are enabled. Fixes bug 3403; bugfix on 0.2.3.1-alpha.
diff --git a/changes/bug3427 b/changes/bug3427
deleted file mode 100644
index 267d4d4221..0000000000
--- a/changes/bug3427
+++ /dev/null
@@ -1,4 +0,0 @@
-  * Minor bugfixes:
-    - Make 'tor --digests' list hashes of all Tor source files.
-      Bugfix on 0.2.2.4-alpha; fixes bug 3427.
-
diff --git a/changes/bug3434 b/changes/bug3434
deleted file mode 100644
index 24ee518723..0000000000
--- a/changes/bug3434
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Minor bugfixes:
-    - Update tor-fw-helper to support libnatpmp-20110618; fixes 3434.
diff --git a/changes/bug3465-023 b/changes/bug3465-023
deleted file mode 100644
index 9fa089bda9..0000000000
--- a/changes/bug3465-023
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes:
-
-    - Add SIGNAL to the list returned by the 'GETINFO events/names'
-      control-port command.  Bugfix on 0.2.3.1-alpha; fixes part of
-      bug 3465.
-
diff --git a/changes/bug3577 b/changes/bug3577
deleted file mode 100644
index 6335272752..0000000000
--- a/changes/bug3577
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Allow GETINFO fingerprint to return a fingerprint even when
-      we have not yet built a router descriptor. Fixes bug 3577;
-      bugfix on 0.2.0.1-alpha.
diff --git a/changes/bug3601 b/changes/bug3601
deleted file mode 100644
index 36686a45f4..0000000000
--- a/changes/bug3601
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes:
-    - Using microdescriptors no longer prevents Tor from uploading and
-      downloading hidden service descriptors. Fixes bug 3601; bugfix
-      on 0.2.3.1-alpha.
diff --git a/changes/cov217_scanf b/changes/cov217_scanf
deleted file mode 100644
index 368bca825e..0000000000
--- a/changes/cov217_scanf
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Code simplification and refactoring:
-    - Use tor_sscanf in place of scanf in more places through the
-      code. This makes us a little more locale-independent, and
-      should help shut up code-analysis tools that can't tell
-      a safe sscanf string from a dangerous one.
diff --git a/changes/coverity_master b/changes/coverity_master
deleted file mode 100644
index eca003d208..0000000000
--- a/changes/coverity_master
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Minor bugfixes:
-    - Prevent using negative indices during unit test runs when read_all()
-      fails. Spotted by coverity. Bugfix on 0.2.3.1-alpha.
-    - Fix a rare memory leak when checking the nodelist without it being
-      present. Found by coverity. Bugfix on 0.2.3.1-alpha.
-  o Code simplifications and refactoring:
-    - Remove a dead variable in the heartbeat log code. Spotted by coverity.
-
diff --git a/changes/feature2841 b/changes/feature2841
deleted file mode 100644
index c5da061535..0000000000
--- a/changes/feature2841
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major features:
-    - Tor clients using bridges can now be configured to use a
-      separate 'transport' proxy for each bridge. This helps to resist
-      censorship by allowing bridges to use protocol obfuscation
-      plugins. It implements part of proposal 180.
-
diff --git a/changes/feature3116 b/changes/feature3116
deleted file mode 100644
index 386790c295..0000000000
--- a/changes/feature3116
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major features:
-    - While we're trying to bootstrap, record how many TLS connections
-      fail in each state, and report which states saw the most failures
-      in response to any bootstrap failures. This feature may speed up
-      diagnosis of censorship events.
diff --git a/changes/feature3439 b/changes/feature3439
deleted file mode 100644
index ee8c6f2ce6..0000000000
--- a/changes/feature3439
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Add port 6523 (Gobby) to LongLivedPorts. Patch by intrigeri;
-      implements ticket 3439.
diff --git a/changes/ifdef-winnt b/changes/ifdef-winnt
deleted file mode 100644
index 2c6c5a2324..0000000000
--- a/changes/ifdef-winnt
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Build changes:
-    - On Windows, we now define the _WIN32_WINNT macros only if they
-      are not already defined. This lets the person building Tor decide,
-      if they want, to require a later version of Windows.
diff --git a/changes/microdesc_con_dl b/changes/microdesc_con_dl
deleted file mode 100644
index 9bf1260769..0000000000
--- a/changes/microdesc_con_dl
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Only try to download a microdescriptor-flavored consensus from
-      a directory cache that provides those. Bugfix on 0.2.3.1-alpha.
diff --git a/changes/microdesc_use b/changes/microdesc_use
deleted file mode 100644
index 89faf7c5fb..0000000000
--- a/changes/microdesc_use
+++ /dev/null
@@ -1,10 +0,0 @@
-  o Major features
-    - Clients can now use microdescriptors instead of regular descriptors
-      to build circuits.  Microdescriptors are authority-generated and
-      -authenticated summaries of regular descriptors' contents, designed
-      to change very rarely.  This feature is designed to save bandwidth,
-      especially for clients on slow internet connections.  It's off
-      by default for now, since nearly no caches support it, but it will
-      be on-by-default for clients in a future version.  You can use the
-      UseMicrodescriptors option to turn it on.
-
diff --git a/changes/prefer_tt_assert b/changes/prefer_tt_assert
deleted file mode 100644
index 4fdb6367f7..0000000000
--- a/changes/prefer_tt_assert
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Code simplifications and refactoring (tests):
-    - Use tt_assert, not tor_assert, for checking for test failures.
-      This makes the unit tests more able to go on in the event that
-      one of them fails.
diff --git a/changes/shortpolicy_compare b/changes/shortpolicy_compare
deleted file mode 100644
index 3de0948174..0000000000
--- a/changes/shortpolicy_compare
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes:
-    - Fix a bug where comparing an unknown address to a microdescriptor's
-      shortened exit policy would always seem to give a "rejected" result.
-      Bugfix on 0.2.3.1-alpha. Fixes bug 3599.
diff --git a/changes/split_about_to_close b/changes/split_about_to_close
deleted file mode 100644
index 2f5a67940f..0000000000
--- a/changes/split_about_to_close
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Code simplification and refactoring:
-    - Split connection_about_to_close into separate functions for each
-      connection type.