commit 4749bf55c42cb3bafa5c3da81c3bee8348bae5cc Merge: 2b1d181 c2865d9 Author: Nick Mathewson nickm@torproject.org Date: Mon May 9 14:45:46 2016 -0400

Merge remote-tracking branch 'special/feature15588'

control-spec.txt | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)