fold in (and fix up) some changes entries so far

17 files changed, 64 insertions, 71 deletions

diff --git a/ChangeLog b/ChangeLog
index 6a5ab8d732..621f4265a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,67 @@
+Changes in version 0.2.4.13-alpha - 2013-06-1?
+
+  o Major bugfixes:
+    - Avoid a memory leak where we would leak a consensus body when we
+      find that a consensus which we couldn't previously verify due to
+      missing certificates is now verifiable. Fixes bug 8719; bugfix
+      on 0.2.0.10-alpha.
+    - Prevent the get_freelists() function from running off the end of
+      the list of freelists if it somehow gets an unrecognized
+      allocation. Fixes bug 8844; bugfix on 0.2.0.16-alpha. Reported by
+      eugenis.
+    - Follow the socks5 protocol when offering username/password
+      authentication. The fix for bug 8117 exposed this bug, and it
+      turns out real-world applications like Pidgin do care. Bugfix on
+      0.2.3.2-alpha; fixes bug 8879.
+    - We used to always request authority certificates by identity digest,
+      meaning we'd get the newest one even when we wanted one with a
+      different signing key. Then we would complain about being given
+      a certificate we already had, and never get the one we really
+      wanted. Now we use the "fp-sk/" resource as well as the "fp/"
+      resource to request the one we want. Fixes bug 5595; bugfix on
+      0.2.0.8-alpha.
+    - Fix a directory authority crash bug when building a consensus
+      using an older consensus as its basis. Fixes bug 8833. Bugfix
+      on 0.2.4.12-alpha.
+
+  o Minor bugfixes:
+    - Fix an impossible buffer overrun in the AES unit tests. Fixes
+      bug 8845; bugfix on 0.2.0.7-alpha. Found by eugenis.
+    - Fix a memory leak that would occur whenever a configuration
+      option changed. Fixes bug 8718; bugfix on 0.2.3.3-alpha.
+    - Paste the description for PathBias parameters from the man
+      page into or.h, so the code documents them too. Fixes bug 7982;
+      bugfix on 0.2.3.17-beta and 0.2.4.8-alpha.
+    - Relays now treat a changed IPv6 ORPort as sufficient reason to
+      publish an updated descriptor. Fixes bug 6026; bugfix on
+      0.2.4.1-alpha.
+
+  o Minor bugfixes (log messages):
+    - Fix a scaling issue in the path bias accounting code that
+      resulted in "Bug:" log messages from either
+      pathbias_scale_close_rates() or pathbias_count_build_success().
+      This represents a bugfix on a previous bugfix: the original fix
+      attempted in 0.2.4.10-alpha was incomplete. Fixes bug 8235; bugfix
+      on 0.2.4.1-alpha.
+    - Give a less useless error message when the user asks for an IPv4
+      address on an IPv6-only port, or vice versa. Fixes bug 8846; bugfix
+      on 0.2.4.7-alpha.
+
+  o Minor features:
+    - Downgrade "unexpected SENDME" warnings to protocol-warn for 0.2.4.x,
+      to tolerate bug 8093 for now.
+    - Add an "ignoring-advertised-bws" boolean to the flag-threshold lines
+      in directory authority votes to describe whether they have enough
+      measured bandwidths to ignore advertised (relay descriptor)
+      bandwidth claims. Resolves ticket 8711.
+    - Update to the June 5 2013 Maxmind GeoLite Country database.
+
+  o Code simplification and refactoring:
+    - Avoid using character buffers when constructing most directory
+      objects: this approach was unwieldy and error-prone. Instead,
+      build smartlists of strings, and concatenate them when done.
+
+
 Changes in version 0.2.4.12-alpha - 2013-04-18
   Tor 0.2.4.12-alpha moves Tor forward on several fronts: it starts the
   process for lengthening the guard rotation period, makes directory
diff --git a/changes/bug5595 b/changes/bug5595
deleted file mode 100644
index 31f4b84b03..0000000000
--- a/changes/bug5595
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Critical bugfixes:
-    - Distinguish downloading an authority certificate by identity digest from
-      downloading one by identity digest/signing key digest pair; formerly we
-      always request them only by identity digest and get the newest one even
-      when we wanted one with a different signing key.  Then we would complain
-      about being given a certificate we already had, and never get the one we
-      really wanted.  Now we use the "fp-sk/" resource as well as the "fp/"
-      resource to request the one we want.  Fixes bug 5595.
diff --git a/changes/bug6026 b/changes/bug6026
deleted file mode 100644
index de5d6ead01..0000000000
--- a/changes/bug6026
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Relays now treat a changed IPv6 ORPort as sufficient reason to
-      publish an updated descriptor. Fix for bug 6026; bugfix for
-      0.2.4.1-alpha.
diff --git a/changes/bug7982 b/changes/bug7982
deleted file mode 100644
index 46aa53249c..0000000000
--- a/changes/bug7982
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-     - Copy-paste description for PathBias params from man page into or.h
-       comment.  Fixes bug 7982.
diff --git a/changes/bug8093.part1 b/changes/bug8093.part1
deleted file mode 100644
index 2450794dd7..0000000000
--- a/changes/bug8093.part1
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Downgrade "unexpected SENDME" warnings to protocol-warn for 0.2.4,
-      for bug 8093.
diff --git a/changes/bug8253-fix b/changes/bug8253-fix
deleted file mode 100644
index 3d36d06c88..0000000000
--- a/changes/bug8253-fix
+++ /dev/null
@@ -1,6 +0,0 @@
- o Minor bugfixes (log messages)
-   - Fix a scaling issue in the path bias accounting code that resulted in
-     "Bug:" log messages from either pathbias_scale_close_rates() or
-     pathbias_count_build_success(). This represents a bugfix on a previous
-     bugfix: The original fix attempted in 0.2.4.10-alpha was incomplete.
-     Fixes bug 8235; bugfix on 0.2.4.1-alpha.
diff --git a/changes/bug8711 b/changes/bug8711
deleted file mode 100644
index 28a1daa454..0000000000
--- a/changes/bug8711
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor features (authority):
-    - Add a "ignoring-advertised-bws" boolean to our flag-thresholds
-      lines to describe whether we have enough measured bandwidths to
-      ignore advertised bandwidth claims. Closes ticket 8711.
-      
-    
diff --git a/changes/bug8716 b/changes/bug8716
deleted file mode 100644
index 74c74f82a6..0000000000
--- a/changes/bug8716
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (memory leak):
-    - Fix a memory leak that would occur whenever a configuration
-      option changed. Fixes bug #8718; bugfix on 0.2.3.3-alpha.
diff --git a/changes/bug8719 b/changes/bug8719
deleted file mode 100644
index c05b79ddec..0000000000
--- a/changes/bug8719
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes (memory leak):
-    - Avoid a memory leak where we would leak a consensus body when we find
-      that a consensus which we couldn't previously verify due to missing
-      certificates is now verifiable. Fixes bug 8719; bugfix on
-      0.2.0.10-alpha.
-
diff --git a/changes/bug8833 b/changes/bug8833
deleted file mode 100644
index 681a86191f..0000000000
--- a/changes/bug8833
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Major bugfixes (directory authority):
-    - Fix a crash bug when building a consensus using an older consensus as
-      its basis. Fixes bug 8833. Bugfix on 0.2.4.12-alpha.
diff --git a/changes/bug8844 b/changes/bug8844
deleted file mode 100644
index 320e5f2845..0000000000
--- a/changes/bug8844
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes:
-    - Prevent the get_freelists() function from running off the end of
-      the list of freelists if it somehow gets an unrecognized
-      allocation. Fixes bug 8844; bugfix on 0.2.0.16-alpha. Reported by
-      eugenis.
-
diff --git a/changes/bug8845 b/changes/bug8845
deleted file mode 100644
index ace043ab9b..0000000000
--- a/changes/bug8845
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (test):
-    - Fix an impossible buffer overrun in the AES unit tests. Fixes bug 8845;
-      bugfix on 0.2.0.7-alpha. Found by eugenis.
diff --git a/changes/bug8846 b/changes/bug8846
deleted file mode 100644
index 377cc3708a..0000000000
--- a/changes/bug8846
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Give a less useless error message when the user asks for an IPv4
-      address on an IPv6-only port, or vice versa.  Fixes bug 8846; bugfix
-      on 0.2.4.7-alpha.
diff --git a/changes/bug8879 b/changes/bug8879
deleted file mode 100644
index 0d2a70086c..0000000000
--- a/changes/bug8879
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Follow the socks5 protocol when offering username/password
-      authentication. The fix for bug 8117 exposed this bug, and it
-      turns out real-world applications like Pidgin do care. Bugfix on
-      0.2.3.2-alpha; fixes bug 8879.
diff --git a/changes/geoip-june2013 b/changes/geoip-june2013
deleted file mode 100644
index f8e00a62c6..0000000000
--- a/changes/geoip-june2013
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the June 5 2013 Maxmind GeoLite Country database.
-
diff --git a/changes/geoip-may2013 b/changes/geoip-may2013
deleted file mode 100644
index ff4b98f22b..0000000000
--- a/changes/geoip-may2013
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the May 9 2013 Maxmind GeoLite Country database.
-
diff --git a/changes/less_charbuf_usage b/changes/less_charbuf_usage
deleted file mode 100644
index 2ec42b544a..0000000000
--- a/changes/less_charbuf_usage
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Code simplification and refactoring:
-    - Avoid using character buffers when constructing most directory
-      objects: this approach was unweildy and error-prone.  Instead,
-      build smartlists of strings, and concatenate them when done.
-