Merge remote branch 'rransom/bug2572' into maint-0.2.2
commit19e5b4c2f269c8842646213c8d78562553a7bfc8
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Feb 2011 06:02:35 +0000 (22 01:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Feb 2011 06:02:35 +0000 (22 01:02 -0500)
tree0f74a11d758b5cd5a2b62057972865732ec26cb3
parentd673479ebaa29b2dc8f227c342785112c945ec18
parent444a955e4a3877e9a7b3016deee9f1f4dfafdd93
Merge remote branch 'rransom/bug2572' into maint-0.2.2