Merge remote branch 'sebastian/bug2337' into maint-0.2.2
commita2c41aa3e84ba697cc14b4b2345d8e3467cd22ac
authorNick Mathewson <nickm@torproject.org>
Wed, 12 Jan 2011 17:55:09 +0000 (12 12:55 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 12 Jan 2011 17:55:09 +0000 (12 12:55 -0500)
tree949398ccc66de758a7eaaf71a12e0f497a240ece
parent1e37d8678a7f0a066886a74b0b57bce121d370b1
parent2dd7df8308ec962700b1a4311cd675f668631c90
Merge remote branch 'sebastian/bug2337' into maint-0.2.2
configure.in