commit 566f31e68a11e66ec3bc1e98340926bbc7564e77 Merge: 800d5ea faa53bd Author: Nick Mathewson <nickm@torproject.org> Date: Thu Feb 28 11:24:26 2013 -0500 Merge remote-tracking branch 'karsten/proposal218' control-spec.txt | 4 +- proposals/218-usage-controller-events.txt | 170 ++++++++++++++++++----------- 2 files changed, 109 insertions(+), 65 deletions(-)