commit 02c3879f8730021d0b8b7bc359895cbd9dda204f Merge: 725d615 b41a503 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 31 14:57:04 2015 -0400

Merge remote-tracking branch 'teor/ticket15431-event-mask-tests'

changes/ticket15431 | 6 +++ src/or/control.c | 2 +- src/or/control.h | 23 ++++++++- src/test/test_controller_events.c | 99 +++++++++++++++++++++++++++++++++++++ 4 files changed, 128 insertions(+), 2 deletions(-)