[tor-commits] [torspec/master] Merge remote-tracking branch 'sebastian/bug6404_spec'

[nickm at torproject.org]

commit 64b939fdcdda47ffcf468f36c0e63e13ee15e158
Merge: 5ce6cbb 9d144e1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 21 10:38:33 2012 -0400

    Merge remote-tracking branch 'sebastian/bug6404_spec'

 dir-spec.txt |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)