commit 2a92fa17b28318e4394db13c8a5fd41539054a67 Merge: 17c62ea e55287f Author: Nick Mathewson <nickm@torproject.org> Date: Thu Feb 7 11:14:45 2013 -0500 Merge remote-tracking branch 'asn/bug8165' dir-spec.txt | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-)