[tor-commits] [torspec/master] Merge remote-tracking branch 'nickm/bug10163_spec'

commit 9ea26d17b773781d09c6e0faa9b10ef43a96bb03 Merge: 38e1ccd fc8a6f0 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Aug 26 09:45:33 2014 -0400 Merge remote-tracking branch 'nickm/bug10163_spec' dir-spec.txt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)