From: Nick Mathewson Date: Thu, 20 Mar 2014 00:28:10 +0000 (-0400) Subject: Merge remaining changes/* items into ChangeLog X-Git-Tag: tor-0.2.5.3-alpha~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=452aa186800cbdeea13c9c5e40b78984db0616a1;p=thirdparty%2Ftor.git Merge remaining changes/* items into ChangeLog (Not taking bug11235 since it's a whitespace fix) --- diff --git a/ChangeLog b/ChangeLog index d5d65f08ff..f8ffc9ab36 100644 --- 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 index 87a14a4088..0000000000 --- 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 index 9872a5959b..0000000000 --- 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.