Commit 59f21fd8fc32f957c881aa7dbfa92ae0fa0b526a

Nick Mathewson 2012-06-28T16:52:21

Merge branch '21_nonrecursive'