commit 42065cfb2925f3f0eb4a5b190feef2210228b44b Merge: c912116 4bc533e Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 24 12:53:16 2017 -0400

Merge remote-tracking branch 'arma/ticket23637-spec'

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