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

[nickm at torproject.org]

commit f6bfc2d4c12526c369b046ce87fbd4793d898383
Merge: 14f3c67 fe66146
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Sep 7 13:44:49 2013 -0400

    Merge branch 'bug8929_take2_squashed'

 pt-spec.txt |   52 +++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 41 insertions(+), 11 deletions(-)