Merge remote-tracking branch 'atagar/5419'
commiteb389f3b88f47fb81aa85f4130c27c4b4cda07e1
authorNick Mathewson <nickm@torproject.org>
Thu, 28 Jun 2012 19:42:28 +0000 (28 15:42 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 28 Jun 2012 19:42:28 +0000 (28 15:42 -0400)
treedf421501b67bfbefc913f3341b4eebdd0342acf8
parent41a353eccef256044f2c977fe83cca91fbe5f7f8
parent4eb029b965adbcb407da5518047dc7536ab7ca2d
Merge remote-tracking branch 'atagar/5419'
dir-spec.txt