Merge branch 'bug2331' into maint-0.2.2
commit1e37d8678a7f0a066886a74b0b57bce121d370b1
authorNick Mathewson <nickm@torproject.org>
Wed, 12 Jan 2011 17:42:40 +0000 (12 12:42 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 12 Jan 2011 17:42:40 +0000 (12 12:42 -0500)
tree5e117fc741bc6e4b8e1bbe51e4a3e71435d78a10
parent597433bcec3cc8270dec810fe82d8accc85931ef
parentf4756051feb2ee57fbe3b5e285b012a922fef6c3
Merge branch 'bug2331' into maint-0.2.2