commit 78f32c6f6f1ae0b0f64a628e62ce64877a596c74 Merge: 684c46b 4f6a391 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 3 07:07:10 2018 -0400

Merge remote-tracking branch 'rl1987/doc26903'

control-spec.txt | 51 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 9 deletions(-)