Merge remote branch 'public/bug2363' into maint-0.2.2
commit43e12a79885871cdf18bfe6cc835b2414d21e29d
authorNick Mathewson <nickm@torproject.org>
Wed, 12 Jan 2011 19:00:20 +0000 (12 14:00 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 12 Jan 2011 19:00:20 +0000 (12 14:00 -0500)
tree8b47403d5a3df0860339649c015f9d42576137ed
parenta2c41aa3e84ba697cc14b4b2345d8e3467cd22ac
parentefc9a84108903edf1d68b9f0c511538f15fc7f52
Merge remote branch 'public/bug2363' into maint-0.2.2