commit 4ead6e1e53566d13246f2323276ee6d3ded8cf7f Merge: 6533c85 e4cf686 Author: Nick Mathewson nickm@torproject.org Date: Sun Jun 17 19:30:33 2018 -0400

Merge remote-tracking branch 'juga/bug26301'

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