Merge branch 'bug2409' into maint-0.2.2
commitba3b03def05796619620346e02b127ad9436333e
authorNick Mathewson <nickm@torproject.org>
Wed, 26 Jan 2011 16:06:59 +0000 (26 11:06 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 26 Jan 2011 16:06:59 +0000 (26 11:06 -0500)
treeb6d7535e741e46553ecc097e66e723583cee8fc8
parent1478aa99b7f113ccb800dc9a94e3501968aa59c6
parent71862ed76325a97025339ea9348e2f527a4eb940
Merge branch 'bug2409' into maint-0.2.2