[or-cvs] [tor/master] Merge remote branch 'karsten/cbtdirspec'

[nickm at torproject.org]

commit 32dc51258b48acdedb457b2e6ed50f64cf52cd60
Merge: 0337fc7 3bd3437
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 26 15:25:51 2011 -0500

    Merge remote branch 'karsten/cbtdirspec'

 doc/spec/dir-spec.txt |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)