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

[nickm at torproject.org]

commit eb389f3b88f47fb81aa85f4130c27c4b4cda07e1
Merge: 41a353e 4eb029b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 28 15:42:28 2012 -0400

    Merge remote-tracking branch 'atagar/5419'

 dir-spec-v2.txt |   38 +++++++++-----------------------------
 dir-spec.txt    |   35 +++--------------------------------
 2 files changed, 12 insertions(+), 61 deletions(-)