Merge remote-tracking branch 'karsten/task-5848'
commitfe30978a4debefb1973b6f7f719d2fb832224bf3
authorNick Mathewson <nickm@torproject.org>
Wed, 13 Jun 2012 14:19:26 +0000 (13 10:19 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 13 Jun 2012 14:19:26 +0000 (13 10:19 -0400)
tree3eb244b65ff871c44019557b707f04f03e50cb34
parentf72544e7cd1b881b460413dc9c9683223e39c012
parent4bbba5c827ca1b64025bfc649031e866646c8fc7
Merge remote-tracking branch 'karsten/task-5848'
dir-spec.txt