Commit 5595a79ff1452d85e49e3ef7c8bb2200fb8437da

Nick Mathewson 2012-04-17T17:54:26

Merge branch '21_choose_monotonic'