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

[nickm at torproject.org]

commit 00ecf4eb994e6e50cab016817e550f01b7a73fcf
Merge: 426e9ac 6a3612c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 5 13:25:40 2014 -0500

    Merge remote-tracking branch 'karsten/bug8913'

 dir-spec.txt |   44 ++++++++++----------------------------------
 1 file changed, 10 insertions(+), 34 deletions(-)