aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-09-20 23:53:03 -0400
committerRoger Dingledine <arma@torproject.org>2009-09-20 23:53:03 -0400
commitfa63d47f8330fe079e2948772d2ad3e4f50f5070 (patch)
treea9e9526612ab04027a419fee416bd180664590bb /ChangeLog
parented62b031d3f34bb954fa97470e4602bb5bcad2fe (diff)
parent95008db08d1bb5d7b608654fc1a115a42cd15252 (diff)
downloadtor-fa63d47f8330fe079e2948772d2ad3e4f50f5070.tar.gz
tor-fa63d47f8330fe079e2948772d2ad3e4f50f5070.zip
Merge branch 'maint-0.2.1'
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 0 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b405f849d..c6bfd4c5f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -216,8 +216,6 @@ Changes in version 0.2.1.20 - 2009-??-??
excluded in ExcludeExitNodes, but the circuit is not used to access
the outside world. This should help fix bug 1090. Bugfix on
0.2.1.6-alpha.
- - Teach connection_ap_can_use_exit to respect the Exclude*Nodes config
- options. Should fix bug 1090. Bugfix on 0.0.2-pre16.
- Avoid segfault in rare cases when finishing an introduction circuit
as a client and finding out that we don't have an introduction key
for it. Fixes bug 1073. Reported by Aaron Swartz.