prepare for 0.2.2.12-alpha

diff --git a/ChangeLog b/ChangeLog
index 18028c8151c6e4489bba63cc0bab60a3b97da575..594f31c416e65e939171a35e02b5df2755507749 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,19 @@
-Changes in version 0.2.2.12-alpha - 2010-04-??
+Changes in version 0.2.2.12-alpha - 2010-04-20
+  o Major bugfixes:
+    - Many relays have been falling out of the consensus lately because
+      not enough authorities know about their descriptor for them to get
+      a majority of votes. When we deprecated the v2 directory protocol,
+      we got rid of the only way that v3 authorities can hear from each
+      other about other descriptors. Now authorities examine every v3
+      vote for new descriptors, and fetch them from that authority. Bugfix
+      on 0.2.1.23.
+    - Fix two typos in tor_vasprintf() that broke the compile on Windows,
+      and a warning in or.h related to bandwidth_weight_rule_t that
+      prevented clean compile on OS X. Fixes bug 1363; bugfix on
+      0.2.2.11-alpha.
+    - Fix a segfault on relays when DirReqStatistics is enabled
+      and 24 hours pass. Bug found by keb. Fixes bug 1365; bugfix on
+      0.2.2.11-alpha.
 
 
 Changes in version 0.2.2.11-alpha - 2010-04-15

diff --git a/changes/auths_fetch_from_votes b/changes/auths_fetch_from_votes
deleted file mode 100644 (file)
index 5c451a5..0000000
--- a/changes/auths_fetch_from_votes
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Major bugfixes:
-    - When we deprecated the v2 directory protocol, we accidentally
-      got rid of the only way that v3 authorities can hear from each
-      other about other descriptors. So many relays have been falling
-      out of the consensus lately because not enough authorities know
-      about their descriptor for them to get a majority of votes. Now
-      authorities examine every v3 vote for new descriptors, and fetch
-      them from that authority. Bugfix on 0.2.1.23.
-

diff --git a/changes/fix_bug_1365 b/changes/fix_bug_1365
deleted file mode 100644 (file)
index 7302731..0000000
--- a/changes/fix_bug_1365
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes:
-   - Fix a segfault when DirReqStatistics is enabled.  Bug found by keb.
-     Fixes bug 1365; bugfix on 0.2.2.11-alpha.
-

diff --git a/changes/fix_vscprintf_compile b/changes/fix_vscprintf_compile
deleted file mode 100644 (file)
index 47c486b..0000000
--- a/changes/fix_vscprintf_compile
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Major bugfixes:
-    - Fix two typos in tor_vasprintf() that prevented compilation in
-      Windows.
\ No newline at end of file

diff --git a/changes/move_bwrts_declaration b/changes/move_bwrts_declaration
deleted file mode 100644 (file)
index 8ba2bb3..0000000
--- a/changes/move_bwrts_declaration
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Minor bugfixes:
-    - Fix a compilation warning in or.h related to bandwidth_weight_rule_t