[tor-commits] [torspec/master] Merge remote-tracking branch 'donncha/fix-15190'

[nickm at torproject.org]

commit 5963a7e3dcfb10af5fd580529fb46047cd9af556
Merge: 0ef45b9 96459db
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 4 11:47:14 2015 -0500

    Merge remote-tracking branch 'donncha/fix-15190'

 rend-spec.txt |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)