summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2015-02-19 06:41:21 -0500
committerRoger Dingledine <arma@torproject.org>2015-02-19 06:41:21 -0500
commit7272ad2e177040a3abd935dc861504e400b373ec (patch)
tree993dbb108c1a1d5b14a5975d4f40937d15a66779
parent64d5e0e4171f9c45376cce26c4db349c1a114096 (diff)
downloadtor-7272ad2e177040a3abd935dc861504e400b373ec.tar.gz
tor-7272ad2e177040a3abd935dc861504e400b373ec.zip
clean up nickm's changelog entry for #14918
now that I made it log "never" rare than "less often".
-rw-r--r--ChangeLog12
1 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c30b6eee4..34533715ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -285,15 +285,15 @@ Changes in version 0.2.6.3-alpha - 2015-02-2?
13661; bugfix on 0.0.8pre1.
o Minor bugfixes (path counting):
- - When deciding whether we have any exit nodes, count the number
- listed in the consensus, not the number we have descriptors for.
- Fixes part of bug 14918; bugfix on 0.2.6.2-alpha.
- - Do not warn that we are missing directory information if we have
- decided not to fetch directory information due to a long period of
- idleness. Fixes part of bug 14918; bugfix on 0.2.6.2-alpha.
+ - When deciding whether the consensus lists any exit nodes, count
+ the number listed in the consensus, not the number we have
+ descriptors for. Fixes part of bug 14918; bugfix on 0.2.6.2-alpha.
- When deciding whether we have any exit nodes, only process
ExitNodes when the ExitNodes option is actually set. Fixes part of
bug 14918; bugfix on 0.2.6.2-alpha.
+ - Get rid of redundant and possibly scary warnings that we are
+ missing directory information while we bootstrap. Fixes part of
+ bug 14918; bugfix on 0.2.6.2-alpha.
o Minor bugfixes (portability):
- Fix the ioctl()-based network interface lookup code so that it