Merge branch 'fix2204' into maint-0.2.1
commita9d2148f53aed97d060498e13ca1597a28bc47c7
authorNick Mathewson <nickm@torproject.org>
Sun, 21 Nov 2010 19:28:38 +0000 (21 14:28 -0500)
committerNick Mathewson <nickm@torproject.org>
Sun, 21 Nov 2010 19:28:38 +0000 (21 14:28 -0500)
tree8e7d103ece7e5994268913b26f5e5dbf362e13fe
parent566a115be1acbd0838c81edd251cf7ae47b94fe3
parent92a99736fd22564515604aa140b8898befd9858e
Merge branch 'fix2204' into maint-0.2.1