Commit 0af23d591162b11c95d48d58af951d70e72ba2f7

Nick Mathewson 2012-04-09T11:33:08

Merge branch '21_weakrand'