Merge commit 'origin/maint-0.2.1'

[Do not take conflicting change to rendclient.c]
This commit is contained in:
Nick Mathewson 2009-09-16 23:37:27 -04:00
commit cb78602379

View File

@ -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