summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-09-16 23:37:27 -0400
committerNick Mathewson <nickm@torproject.org>2009-09-16 23:37:27 -0400
commitcb78602379c336f40cf4e880d45ba4e766fb8c31 (patch)
treedc8f55886af9083cf534f9894bdc2fded5e0d60e
parent4850a3a75f4fa7da10d0c2bce23f0a517c6a29cb (diff)
parentb3991ea7d15c18dc33d4761f61f2e90ad49ab4b8 (diff)
downloadtor-cb78602379c336f40cf4e880d45ba4e766fb8c31.tar.gz
tor-cb78602379c336f40cf4e880d45ba4e766fb8c31.zip
Merge commit 'origin/maint-0.2.1'
[Do not take conflicting change to rendclient.c]
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d61085752..2510257424 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -167,6 +167,9 @@ Changes in version 0.2.1.20 - 2009-??-??
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.
o Minor features:
- Add a "getinfo status/accepted-server-descriptor" controller