[tor-commits] [torspec/master] Merge remote-tracking branch 'atagar/15010'

[nickm at torproject.org]

commit 5bdd3937799010a9617b51a2f0260908d5849ea6
Merge: ed1a0db ae07a30
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 25 09:32:07 2015 -0500

    Merge remote-tracking branch 'atagar/15010'

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