commit 422ca3d2edace750993a45c41ece03bdb00ec6c3 Merge: 28ed266 3f93330 Author: Nick Mathewson nickm@torproject.org Date: Thu May 11 07:30:47 2017 -0400

Merge remote-tracking branch 'dgoulet/ticket21871_01'

proposals/224-rend-spec-ng.txt | 54 +++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 22 deletions(-)