commit ecbde01aaeda6e06e5736158100e7dfcf3c8887d Merge: bbd072a b32a9bf Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 2 10:25:30 2019 -0500

Merge remote-tracking branch 'tor-github/pr/48'

control-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)