commit 93d89226e73cb535088d4cb4104afefdbdfe83c0 Merge: b1be41c 4d6c1a8 Author: Nick Mathewson <nickm@torproject.org> Date: Wed May 16 11:07:32 2012 -0400 Merge branch 'task-3038-squashed' dir-spec.txt | 305 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 285 insertions(+), 20 deletions(-)