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

[nickm at torproject.org]

commit 1e8be321233a5b3dcd05cf0e1bb34fd3d75c95fb
Merge: 25b0d43 cf98616
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 11 01:34:28 2013 -0400

    Merge remote-tracking branch 'mikeperry/bug5178'

 path-spec.txt |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)