diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-19 20:28:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-19 20:28:10 -0400 |
| commit | 452aa186800cbdeea13c9c5e40b78984db0616a1 (patch) | |
| tree | 7bc2237ef486d8c9ea86c2438e159c11dd3c9966 | |
| parent | 8a647291c837846dca73c2017d3101621fd25a8d (diff) | |
| download | tor-452aa186800cbdeea13c9c5e40b78984db0616a1.tar.gz tor-452aa186800cbdeea13c9c5e40b78984db0616a1.zip | |
Merge remaining changes/* items into ChangeLog
(Not taking bug11235 since it's a whitespace fix)
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | changes/bug11235 | 3 | ||||
| -rw-r--r-- | changes/bug9059 | 3 |
3 files changed, 3 insertions, 6 deletions
@@ -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. |