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

commit d0809e9c08d0152d6ab5e9dcf1e56e9c2d0466fa Merge: 7286576 49db7e0 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Apr 17 11:07:29 2013 -0400 Merge branch 'bug8685_squashed' dir-spec.txt | 36 +++++++++++++++++++++++++++++------- 1 files changed, 29 insertions(+), 7 deletions(-)