[tor-commits] [torspec/master] Merge branch 'ticket20089_squashed'

[nickm at torproject.org]

commit dda7a944a1eb5fb958c9e9e24770cb74b19e0213
Merge: 04ee910 dca09fd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 8 09:15:23 2016 -0400

    Merge branch 'ticket20089_squashed'

 dir-spec.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)