commit 0239597186f5c7bb081fe9eb726b08f4716ef6d0 Merge: 1e90068 919ec4a Author: Nick Mathewson nickm@torproject.org Date: Thu May 10 11:40:56 2012 -0400

Merge remote-tracking branches 'linus/typos' and 'linus/dirspec'

dir-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)