[tor-commits] [torspec/master] Merge remote-tracking branch 'karsten/task-15276'

[nickm at torproject.org]

commit e80b15b4c03d7cee964214744efbbac29ae9b6cf
Merge: 59e4c5e 26929b8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 1 12:52:57 2015 -0400

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

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