commit 2c2d27861e1d2f33056de6dacd1ac48d8d9bf145 Merge: f45e162 09d71e4 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 18 09:27:56 2017 -0500 Merge remote-tracking branch 'nicoo/p224-typo' proposals/224-rend-spec-ng.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)