From: Roger Dingledine <arma@torproject.org>
Date: Sat, 21 May 2011 22:27:02 +0000 (-0400)
Subject: fold in the latest changes file.
X-Git-Tag: tor-0.2.2.28-beta~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2bdf8102cd6ebde3c93f23a89336b9c1845651d6;p=thirdparty%2Ftor.git

fold in the latest changes file.

schedule another release for this coming week
---

diff --git a/ChangeLog b/ChangeLog
index 79148e1622..92478b30d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Changes in version 0.2.2.28-beta - 2011-05-2?
+  o Major bugfixes:
+    - Don't decide to make a new descriptor when receiving a HUP signal.
+      This bug has caused a lot of 0.2.2.x relays to disappear from the
+      consensus periodically. Fixes the most common case of triggering
+      bug 1810; bugfix on 0.2.2.7-alpha.
+
+  o Minor features:
+    - Relays now log the reason for publishing a new relay descriptor,
+      so we have a better chance of hunting down the root cause of bug
+      1810. Resolves ticket 3252.
+
+
 Changes in version 0.2.2.27-beta - 2011-05-18
   Tor 0.2.2.27-beta fixes a bridge-related stability bug in the previous
   release, and also adds a few more general bugfixes.
diff --git a/changes/bug1810 b/changes/bug1810
deleted file mode 100644
index 11e561f7cf..0000000000
--- a/changes/bug1810
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes:
-    - Don't decide to make a new descriptor when receiving a HUP signal.
-      This bug has caused a lot of relays to disappear from the consensus
-      periodically. Fixes the most common case of triggering bug 1810;
-      bugfix on 0.2.2.7-alpha.
-
diff --git a/changes/bug3252 b/changes/bug3252
deleted file mode 100644
index f85f633fbd..0000000000
--- a/changes/bug3252
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-    - Relays now log the reason for publishing a new relay descriptor,
-      so we have a better chance of hunting down the root cause of bug
-      1810. Resolves ticket 3252.