commit 99b1930a86e8b65f6960700c4593f9abb13ca4fc Merge: dda7a94 e22c36f Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 13 08:54:56 2016 -0400 Merge remote-tracking branch 'public/bug19998' tor-spec.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)