commit 73d4e21d80da025ae78f8fa95f3574dd082072fa Merge: 1c81861 d200f1e Author: Nick Mathewson nickm@torproject.org Date: Sun Jul 1 10:37:10 2018 -0400

Merge remote-tracking branch 'juga/ticket26541'

dir-spec.txt | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)