Commit a64c56470d6ff698b87db1660656d4795d845239

Nick Mathewson 2012-08-02T12:09:08

Merge remote-tracking branch 'origin/patches-2.0' Conflicts: evutil_rand.c