4 files changed, 28 insertions, 0 deletions

diff --git a/changes/annotations_fix b/changes/annotations_fix
new file mode 100644
index 000000000..b259a306d
--- /dev/null
+++ b/changes/annotations_fix
@@ -0,0 +1,10 @@
+  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
new file mode 100644
index 000000000..1331246a1
--- /dev/null
+++ b/changes/bug1125
@@ -0,0 +1,8 @@
+  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/bug2050 b/changes/bug2050
new file mode 100644
index 000000000..3e45d3463
--- /dev/null
+++ b/changes/bug2050
@@ -0,0 +1,5 @@
+  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/remove_osx_expert b/changes/remove_osx_expert
new file mode 100644
index 000000000..c9a0698c4
--- /dev/null
+++ b/changes/remove_osx_expert
@@ -0,0 +1,5 @@
+  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.
+