merge in more changelog entries

11 files changed, 43 insertions, 51 deletions

diff --git a/ChangeLog b/ChangeLog
index 843c732da6..7f5e57adfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,30 @@
-Changes in version 0.2.2.18-rc - 2010-11-1?
+Changes in version 0.2.2.18-alpha - 2010-11-16
   o Major bugfixes:
+    - Do even more to reject (and not just ignore) annotations on
+      router descriptors received anywhere but from the cache. Previously
+      we would ignore such annotations at first, but cache them to disk
+      anyway. Bugfix on 0.2.0.8-alpha. Found by piebeer.
+    - Do not log messages to the controller while shrinking buffer
+      freelists. Doing so would sometimes make the controller connection
+      try to allocate a buffer chunk, which would mess up the internals
+      of the freelist and cause an assertion failure. Fixes bug 1125;
+      fixed by Robert Ransom. Bugfix on 0.2.0.16-alpha.
+    - Learn our external IP address when we're a relay or bridge, even if
+      we set PublishServerDescriptor to 0. Bugfix on 0.2.0.3-alpha,
+      where we introduced bridge relays that don't need to publish to
+      be useful. Fixes bug 2050.
+    - Maintain separate TLS contexts and certificates for incoming and
+      outgoing connections in bridge relays. Previously we would use the
+      same TLS contexts and certs for incoming and outgoing connections.
+      Bugfix on 0.2.0.3-alpha; addresses bug 988.
+    - Maintain separate identity keys for incoming and outgoing TLS
+      contexts in bridge relays. Previously we would use the same
+      identity keys for incoming and outgoing TLS contexts. Bugfix on
+      0.2.0.3-alpha; addresses a bug described in ticket 988.
+    - Avoid an assertion failure when we as an authority receive a
+      duplicate upload of a router descriptor that we already have,
+      but which we previously considered an obsolete descriptor.
+      Fixes another case of bug 1776. Bugfix on 0.2.2.16-alpha.
     - Avoid a crash bug triggered by looking at a dangling pointer while
       setting the network status consensus. Found by Robert Ransom.
       Bugfix on 0.2.2.17-alpha. Fixes bug 2097.
@@ -22,6 +47,8 @@ Changes in version 0.2.2.18-rc - 2010-11-1?
       when logging them. Previously we would attribute them to a failure
       while generating a TLS context. Patch by Robert Ransom. Bugfix on
       0.1.0.4-rc; fixes bug 1994.
+    - Enforce multiplicity rules when parsing annotations. Bugfix on
+      0.2.0.8-alpha. Found by piebeer.
     - Fix warnings that newer versions of autoconf produced during
       ./autogen.sh. These warnings appear to be harmless in our case,
       but they were extremely verbose. Fixes bug 2020.
@@ -36,6 +63,11 @@ Changes in version 0.2.2.18-rc - 2010-11-1?
       on 0.2.2.17-alpha.
 
   o Minor features:
+    - Make hidden services work better in private Tor networks by not
+      requiring any uptime to join the hidden service descriptor
+      DHT. Implements ticket 2088.
+    - Rate-limit the "your application is giving Tor only an IP address"
+      warning. Addresses bug 2000; bugfix on 0.0.8pre2.
     - Update to the November 1 2010 Maxmind GeoLite Country database.
 
   o Code simplifications and refactoring:
@@ -44,6 +76,16 @@ Changes in version 0.2.2.18-rc - 2010-11-1?
       necessary as long as relays using Tor 0.2.1.3-alpha through
       0.2.1.18-alpha were active. Since this isn't the case anymore,
       we unify our behaviour here. Resolves bug 2081.
+    - Some options used different conventions for uppercasing of acronyms
+      when comparing manpage and source. Fix those in favor of the
+      manpage, as it makes sense to capitalize acronyms.
+    - Remove the torrc.complete file. It hasn't been kept up to date
+      and users will have better luck checking out the manpage.
+    - Removed the obsolete "NoPublish" option; it has been flagged
+      as obsolete and has produced a warning since 0.1.1.18-rc.
+    - Remove everything related to building the expert bundle for OS X.
+      It has confused many users, doesn't work right on OS X 10.6,
+      and is hard to get rid of once installed. Resolves bug 1274.
 
 
 Changes in version 0.2.2.17-alpha - 2010-09-30
diff --git a/changes/HTTP b/changes/HTTP
deleted file mode 100644
index 078d9b3bca..0000000000
--- a/changes/HTTP
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Code simplifications and refactoring:
-    - Some options used different conventions for uppercasing of acronyms
-      when comparing manpage and source. Fix those in favor of the
-      manpage, as it makes sense to capitalize acronyms.
diff --git a/changes/annotations_fix b/changes/annotations_fix
deleted file mode 100644
index b259a306d2..0000000000
--- a/changes/annotations_fix
+++ /dev/null
@@ -1,10 +0,0 @@
-  o Major bugfixes
-    - Do even more to reject (and not just ignore) annotations on
-      router descriptors received anywhere but from the cache.
-      Previously we would ignore such annotations at first, but cache
-      them to disk anyway.  Bugfix on 0.2.0.8-alpha. Found by piebeer.
-
-  o Minor bugfixes
-    - Enforce multiplicity rules when parsing annotations.  Bugfix on
-      0.2.0.8-alpha. Found by piebeer.
-
diff --git a/changes/bug1125 b/changes/bug1125
deleted file mode 100644
index 1331246a14..0000000000
--- a/changes/bug1125
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Major bugfixes
-    - Do not log messages to the controller while shrinking buffer
-      freelists.  Doing so would sometimes make the controller
-      connection try to allocate a buffer chunk, which would mess
-      up the internals of the freelist and cause an assertion
-      failure. Fixes bug 1125; fixed by Robert Ransom. Bugfix on
-      Tor 0.2.0.16-alpha.
-
diff --git a/changes/bug1776_redux b/changes/bug1776_redux
deleted file mode 100644
index 0e2e5cd57c..0000000000
--- a/changes/bug1776_redux
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes
-    - Avoid an assertion failure when we as an authority receive a
-      duplicate upload of a router descriptor that we already have,
-      but which we previously considered an obsolete descriptor.
-      Fixes another case of bug 1776.  Bugfix on 0.2.2.16-alpha.
diff --git a/changes/bug2000 b/changes/bug2000
deleted file mode 100644
index 45ff2bdbd0..0000000000
--- a/changes/bug2000
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Rate-limit the "your application is giving Tor only an IP address"
-      warning. Fixes bug 2000; bugfix on 0.0.8pre2.
diff --git a/changes/bug2050 b/changes/bug2050
deleted file mode 100644
index 3e45d3463f..0000000000
--- a/changes/bug2050
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Learn our external IP address when we're a relay or bridge, even if
-      we set PublishServerDescriptor to 0. Bugfix on 0.2.0.3-alpha,
-      where we introduced bridge relays that don't need to publish to
-      be useful. Fixes bug 2050.
diff --git a/changes/minuptimehs b/changes/minuptimehs
deleted file mode 100644
index d7474d21f5..0000000000
--- a/changes/minuptimehs
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Make hidden services work better in private networks by not requiring
-      any uptime to join the dht. Implements ticket 2088.
diff --git a/changes/nonopublish b/changes/nonopublish
deleted file mode 100644
index 6285611e59..0000000000
--- a/changes/nonopublish
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Removed features
-    - Removed the obsolete "NoPublished" option; it has been flagged
-      as obsolete and has produced a warning since 0.1.1.18-rc.
diff --git a/changes/remove_osx_expert b/changes/remove_osx_expert
deleted file mode 100644
index c9a0698c45..0000000000
--- a/changes/remove_osx_expert
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Removed features:
-    - Remove everything related to building the expert bundle for OS X. It
-      has confused many users, doesn't work right on OS X 10.6, and is hard
-      to get rid of once installed. Resolves bug 1274.
-
diff --git a/changes/torrc.complete b/changes/torrc.complete
deleted file mode 100644
index 03d51c1213..0000000000
--- a/changes/torrc.complete
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Code simplifications and refactorings:
-    - Remove the torrc.complete file. It hasn't been kept up to date
-      and users will have better luck checking out the manpage.
-