Merge remote-tracking branch 'public/bug6227' into maint-0.2.3
commit6330d2d9e6dc8cdeceea9486ad96e57487d6d232
authorNick Mathewson <nickm@torproject.org>
Tue, 26 Jun 2012 15:03:56 +0000 (26 11:03 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 26 Jun 2012 15:03:56 +0000 (26 11:03 -0400)
tree7f0e2e71b48b3f2770c321dba31040edfbd9a215
parent5fad3dc36b3aad7f2ea13e56d838c3eb37fb029d
parent4645f28c3b125f9d281eb457d110c431a6a0b166
Merge remote-tracking branch 'public/bug6227' into maint-0.2.3
src/test/test_util.c