Merge remote branch 'public/bug2190_021' into maint-0.2.1
commit69771bb5fc0fc472436c5f3fe6dfd3bd0f4929da
authorNick Mathewson <nickm@torproject.org>
Tue, 21 Dec 2010 20:44:50 +0000 (21 15:44 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 21 Dec 2010 20:44:50 +0000 (21 15:44 -0500)
tree4f359f5fdb23bec103f67b08aff4c659bde8b929
parentef5b3680c6c4f630b670681f73967f4535b786e1
parent668f7a2639faf59e5bc4f2615e61e0e768e0b26d
Merge remote branch 'public/bug2190_021' into maint-0.2.1