commit d15b80dd371c4f86cc86ec8599f4b4601f899e2b Merge: 8aaa36d 4f6ab8d Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 10 14:27:49 2017 -0400

Merge remote-tracking branch 'isis/ticket18329_02'

dir-spec.txt | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)