commit 609abee7106061d6edd859847eb67f1945f1474b Merge: a3d9506 0667997 Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 18 14:58:41 2017 -0400

Merge remote-tracking branch 'dgoulet/ticket22979_01'

proposals/224-rend-spec-ng.txt | 8 ++++++++ 1 file changed, 8 insertions(+)