Commit 2e882a071b51cb79d56dddaa54e8fbac1117664f

Nick Mathewson 2012-04-30T22:00:05

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