commit 174598f3ef95423bcc9d1614638a4cc9e7dd9f52 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 30 15:11:19 2015 -0400

Make lintChanges happy --- changes/bug-15771-reachability | 2 +- changes/bug14391 | 1 - changes/bug14806 | 4 ++-- changes/bug15269 | 2 +- changes/bug15515 | 2 +- changes/bug15850 | 2 +- changes/deprecated-libevents | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/changes/bug-15771-reachability b/changes/bug-15771-reachability index aff6268..0ca914f 100644 --- a/changes/bug-15771-reachability +++ b/changes/bug-15771-reachability @@ -4,5 +4,5 @@ The previous fix used TestingTorNetwork, which implies ExtendAllowPrivateAddresses, but this excluded rare configs where ExtendAllowPrivateAddresses is set but TestingTorNetwork is not. - Fixes bug 15771; bugfix on 0.2.6.1-alpha, bug #13924. + Fixes bug 15771; bugfix on 0.2.6.1-alpha. Patch by "teor", issue discovered by CJ Ess. diff --git a/changes/bug14391 b/changes/bug14391 index 5907372..2edd274 100644 --- a/changes/bug14391 +++ b/changes/bug14391 @@ -1,4 +1,3 @@ - o Code simplification and refactoring: - Refactor hidden service client-side cache lookup to intelligently report its various failure cases, and disentangle failure cases diff --git a/changes/bug14806 b/changes/bug14806 index dd85e78..6a72145 100644 --- a/changes/bug14806 +++ b/changes/bug14806 @@ -1,3 +1,3 @@ - o Minor bugfixes (testing): - - Commandline argument tests moved to Stem. Fixes bug 14806. + o Minor features (testing): + - Commandline argument tests moved to Stem. Resolves ticket 14806.

diff --git a/changes/bug15269 b/changes/bug15269 index e6b2b24..c511c6c 100644 --- a/changes/bug15269 +++ b/changes/bug15269 @@ -1,7 +1,7 @@ o Minor bugfixes (logs): - When building Tor under Clang, do not include an extra set of parentheses in log messages that include function names. - Fixes bug 15053; bugfix on every released version of Tor when + Fixes bug 15269; bugfix on every released version of Tor when compiled with recent enough Clang.

diff --git a/changes/bug15515 b/changes/bug15515 index dda7c2f..93172d5 100644 --- a/changes/bug15515 +++ b/changes/bug15515 @@ -1,4 +1,4 @@ o Minor features (DoS-resistance): - Make it harder for attackers to overwhelm hidden services with introductions, by blocking multiple introduction requests on the - same circuit. Resolves ticket #15515. + same circuit. Resolves ticket 15515. diff --git a/changes/bug15850 b/changes/bug15850 index 48a7c7b..0d0a6e4 100644 --- a/changes/bug15850 +++ b/changes/bug15850 @@ -1,4 +1,4 @@ o Major bugfix - Revert commit that made directory authority assign the HSDir flag to relay without a DirPort which is bad because relay can't handle - BEGIN_DIR cells. Fixes #15850. Bugfix on tor-0.2.6.3-alpha; + BEGIN_DIR cells. Fixes bug 15850; bugfix on tor-0.2.6.3-alpha. diff --git a/changes/deprecated-libevents b/changes/deprecated-libevents index 4ea0175..2eb6195 100644 --- a/changes/deprecated-libevents +++ b/changes/deprecated-libevents @@ -1,3 +1,3 @@ o New system requirements: - Tor no longer includes workarounds for Libevent versions before 1.3e. - Libevent 2.0 or later is recommended. Closes ticket #15248. + Libevent 2.0 or later is recommended. Closes ticket 15248.