commit ff93808c5277c2412dfc19727d38216162cd1ab8 Merge: a1f8e0a 999f249 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 12 13:01:04 2016 -0400

Merge remote-tracking branch 'teor/prop224-horse'

proposals/224-rend-spec-ng.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)