commit 6fa2397ed623389287495d2c75eb1ab445de32d0 Merge: 91e207e 69de9ec Author: Nick Mathewson <nickm@torproject.org> Date: Fri Oct 2 13:49:14 2015 +0200 Merge remote-tracking branch 'donncha/feature14846_2' control-spec.txt | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)