commit c3162dfe040df923d197fe2b8436357e546aae7b Merge: 99b1930 b8fe774 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 13 10:43:38 2016 -0400

Merge branch 'feature-17178-squashed'

control-spec.txt | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-)