commit 43d27f26c87f2e0f587c1c613ad72e3e0b0bb9f6 Merge: 2c52061 2cc9fb1 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 11 09:33:16 2017 -0500 Merge remote-tracking branch 'dgoulet/ticket19133_01' proposals/224-rend-spec-ng.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)