Merge remaining changes/* items into ChangeLog

(Not taking bug11235 since it's a whitespace fix)

diff --git a/ChangeLog b/ChangeLog
index d5d65f08ff0fbd2e954b10396344f390805b7e12..f8ffc9ab368bb4ea969221c4b4c046170cd546f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -131,6 +131,9 @@ Changes in version 0.2.5.3-alpha - 2014-03-??
     - Document in the manpage that "KBytes" may also be written as
       "kilobytes" or "KB", that "Kbits" may also be written as
       "kilobits", and so forth. Closes ticket 9222.
+    - Document that the ClientOnly config option overrides ORPort.
+      Our old explanation made ClientOnly sound as though it did
+      nothing at all. Resolves bug 9059.
     - Explain that SocksPolicy, DirPolicy, and similar options don't
       take port arguments. Fixes the other part of ticket 11108.
     - Fix a comment about the rend_server_descriptor_t.protocols field

diff --git a/changes/bug11235 b/changes/bug11235
deleted file mode 100644 (file)
index 87a14a4..0000000
--- a/changes/bug11235
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Code style:
-    - Remove superfluous newline in src/or/config.c that make check-spaces
-      was complaining about.  Resolves bug 11235.

diff --git a/changes/bug9059 b/changes/bug9059
deleted file mode 100644 (file)
index 9872a59..0000000
--- a/changes/bug9059
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Documentation:
-    - Provide a more accurate description of the ClientOnly config
-      option on the man page. Resolves bug 9059.