commit 976cca3c452ce0e960c4d6dc93c0d345a8c22289 Merge: c59890c 8bc30d6 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 29 16:47:10 2016 -0400

Merge remote-tracking branch 'karsten/task-19283'

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