Commit ee063766f6dfc297778283caf81515bbfe3e97f3

Nick Mathewson 2013-09-19T10:45:58

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