Commit f391b0030c9a3a62e5c4a4d00e35b7f9665db1a7

Nick Mathewson 2013-08-06T17:29:34

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