Merge remote-tracking branch 'mikeperry/bug6475' into maint-0.2.3
commit3621f30ad44973acef1ae0dc2e723fd8c9f1dc0d
authorNick Mathewson <nickm@torproject.org>
Fri, 17 Aug 2012 16:08:42 +0000 (17 12:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 17 Aug 2012 16:08:42 +0000 (17 12:08 -0400)
treebc1203681b68064c851fdebc3ad0ee2106f87192
parentf25e8d034b78be01c9fbe659d4686fc370083572
parent4e42a8a2f20e501f9236452b41939964e6d942cf
Merge remote-tracking branch 'mikeperry/bug6475' into maint-0.2.3