commit 1f7657ebfc8dfee85670331086e48784bb8ef5c0 Merge: 2058ddd c5453a0 Author: Nick Mathewson nickm@torproject.org Date: Mon May 14 14:15:40 2018 -0400

Merge remote-tracking branch 'rl1987/bug25852_take2'

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