merge in more changes entries

8 files changed, 6 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index a17497996f..9aef0e5c5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,10 @@ Changes in version 0.2.1.31 - 2011-05-??
       like Vidalia, in which case the controller would never get a
       REACHABILITY_SUCCEEDED status event. Bugfix on 0.1.2.6-alpha;
       fixes bug 1172.
+    - Build correctly on OSX with zlib 1.2.4 and higher with all warnings
+      enabled. Fixes bug 1526.
+    - Remove undocumented option "-F" from tor-resolve: it hasn't done
+      anything since 0.2.1.16-rc.
     - Avoid signed/unsigned comparisons by making SIZE_T_CEILING unsigned.
       None of the cases where we did this before were wrong, but by making
       this change we avoid warnings. Fixes bug 2475; bugfix on 0.2.1.28.
@@ -59,6 +63,8 @@ Changes in version 0.2.1.31 - 2011-05-??
       example due to a permissions change, between when we start up
       and when a controller calls SAVECONF. Fixes bug 3135; bugfix
       on 0.0.9pre6.
+    - Fix warnings from GCC 4.6's "-Wunused-but-set-variable" option.
+      Fixes bug 3208.
     - Always NUL-terminate the sun_path field of a sockaddr_un before
       passing it to the kernel. (Not a security issue: kernels are
       smart enough to reject bad sockaddr_uns.) Found by Coverity;
diff --git a/changes/bug1526 b/changes/bug1526
deleted file mode 100644
index bae7104451..0000000000
--- a/changes/bug1526
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Build correctly on OSX with zlib 1.2.4 and higher with all warnings
-      enabled.
\ No newline at end of file
diff --git a/changes/bug2235 b/changes/bug2235
deleted file mode 100644
index 0c3bafa44f..0000000000
--- a/changes/bug2235
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes
-    - Avoid crashes when AccountingMax is set on clients.  Fixes bug 2235;
-      Bugfix on 0.2.2.18-alpha.  Diagnosed by boboper.
diff --git a/changes/bug2433 b/changes/bug2433
deleted file mode 100644
index 8e47c4f024..0000000000
--- a/changes/bug2433
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Don't assert when changing from bridge to relay or vice versa with a controller.
-      The assert happened because we didn't properly initialize our keys in this case.
-      Bugfix on 0.2.2.18, fixes bug 2433. Issue first discovered by bastik.
-
diff --git a/changes/bug2572 b/changes/bug2572
deleted file mode 100644
index a5cca284a1..0000000000
--- a/changes/bug2572
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Don't crash a bridge authority on SIGHUP if it can't force itself
-      into its routerlist.  Fixes bug 2572.
-
-
diff --git a/changes/bug3208 b/changes/bug3208
deleted file mode 100644
index 731c96e20a..0000000000
--- a/changes/bug3208
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Removed options:
-    - Remove undocumented option "-F" from tor-resolve: it hasn't done
-      anything since 0.2.1.16-rc.
-
diff --git a/changes/bug3208b b/changes/bug3208b
deleted file mode 100644
index 5e0489b223..0000000000
--- a/changes/bug3208b
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Fix warnings from GCC 4.6's "-Wunused-but-set-variable" option.
-      Fixes bug 3208.
-
diff --git a/changes/bug3228 b/changes/bug3228
deleted file mode 100644
index 4aca810d3c..0000000000
--- a/changes/bug3228
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Major bugfixes:
-    - Resolve a crash that occured when setting BridgeRelay to 1 with
-      accounting enabled. Fixes bug 3228; bugfix on 0.2.2.18-alpha.