[tor-commits] [torspec/master] Merge remote-tracking branch 'mikeperry/ticket7804'

[nickm at torproject.org]

commit eef165c1e4d9976e0df0326691d3a9084181dcbc
Merge: 3dd69d2 5d42cd7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 27 20:21:34 2013 -0400

    Merge remote-tracking branch 'mikeperry/ticket7804'

 path-spec.txt |  190 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 189 insertions(+), 1 deletions(-)