Commit 37145c5659515028df32050b8bfa2afbdb95948d

Nick Mathewson 2014-11-30T21:07:55

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