Commit 1da0e04a0a849de159025b4ef548da61e3145f93

Nick Mathewson 2012-03-13T19:11:11

Merge remote-tracking branch 'ross/eventarg-v2'