commit 8aaa36d1a062b20ca263b6ac613b77a3ba1eb113 Merge: ae287fa b50917d Author: Nick Mathewson <nickm@torproject.org> Date: Thu Sep 21 10:40:39 2017 -0400 Merge branch 'bug22110' version-spec.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)