commit 4be7ff5ce84183604b717cad75d1157393e4e747 Merge: 1cda024 210e19d Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 19 10:32:14 2017 -0400 Merge remote-tracking branch 'asn/bug22743' proposals/224-rend-spec-ng.txt | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)