commit 53b7dee30b1044ae401338a9ce4b6c76e1c431e1 Merge: 4e5b61a 2fcb1c2 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 14 14:44:03 2017 -0500

Merge remote-tracking branch 'dgoulet/ticket24201_01'

control-spec.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)