[tor-commits] [torspec/master] Merge remote-tracking branch 'dgoulet/ticket23340_01'

[nickm at torproject.org]

commit a3d9506c673690a1fe931b7cf008d6091eb4a624
Merge: 417aac2 2922ca3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 18 14:55:47 2017 -0400

    Merge remote-tracking branch 'dgoulet/ticket23340_01'

 proposals/224-rend-spec-ng.txt | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)