[tor-commits] [torspec/master] Merge branch 'bug8045_take3_squashed'

[nickm at torproject.org]

commit fef346f33a579f7f4014fac94685938755d2f3b2
Merge: 8e2cfca a01bb8e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 15 12:22:21 2013 -0400

    Merge branch 'bug8045_take3_squashed'

 dir-spec.txt |   22 ++++++++++++++++++++++
 pt-spec.txt  |    5 ++++-
 2 files changed, 26 insertions(+), 1 deletion(-)