commit 1bf2c16fbd351d9313dd4db12c39aa849a1229e6 Merge: eb7c64b 00b9daf Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 15 11:53:01 2017 -0400

Merge remote-tracking branch 'dgoulet/ticket19254_01'

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