summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-06-07 00:03:27 -0400
committerNick Mathewson <nickm@torproject.org>2009-06-07 00:03:27 -0400
commit8a02f61ad622976cd9a13233e672f6def700047b (patch)
tree69d4caa731a7723d95c704505a0240579b662005
parent20193fc7ab16f735f35a16368bfd83e2e565456e (diff)
downloadtor-8a02f61ad622976cd9a13233e672f6def700047b.tar.gz
tor-8a02f61ad622976cd9a13233e672f6def700047b.zip
Move and fix a changelog entry. Noticed by optimist.
-rw-r--r--ChangeLog6
1 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 29d1c0e443..842f0c0a65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@ Changes in version 0.2.1.16-?? - 2009-??-??
- Fix a race condition that could cause crashes or memory
corruption when running as a server with a controller listening
for log messages.
+ - Avoid crashing when we have a policy specified in a DirPolicy or
+ SocksPolicy or ReachableAddresses option with ports set on it, and we
+ re-load the policy. May fix bug 996.
o Minor bugfixes (on 0.2.1.x):
- When switching back and forth between bridge mode, do not start
@@ -88,9 +91,6 @@ Changes in version 0.2.1.14-rc - 2009-04-12
patch by Sebastian.
- Avoid crashing in the presence of certain malformed descriptors.
Found by lark, and by automated fuzzing.
- - Avoid crashing when we have "private" in a policy specified in
- a DirPolicy or SocksPolicy or ReachableAddresses option and we
- re-load the policy. May fix bug 996.
o Minor features:
- When generating circuit events with verbose nicknames for