[tor-commits] [torspec/master] Merge remote-tracking branch 'public/bug18815'

[nickm at torproject.org]

commit 0c5563ae78fef607d4759435c7610806d5d241ad
Merge: 3a12deb 5c17e94
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 11 14:13:34 2016 -0400

    Merge remote-tracking branch 'public/bug18815'

 dir-spec.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)