commit 14881dc2270dd734d46d23ef77ee2c7aa68736bd Merge: a315eed c2cce30 Author: David Goulet <dgoulet@torproject.org> Date: Wed Oct 31 11:10:28 2018 -0400 Merge branch 'tor-github/pr/40' rend-spec-v3.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)