commit 5a3ea37d1584eaa4a5a32181a50d8d6299f02d4f Merge: ee2ce95 1bbf528 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 7 08:01:09 2017 -0400

Merge branch 'bug22934'

tor-spec.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)