fold in changes files

11 files changed, 39 insertions, 43 deletions

diff --git a/ChangeLog b/ChangeLog
index 3ba1286c70..2413f1706f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Changes in version 0.2.4.3-alpha - 2012-09-??
+Changes in version 0.2.4.3-alpha - 2012-09-22
+  Tor 0.2.4.3-alpha fixes another opportunity for a remotely triggerable
+  assertion, resumes letting relays test reachability of their DirPort,
+  and cleans up a bunch of smaller bugs.
+
   o Security fixes:
     - Fix an assertion failure in tor_timegm() that could be triggered
       by a badly formatted directory object. Bug found by fuzzing with
@@ -20,11 +24,40 @@ Changes in version 0.2.4.3-alpha - 2012-09-??
       part of the loop after it had made its choice slightly slower
       than it ran through the part of the loop before it had made its
       choice. Addresses ticket 6538.
+    - Disable the use of Guard nodes when in Tor2WebMode. Guard usage
+      by tor2web clients allows hidden services to identity tor2web
+      clients through their repeated selection of the same rendezvous
+      and introduction point circuit endpoints (their guards). Resolves
+      ticket 6888.
+
+  o Minor features:
+    - Enable Tor to read configuration, state, and key information from
+      a FIFO. Previously Tor would only read from files with a positive
+      stat.st_size. Code from meejah; fixes bug 6044.
 
   o Minor bugfixes:
     - Correct file sizes when reading binary files on Cygwin, to avoid
       a bug where Tor would fail to read its state file. Fixes bug 6844;
       bugfix on 0.1.2.7-alpha.
+    - Correctly handle votes with more than 31 flags. Fixes bug 6853;
+      bugfix on 0.2.0.3-alpha.
+    - When complaining about a client port on a public address, log
+      which address we're complaining about. Fixes bug 4020; bugfix on
+      0.2.3.3-alpha. Patch by Tom Fitzhenry.
+    - Convert an assert in the pathbias code to a log message. The assert
+      appears to only be triggerable by Tor2Web mode. Fixes bug 6866;
+      bugfix on 0.2.3.17-beta.
+    - Our new buildsystem was overzealous about rebuilding manpages: it
+      would rebuild them all whenever any one of them changed. Now our
+      dependency checking should be correct. Fixes bug 6843; bugfix on
+      0.2.4.1-alpha.
+    - Don't do reachability testing over IPv6 unless AuthDirPublishIPv6
+      is set. Fixes bug 6880. Bugfix on 0.2.4.1-alpha.
+    - Correct log printout about which address family is preferred
+      when connecting to a bridge with both an IPv4 and IPv6 OR port.
+      Fixes bug 6884; bugfix on 0.2.4.1-alpha.
+
+  o Minor bugfixes (code cleanliness):
     - Fix round_to_power_of_2() so it doesn't invoke undefined behavior
       with large values. This situation was untriggered, but nevertheless
       incorrect. Fixes bug 6831; bugfix on 0.2.0.1-alpha.
@@ -36,6 +69,8 @@ Changes in version 0.2.4.3-alpha - 2012-09-??
       Previously, Tor would have confused (as-yet-unused) protocol version
       numbers greater than 32 with lower ones on many platforms. Fixes
       bug 6827; bugfix on 0.2.0.10-alpha. Found by George Kadianakis.
+    - Fix handling of rendezvous client authorization types over 8.
+      Fixes bug 6861; bugfix on 0.2.1.5-alpha.
     - Fix building with older versions of GCC (2.95, for one) that don't
       like preprocessor directives inside macro arguments. Found by
       grarpamp. Fixes bug 6842; bugfix on 0.2.4.2-alpha.
@@ -49,8 +84,11 @@ Changes in version 0.2.4.3-alpha - 2012-09-??
     - Move the core of our "choose a weighted element at random" logic
       into its own function, and give it unit tests. Now the logic is
       testable, and a little less fragile too.
+    - Removed the testing_since field of node_t, which hasn't been used
+      for anything since 0.2.0.9-alpha.
 
   o Documentation fixes:
+    - Clarify that hidden services are TCP only. Fixes bug 6024.
     - Resolve a typo in torrc.sample.in. Fixes bug 6819; bugfix on
       0.2.3.14-alpha.
 
diff --git a/changes/6044 b/changes/6044
deleted file mode 100644
index 6f932a3127..0000000000
--- a/changes/6044
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features:
-    - Enable Tor to read configuration, state, and key information from
-      a FIFO. Previously Tor would only read from files with a positive
-      stat.st_size. Code from meejah; fixes bug 6044.
-
diff --git a/changes/6884 b/changes/6884
deleted file mode 100644
index 66801dbc6d..0000000000
--- a/changes/6884
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (client):
-    - Correct log printout about which address family is preferred
-      when connecting to a bridge with both an IPv4 and IPv6 OR port.
-      Fixes bug 6884; bugfix on 0.2.4.1-alpha.
diff --git a/changes/bug4020 b/changes/bug4020
deleted file mode 100644
index 3ca86e29db..0000000000
--- a/changes/bug4020
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - When complaining about a client port on a public address, log
-      which address we're complaining about. Fixes bug 4020; bugfix on
-      0.2.3.3-alpha. Patch by Tom Fitzhenry.
-  
diff --git a/changes/bug5809 b/changes/bug5809
deleted file mode 100644
index ac3f6b1a76..0000000000
--- a/changes/bug5809
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Removed code:
-    - Removed the testing_since field of node_t, which hasn't been used
-      for anything since 0.2.0.9-alpha.
diff --git a/changes/bug6024 b/changes/bug6024
deleted file mode 100644
index 743e6ef1fe..0000000000
--- a/changes/bug6024
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Documentation fixes:
-    - Clarify that hidden services are TCP only. Fixes bug 6024.
diff --git a/changes/bug6843 b/changes/bug6843
deleted file mode 100644
index 1acfdbd284..0000000000
--- a/changes/bug6843
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Our new buildsystem was overzealous about rebuilding manpages: it
-      would rebuild them all whenever any one of them changed. Now our
-      dependency checking should be correct. Fixes bug 6843; bugfix on
-      0.2.4.1-alpha.
diff --git a/changes/bug6853 b/changes/bug6853
deleted file mode 100644
index 382adfb44f..0000000000
--- a/changes/bug6853
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (directory authority):
-    - Correctly handle votes with more than 31 flags. Fixes bug 6853;
-      bugfix on 0.2.0.3-alpha.
diff --git a/changes/bug6861 b/changes/bug6861
deleted file mode 100644
index 1040bd7a36..0000000000
--- a/changes/bug6861
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Fix handling of rendezvous client authorization types over 8.
-      Fixes bug 6841; bugfix on 0.2.1.5-alpha.
diff --git a/changes/bug6866 b/changes/bug6866
deleted file mode 100644
index efaab98575..0000000000
--- a/changes/bug6866
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Minor bugfixes:
-    - Convert an assert in the pathbias code to a log message. Assert
-      appears to only be triggerable by Tor2Web mode. Fixes bug 6866;
-      bugfix on 0.2.3.17-beta.
-    - Disable the use of Guard nodes when in Tor2WebMode. Guard usage
-      by Tor2Web clients allows hidden services to identity tor2web
-      clients through their repeated selection of the same rendezvous
-      and introduction point circuit endpoints (their guards). Fixes
-      bug 6888.
diff --git a/changes/bug6880 b/changes/bug6880
deleted file mode 100644
index c08a2d40de..0000000000
--- a/changes/bug6880
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Don't do reachability testing over IPv6 unless
-      AuthDirPublishIPv6 is set.  Fix for bug 6880.