commit 1978da4a5c9bcf3b90b5f4c6199f3486572898e4 Merge: 43c8b45 4907ce3 Author: David Goulet dgoulet@torproject.org Date: Tue Jun 11 11:01:40 2019 -0400

Merge remote-tracking branch 'nickm/ticket29310'

control-spec.txt | 8 ++++++++ 1 file changed, 8 insertions(+)