commit ddfd56998e75a9a789999d418015b7c9db7df43e Merge: 3c0422a a1fd251 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 14 09:15:56 2015 -0500 Merge remote-tracking branch 'asn/bug14149' dir-spec.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)