Merge commit 'karsten/proposal-166-impl-master'
commit79e2a81bc899b043b080aaaed29cef6792f1a654
authorNick Mathewson <nickm@torproject.org>
Wed, 26 Aug 2009 15:36:40 +0000 (26 11:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 26 Aug 2009 15:36:40 +0000 (26 11:36 -0400)
tree7a965f71947165afe74ddcc443947c11e9321940
parentbef9f1260c15b4769c7a57c3204ee8b6b5651a50
parentb7b94e8d91bbf62a7a25982ec69ea91ca1b19665
Merge commit 'karsten/proposal-166-impl-master'
dir-spec.txt