Merge branch 'bug2332_part2' into maint-0.2.1
commitc2aa2db8b5f523c62712d3c4944b1a4c4c514b1c
authorNick Mathewson <nickm@torproject.org>
Sat, 15 Jan 2011 17:43:02 +0000 (15 12:43 -0500)
committerNick Mathewson <nickm@torproject.org>
Sat, 15 Jan 2011 17:43:02 +0000 (15 12:43 -0500)
treecc8219e8489d185e18510af9b38f296414908458
parent8f11642ceb357c7ff057335f14c37c3f7b33644f
parentbd67b23fec5f9312769b9abf26787f074db05217
Merge branch 'bug2332_part2' into maint-0.2.1