Merge commit 'karsten/dir-spec-fix'
commitba24acbf1fc244844c5990d7b4e987d704941936
authorNick Mathewson <nickm@torproject.org>
Tue, 3 Aug 2010 13:14:38 +0000 (3 09:14 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 3 Aug 2010 13:14:38 +0000 (3 09:14 -0400)
treea8489b6aac11caaba228e42a3a77f7dbf1db9ae0
parent6d8b932659b7319338a318dc306e3df108520fc9
parentb3b3c919c6cd7afaedda9c593f33ebea5a713a26
Merge commit 'karsten/dir-spec-fix'