commit 2c52061ab3122ad906c9c2155109139d6f46ff10 Merge: a129533 e2f2974 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 11 09:28:09 2017 -0500
Merge remote-tracking branch 'jryans/dependant-corrected'
control-spec.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)