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

[nickm at torproject.org]

commit ee2a7f89fe1b9ce824f38f8bdb0f911d7938bfc8
Merge: 717fa8a 94f6baa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 1 08:15:15 2017 -0500

    Merge branch 'bug16852_more'

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