Browse Source

Merge remaining changes/* items into ChangeLog

(Not taking bug11235 since it's a whitespace fix)
Nick Mathewson 10 years ago
parent
commit
452aa18680
3 changed files with 3 additions and 6 deletions
  1. 3 0
      ChangeLog
  2. 0 3
      changes/bug11235
  3. 0 3
      changes/bug9059

+ 3 - 0
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
     - Document in the manpage that "KBytes" may also be written as
       "kilobytes" or "KB", that "Kbits" may also be written as
       "kilobytes" or "KB", that "Kbits" may also be written as
       "kilobits", and so forth. Closes ticket 9222.
       "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
     - Explain that SocksPolicy, DirPolicy, and similar options don't
       take port arguments. Fixes the other part of ticket 11108.
       take port arguments. Fixes the other part of ticket 11108.
     - Fix a comment about the rend_server_descriptor_t.protocols field
     - Fix a comment about the rend_server_descriptor_t.protocols field

+ 0 - 3
changes/bug11235

@@ -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.

+ 0 - 3
changes/bug9059

@@ -1,3 +0,0 @@
-  o Documentation:
-    - Provide a more accurate description of the ClientOnly config
-      option on the man page. Resolves bug 9059.