[tor-commits] [torspec/master] Merge remote-tracking branch 'atagar/6872'

[nickm at torproject.org]

commit eacdd6ec6c8ba1c29a4b2d6d1d095b73887a6b89
Merge: b829224 bc51eaa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 17 17:23:06 2012 -0400

    Merge remote-tracking branch 'atagar/6872'

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